[maemo-commits] [maemo-commits] r12303 - in projects/haf/trunk/hildon-desktop: . libhildondesktop

[From: subversion at stage.maemo.org]

Author: moimart
Date: 2007-06-14 19:26:59 +0300 (Thu, 14 Jun 2007)
New Revision: 12303

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-window-dialog.c
Log:
2007-06-14  Moises Martinez  <moises.martinez at nokia.com>

        * libhildondesktop/hildon-desktop-window-dialog.c:
        - Check in _realize if we are gonna use the ol' titlebar from
        matchbox. It was missing in patch for MB 1358.
	* ChangeLog updated.



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-06-14 13:39:20 UTC (rev 12302)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-06-14 16:26:59 UTC (rev 12303)
@@ -1,3 +1,9 @@
+2007-06-14  Moises Martinez  <moises.martinez at nokia.com>
+
+	* libhildondesktop/hildon-desktop-window-dialog.c:
+	- Check in _realize if we are gonna use the ol' titlebar from
+	matchbox. It was missing in patch for MB 1358.
+
 2007-06-14  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* src/hd-applications-menu.c: move focus to applications pane when

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-window-dialog.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-window-dialog.c	2007-06-14 13:39:20 UTC (rev 12302)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-panel-window-dialog.c	2007-06-14 16:26:59 UTC (rev 12303)
@@ -65,20 +65,23 @@
 static void
 hildon_desktop_panel_window_dialog_realize (GtkWidget *widget)
 {
-  GdkDisplay *display = gtk_widget_get_display (widget);
-  Atom atoms[2];
-
   GTK_WIDGET_CLASS (hildon_desktop_panel_window_dialog_parent_class)->realize (widget);
 
-  atoms[0] = gdk_x11_get_xatom_by_name_for_display (display, "_MB_WM_STATE_DOCK_TITLEBAR");
-  atoms[1] = gdk_x11_get_xatom_by_name_for_display (display, "_MB_DOCK_TITLEBAR_SHOW_ON_DESKTOP");
+  if (HILDON_DESKTOP_PANEL_WINDOW_DIALOG (widget)->priv->old_titlebar)
+  {	 
+    GdkDisplay *display = gtk_widget_get_display (widget);
+    Atom atoms[2];
 
-  XChangeProperty (GDK_DISPLAY_XDISPLAY (display),
-		   GDK_WINDOW_XID (widget->window),
-		   gdk_x11_get_xatom_by_name_for_display (display, "_MB_WM_STATE"),
-		   XA_ATOM, 32,
-		   PropModeReplace,
-		   (guchar*) atoms, 2);
+    atoms[0] = gdk_x11_get_xatom_by_name_for_display (display, "_MB_WM_STATE_DOCK_TITLEBAR");
+    atoms[1] = gdk_x11_get_xatom_by_name_for_display (display, "_MB_DOCK_TITLEBAR_SHOW_ON_DESKTOP");
+
+    XChangeProperty (GDK_DISPLAY_XDISPLAY (display),
+		     GDK_WINDOW_XID (widget->window),
+		     gdk_x11_get_xatom_by_name_for_display (display, "_MB_WM_STATE"),
+		     XA_ATOM, 32,
+		     PropModeReplace,
+		     (guchar*) atoms, 2);
+  }
 }
 
 static void