Drop unused patches

This commit is contained in:
Kalev Lember 2012-05-05 21:32:57 +03:00
parent d8b1d4c314
commit 02762101c9
3 changed files with 0 additions and 85 deletions

View File

@ -1,61 +0,0 @@
diff -up nautilus-2.90.1/eel/eel-editable-label.c.editable-iface nautilus-2.90.1/eel/eel-editable-label.c
--- nautilus-2.90.1/eel/eel-editable-label.c.editable-iface 2010-09-21 22:28:01.000000000 -0400
+++ nautilus-2.90.1/eel/eel-editable-label.c 2010-09-21 23:22:48.382998007 -0400
@@ -59,7 +59,7 @@ enum {
static guint signals[LAST_SIGNAL] = { 0 };
-static void eel_editable_label_editable_init (GtkEditableInterface *iface);
+static void eel_editable_label_editable_init (GtkEditableClass *iface);
static void eel_editable_label_class_init (EelEditableLabelClass *klass);
static void eel_editable_label_init (EelEditableLabel *label);
static void eel_editable_label_set_property (GObject *object,
@@ -506,7 +506,7 @@ eel_editable_label_class_init (EelEditab
}
static void
-eel_editable_label_editable_init (GtkEditableInterface *iface)
+eel_editable_label_editable_init (GtkEditableClass *iface)
{
iface->do_insert_text = editable_insert_text_emit;
iface->do_delete_text = editable_delete_text_emit;
diff -up nautilus-2.90.1/libnautilus-private/nautilus-autorun.c.editable-iface nautilus-2.90.1/libnautilus-private/nautilus-autorun.c
--- nautilus-2.90.1/libnautilus-private/nautilus-autorun.c.editable-iface 2010-09-22 08:32:15.318998004 -0400
+++ nautilus-2.90.1/libnautilus-private/nautilus-autorun.c 2010-09-22 08:32:29.945998006 -0400
@@ -695,7 +695,7 @@ is_shift_pressed (void)
gdk_error_trap_push ();
status = XkbGetState (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
XkbUseCoreKbd, &state);
- gdk_error_trap_pop_ignored ();
+ gdk_error_trap_pop ();
if (status == Success) {
ret = state.mods & ShiftMask;
diff -up nautilus-2.90.1/libnautilus-private/nautilus-entry.c.editable-iface nautilus-2.90.1/libnautilus-private/nautilus-entry.c
--- nautilus-2.90.1/libnautilus-private/nautilus-entry.c.editable-iface 2010-09-22 08:03:06.833998015 -0400
+++ nautilus-2.90.1/libnautilus-private/nautilus-entry.c 2010-09-22 08:03:46.708997998 -0400
@@ -50,13 +50,13 @@ enum {
};
static guint signals[LAST_SIGNAL];
-static void nautilus_entry_editable_init (GtkEditableInterface *iface);
+static void nautilus_entry_editable_init (GtkEditableClass *iface);
G_DEFINE_TYPE_WITH_CODE (NautilusEntry, nautilus_entry, GTK_TYPE_ENTRY,
G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE,
nautilus_entry_editable_init));
-static GtkEditableInterface *parent_editable_interface = NULL;
+static GtkEditableClass *parent_editable_interface = NULL;
static void
nautilus_entry_init (NautilusEntry *entry)
@@ -360,7 +360,7 @@ nautilus_entry_selection_clear (GtkWidge
}
static void
-nautilus_entry_editable_init (GtkEditableInterface *iface)
+nautilus_entry_editable_init (GtkEditableClass *iface)
{
parent_editable_interface = g_type_interface_peek_parent (iface);

View File

@ -1,13 +0,0 @@
Index: libnautilus-private/nautilus-file.c
===================================================================
--- libnautilus-private/nautilus-file.c (revision 14183)
+++ libnautilus-private/nautilus-file.c (working copy)
@@ -1613,7 +1619,7 @@
}
}
- is_symlink = g_file_info_get_is_symlink (info);
+ is_symlink = g_file_info_get_is_symlink (info) || (g_file_info_get_file_type (info) == G_FILE_TYPE_SYMBOLIC_LINK);
if (file->details->is_symlink != is_symlink) {
changed = TRUE;
}

View File

@ -1,11 +0,0 @@
diff -up nautilus-3.3.3/configure.in.gmodule nautilus-3.3.3/configure.in
--- nautilus-3.3.3/configure.in.gmodule 2011-12-21 00:00:52.794433308 -0500
+++ nautilus-3.3.3/configure.in 2011-12-21 00:01:24.098433776 -0500
@@ -315,6 +315,7 @@ PKG_CHECK_MODULES(NAUTILUS, [
gthread-2.0 >= glib_minver
gio-2.0 >= glib_minver
gio-unix-2.0 >= glib_minver
+ gmodule-no-export-2.0 >= glib_minver
gsettings-desktop-schemas
libnotify >= notify_minver
])