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

[From: subversion at stage.maemo.org]

Author: xan
Date: 2007-06-26 16:57:37 +0300 (Tue, 26 Jun 2007)
New Revision: 12486

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkwindow.c
Log:
2007-06-26  Xan Lopez  <xan at gnome.org>

	* gtk/gtkwindow.c: fix merge breakage.


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-06-26 13:55:01 UTC (rev 12485)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-06-26 13:57:37 UTC (rev 12486)
@@ -1,3 +1,7 @@
+2007-06-26  Xan Lopez  <xan at gnome.org>
+
+	* gtk/gtkwindow.c: fix merge breakage.
+
 2007-06-26  Xan Lopez  <xan at .lopeznokia.com>
 
 	Take from upstream:

Modified: projects/haf/trunk/gtk+/gtk/gtkwindow.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkwindow.c	2007-06-26 13:55:01 UTC (rev 12485)
+++ projects/haf/trunk/gtk+/gtk/gtkwindow.c	2007-06-26 13:57:37 UTC (rev 12486)
@@ -4286,12 +4286,7 @@
     case GTK_WINDOW_POPUP:
       attributes.window_type = GDK_WINDOW_TEMP;
       break;
-#ifdef MAEMO_CHANGES
-    case PROP_TEMPORARY:
-      gtk_window_set_temporary (window, g_value_get_boolean (value));
-      break;
-#endif
-    default:
+   default:
       g_warning (G_STRLOC": Unknown window type %d!", window->type);
       break;
     }
@@ -4561,13 +4556,8 @@
       configure_event->height -= window->frame_top + window->frame_bottom;
       return gtk_window_configure_event (GTK_WIDGET (window), configure_event);
       break;
-#ifdef MAEMO_CHANGES
-    case PROP_TEMPORARY:
-      g_value_set_boolean (value, gtk_window_is_temporary (window));
+   default:
       break;
-#endif
-    default:
-      break;
     }
   return FALSE;
 }