[Pkg-maemo-commits] r302 ./hildon-desktop/ubuntu: * update default icon load path to /usr/share/pixmaps, and resize

[Tollef Fog Heen]

------------------------------------------------------------
revno: 302
committer: Tollef Fog Heen <tfheen at err.no>
branch nick: hildon-desktop
timestamp: Wed 2007-08-29 18:07:32 +0200
message:
  * update default icon load path to /usr/share/pixmaps, and resize
    others-button size to 69 pixels.
modified:
  debian/changelog
  libhildondesktop/libhildonmenu.c
  src/hn-others-button.c
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2007-08-29 16:00:24 +0000
+++ b/debian/changelog	2007-08-29 16:07:32 +0000
@@ -17,6 +17,8 @@
     signal to marquee-plugins
   * load others-button as start menu to replace applications menu,
     others-button has proper frame setting.
+  * update default icon load path to /usr/share/pixmaps, and resize
+    others-button size to 69 pixels.
 
  -- Tollef Fog Heen <tfheen at ubuntu.com>  Wed, 29 Aug 2007 16:20:53 +0200
 

=== modified file 'libhildondesktop/libhildonmenu.c'
--- a/libhildondesktop/libhildonmenu.c	2007-07-19 18:19:24 +0000
+++ b/libhildondesktop/libhildonmenu.c	2007-08-29 16:07:32 +0000
@@ -50,7 +50,7 @@
 #define DESKTOP_FILE_SUFFIX ".desktop"
 #define DESKTOP_ENTRY_GROUP "Desktop Entry"
 #define SERVICE_PREFIX "com.nokia."
-#define DEFAULT_ICON_THEME "/usr/share/icons/hicolor"
+#define DEFAULT_ICON_THEME "/usr/share/pixmaps"
 
 typedef struct {
 	gchar *name;
@@ -154,7 +154,7 @@
 			g_error_free(error);
 			error = NULL;
 
-			abs_path_icon_name = g_strjoin(NULL, DEFAULT_ICON_THEME, "/scalable/hildon/", icon_name, ".png",NULL);
+			abs_path_icon_name = g_strjoin(NULL, DEFAULT_ICON_THEME, icon_name, ".png",NULL);
 			pixbuf = gdk_pixbuf_new_from_file(abs_path_icon_name, &error);
 			
 			if (error) {

=== modified file 'src/hn-others-button.c'
--- a/src/hn-others-button.c	2007-08-29 16:00:24 +0000
+++ b/src/hn-others-button.c	2007-08-29 16:07:32 +0000
@@ -179,7 +179,7 @@
     gtk_container_add (GTK_CONTAINER (priv->button), icon);
   }
 
-  gtk_widget_set_size_request (priv->button, 52, 52);
+  gtk_widget_set_size_request (priv->button, 69, 52);
   gtk_widget_show_all (priv->button);
 
   hdwm = hd_wm_get_singleton ();