From b24f066e23fb5b204c940c229c5cdebffd2f7600 Mon Sep 17 00:00:00 2001
From: Jasmine Hassan <jasmine.aura@gmail.com>
Date: Mon, 5 Nov 2012 23:14:35 +0200
Subject: [src] convert to new GDK_KEY prefix

http://git.gnome.org/browse/nautilus/commit/?id=71fa1a50145a6f06da3b805a29e75c1295fd546b

Also, make sure we use GDK_KEY prefix in places-sidebar where this patch was previously
applied to Caja but with old prefix:
places-sidebar: allow keyboard navigation with Enter/Space (#637768)
http://git.gnome.org/browse/nautilus/commit/?id=fd03c910a73ba18459e68baaf15e8dd295acd5c1
---
 src/caja-location-entry.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'src/caja-location-entry.c')

diff --git a/src/caja-location-entry.c b/src/caja-location-entry.c
index fac59e44..f23f1a9f 100644
--- a/src/caja-location-entry.c
+++ b/src/caja-location-entry.c
@@ -133,19 +133,19 @@ entry_would_have_inserted_characters (const GdkEventKey *event)
 {
     switch (event->keyval)
     {
-    case GDK_BackSpace:
-    case GDK_Clear:
-    case GDK_Insert:
-    case GDK_Delete:
-    case GDK_Home:
-    case GDK_End:
-    case GDK_KP_Home:
-    case GDK_KP_End:
-    case GDK_Left:
-    case GDK_Right:
-    case GDK_KP_Left:
-    case GDK_KP_Right:
-    case GDK_Return:
+    case GDK_KEY_BackSpace:
+    case GDK_KEY_Clear:
+    case GDK_KEY_Insert:
+    case GDK_KEY_Delete:
+    case GDK_KEY_Home:
+    case GDK_KEY_End:
+    case GDK_KEY_KP_Home:
+    case GDK_KEY_KP_End:
+    case GDK_KEY_Left:
+    case GDK_KEY_Right:
+    case GDK_KEY_KP_Left:
+    case GDK_KEY_KP_Right:
+    case GDK_KEY_Return:
         return FALSE;
     default:
         if (event->keyval >= 0x20 && event->keyval <= 0xFF)
@@ -235,7 +235,7 @@ editable_event_after_callback (GtkEntry *entry,
      * likely an auto-completion. We ignore shift / control since
      * they can validly be used to extend the selection.
      */
-    if ((keyevent->keyval == GDK_Right || keyevent->keyval == GDK_End) &&
+	if ((keyevent->keyval == GDK_KEY_Right || keyevent->keyval == GDK_KEY_End) &&
             !(keyevent->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)) &&
             gtk_editable_get_selection_bounds (editable, NULL, NULL))
     {
-- 
cgit v1.2.1


From 2472d52a0f28dd84d362dcc5570e747a82aa8ba6 Mon Sep 17 00:00:00 2001
From: Jasmine Hassan <jasmine.aura@gmail.com>
Date: Wed, 31 Oct 2012 04:42:15 +0200
Subject: [src] don't use GtkObject (GTK3)

the ::destroy signal of GtkObject has only been moved to GtkWidget in GTK3
(after GtkObject removal): http://developer.gnome.org/gtk3/3.0/ch25s02.html
So we use conditionals in this case, to keep it working with GTK2.

A tad similar:
http://git.gnome.org/browse/nautilus/commit/?id=cc6cb51e827c0b15d4ef09f12d37b9f331ddcef8
---
 src/caja-location-entry.c | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

(limited to 'src/caja-location-entry.c')

diff --git a/src/caja-location-entry.c b/src/caja-location-entry.c
index f23f1a9f..0a59a347 100644
--- a/src/caja-location-entry.c
+++ b/src/caja-location-entry.c
@@ -285,7 +285,11 @@ finalize (GObject *object)
 }
 
 static void
+#if GTK_CHECK_VERSION (3, 0, 0)
+destroy (GtkWidget *object)
+#else
 destroy (GtkObject *object)
+#endif
 {
     CajaLocationEntry *entry;
 
@@ -301,7 +305,11 @@ destroy (GtkObject *object)
     g_free (entry->details->current_directory);
     entry->details->current_directory = NULL;
 
+#if GTK_CHECK_VERSION (3, 0, 0)
+    EEL_CALL_PARENT (GTK_WIDGET_CLASS, destroy, (object));
+#else
     EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+#endif
 }
 
 static void
@@ -382,22 +390,17 @@ caja_location_entry_activate (GtkEntry *entry)
 static void
 caja_location_entry_class_init (CajaLocationEntryClass *class)
 {
-    GtkWidgetClass *widget_class;
-    GObjectClass *gobject_class;
-    GtkObjectClass *object_class;
-    GtkEntryClass *entry_class;
+    GTK_WIDGET_CLASS (class)->focus_in_event = caja_location_entry_focus_in;
 
-    widget_class = GTK_WIDGET_CLASS (class);
-    widget_class->focus_in_event = caja_location_entry_focus_in;
+#if GTK_CHECK_VERSION (3, 0, 0)
+    GTK_WIDGET_CLASS (class)->destroy = destroy;
+#else
+    GTK_OBJECT_CLASS (class)->destroy = destroy;
+#endif
 
-    gobject_class = G_OBJECT_CLASS (class);
-    gobject_class->finalize = finalize;
+    G_OBJECT_CLASS (class)->finalize = finalize;
 
-    object_class = GTK_OBJECT_CLASS (class);
-    object_class->destroy = destroy;
-
-    entry_class = GTK_ENTRY_CLASS (class);
-    entry_class->activate = caja_location_entry_activate;
+    GTK_ENTRY_CLASS (class)->activate = caja_location_entry_activate;
 }
 
 void
-- 
cgit v1.2.1