[Pkg-maemo-commits] r301 ./hildon-desktop/ubuntu: * load others-button as start menu to replace applications menu,

[Tollef Fog Heen]

------------------------------------------------------------
revno: 301
committer: Tollef Fog Heen <tfheen at err.no>
branch nick: hildon-desktop
timestamp: Wed 2007-08-29 18:00:24 +0200
message:
  * load others-button as start menu to replace applications menu,
    others-button has proper frame setting.
modified:
  data/marquee.conf.in
  debian/changelog
  src/hn-others-button.c
-------------- next part --------------
=== modified file 'data/marquee.conf.in'
--- a/data/marquee.conf.in	2007-07-19 17:59:06 +0000
+++ b/data/marquee.conf.in	2007-08-29 16:00:24 +0000
@@ -1,4 +1,4 @@
-[@hildonnavigatordesktopentrydir@/applications-menu.desktop]
+[@hildonnavigatordesktopentrydir@/others-button.desktop]
 [@hildonmarqueedesktopentrydir@/drop-down-menu.desktop]
 [@hildonmarqueedesktopentrydir@/nav-prev-app.desktop]
 [@hildonmarqueedesktopentrydir@/clock-plugin.desktop]

=== modified file 'debian/changelog'
--- a/debian/changelog	2007-08-29 15:56:54 +0000
+++ b/debian/changelog	2007-08-29 16:00:24 +0000
@@ -15,6 +15,8 @@
   [ Horace Li ]
   * reset local active window cache first before sending out window update
     signal to marquee-plugins
+  * load others-button as start menu to replace applications menu,
+    others-button has proper frame setting.
 
  -- Tollef Fog Heen <tfheen at ubuntu.com>  Wed, 29 Aug 2007 16:20:53 +0200
 

=== modified file 'src/hn-others-button.c'
--- a/src/hn-others-button.c	2007-06-13 14:28:31 +0000
+++ b/src/hn-others-button.c	2007-08-29 16:00:24 +0000
@@ -69,8 +69,13 @@
 #define NAVIGATOR_BUTTON_THREE "hildon-navigator-button-three"
 #define NAVIGATOR_MENU_NAME    "menu_from_navigator"
 
+#ifdef UME
+#define OTHERS_MENU_ICON_NAME  "mb_apps_menu"
+#define OTHERS_MENU_ICON_SIZE  52
+#else
 #define OTHERS_MENU_ICON_NAME "qgn_grid_tasknavigator_others"
 #define OTHERS_MENU_ICON_SIZE 64
+#endif
 
 #define MENU_ITEM_DEFAULT_ICON        ""
 #define MENU_ITEM_SUBMENU_ICON        "qgn_list_gene_fldr_cls"
@@ -174,6 +179,7 @@
     gtk_container_add (GTK_CONTAINER (priv->button), icon);
   }
 
+  gtk_widget_set_size_request (priv->button, 52, 52);
   gtk_widget_show_all (priv->button);
 
   hdwm = hd_wm_get_singleton ();