[maemo-commits] [maemo-commits] r13252 - in projects/haf/trunk/gtk+: . gtk

[From: subversion at stage.maemo.org]

Author: xan
Date: 2007-08-16 15:01:24 +0300 (Thu, 16 Aug 2007)
New Revision: 13252

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkradiobutton.c
Log:
2007-08-16  Xan Lopez  <xan.lopez at nokia.com>

	* gtk/gtkradiobutton.c (gtk_radio_button_focus): add a chunk of code moved around
	for a MAEMO_CHANGES feature to its original position protected with #ifndef MAEMO_CHANGES.


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-08-16 11:33:20 UTC (rev 13251)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-08-16 12:01:24 UTC (rev 13252)
@@ -1,5 +1,10 @@
 2007-08-16  Xan Lopez  <xan.lopez at nokia.com>
 
+	* gtk/gtkradiobutton.c (gtk_radio_button_focus): add a chunk of code moved around
+	for a MAEMO_CHANGES feature to its original position protected with #ifndef MAEMO_CHANGES.
+
+2007-08-16  Xan Lopez  <xan.lopez at nokia.com>
+
 	* gtk/gtkwindow.c (gtk_window_map): call gtk_window_close_other_temporaries
 	if we are not a temporary window.
 

Modified: projects/haf/trunk/gtk+/gtk/gtkradiobutton.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkradiobutton.c	2007-08-16 11:33:20 UTC (rev 13251)
+++ projects/haf/trunk/gtk+/gtk/gtkradiobutton.c	2007-08-16 12:01:24 UTC (rev 13252)
@@ -452,10 +452,12 @@
       gboolean cursor_only;
       gboolean wrap_around;
 
+#ifdef MAEMO_CHANGES
       g_object_get (settings,
                     "gtk-keynav-cursor-only", &cursor_only,
                     "gtk-keynav-wrap-around", &wrap_around,
                     NULL);
+#endif /* MAEMO_CHANGES */
 
       switch (direction)
 	{
@@ -515,6 +517,13 @@
 	    }
 	}
 
+#ifndef MAEMO_CHANGES
+      g_object_get (settings,
+                    "gtk-keynav-cursor-only", &cursor_only,
+                    "gtk-keynav-wrap-around", &wrap_around,
+                    NULL);
+#endif /* MAEMO_CHANGES */
+
       if (!new_focus)
 	{
           if (cursor_only)