[Pkg-maemo-commits] r312 ./hildon-desktop/ubuntu: * Set up home titlebar to stop showing up if UME is defined, instead of setting

[Loïc Minier]

------------------------------------------------------------
revno: 312
committer: Loïc Minier <lool at dooz.org>
branch nick: ubuntu
timestamp: Fri 2007-11-02 14:55:49 +0100
message:
  * Set up home titlebar to stop showing up if UME is defined, instead of setting
    home titlebar height to 0.
modified:
  debian/changelog
  libhildondesktop/hildon-home-titlebar.c
  libhildondesktop/hildon-home-window.c
  src/hd-home-window.c
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2007-10-30 19:21:11 +0000
+++ b/debian/changelog	2007-11-02 13:55:49 +0000
@@ -61,7 +61,11 @@
     the UI without rebooting (which will clear the
     /tmp/osso-appl-states/hildon-desktop/stamp file).
 
- -- Loic Minier <lool at dooz.org>  Tue, 30 Oct 2007 20:15:31 +0100
+  [ Horace Li ]
+  * Set up home titlebar to stop showing up if UME is defined, instead of setting
+    home titlebar height to 0.
+
+ -- Horace Li <horace.li at intel.com>  Fri,  2 Nov 2007 11:23:54 +0800
 
 hildon-desktop (1:0.0.43-1) sardine; urgency=low
 

=== modified file 'libhildondesktop/hildon-home-titlebar.c'
--- a/libhildondesktop/hildon-home-titlebar.c	2007-10-12 17:05:47 +0000
+++ b/libhildondesktop/hildon-home-titlebar.c	2007-11-02 13:55:49 +0000
@@ -52,11 +52,7 @@
 
 #include <X11/extensions/Xfixes.h>
 
-#ifdef UME
-#define HILDON_HOME_TITLEBAR_HEIGHT	0
-#else 
 #define HILDON_HOME_TITLEBAR_HEIGHT	60
-#endif
 
 #define HILDON_HOME_TITLEBAR_MENU_LABEL_FONT  "osso-TitleFont"
 #define HILDON_HOME_TITLEBAR_MENU_LABEL_COLOR "HomeTitleTextColor"

=== modified file 'libhildondesktop/hildon-home-window.c'
--- a/libhildondesktop/hildon-home-window.c	2007-06-19 13:52:55 +0000
+++ b/libhildondesktop/hildon-home-window.c	2007-11-02 13:55:49 +0000
@@ -134,7 +134,9 @@
                   gtk_object_sink (GTK_OBJECT (priv->titlebar));
                   gtk_widget_set_parent (priv->titlebar,
                                          GTK_WIDGET (gobject));
+#ifndef UME
                   gtk_widget_show (priv->titlebar);
+#endif
 
                   gtk_widget_pop_composite_child ();
                 }
@@ -256,10 +258,12 @@
   priv = window->priv;
   child = GTK_BIN (widget)->child;
 
+#ifndef UME
   if (GTK_IS_WIDGET (priv->titlebar))
     gtk_container_propagate_expose (GTK_CONTAINER (widget),
                                     priv->titlebar,
                                     event);
+#endif
 
   if (GTK_WIDGET_CLASS (hildon_home_window_parent_class)->expose_event)
     return GTK_WIDGET_CLASS (hildon_home_window_parent_class)->expose_event (widget,
@@ -338,7 +342,9 @@
   g_object_ref (priv->titlebar);
   gtk_object_sink (GTK_OBJECT (priv->titlebar));
   gtk_widget_set_parent (priv->titlebar, widget);
+#ifndef UME
   gtk_widget_show (priv->titlebar);
+#endif
 
   gtk_widget_pop_composite_child ();
 

=== modified file 'src/hd-home-window.c'
--- a/src/hd-home-window.c	2007-10-12 17:05:47 +0000
+++ b/src/hd-home-window.c	2007-11-02 13:55:49 +0000
@@ -380,12 +380,14 @@
   priv = HD_HOME_WINDOW_GET_PRIVATE (retval);
 
   priv->normal_menu = hd_home_window_build_main_menu (window);
+#ifndef UME
   hildon_home_window_set_menu (hhwindow, GTK_MENU (priv->normal_menu));
 
   g_object_set (window,
                 "menu", priv->normal_menu,
                 "title", HH_MENU_TITLE,
                 NULL);
+#endif
 
   area = hildon_home_area_new ();
   gtk_widget_show (area);