Merge branch 'master' into 3.4

Cairo-Dock · Feb 19, 2015 · 693ab5b · 693ab5b
2 parents 34ad956 + dcd1620
commit 693ab5b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -24,7 +24,7 @@ add_definitions (-DGL_GLEXT_PROTOTYPES="1")
 set (CPACK_SOURCE_GENERATOR "TGZ")
 set (CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${VERSION}")
 set (CPACK_SOURCE_IGNORE_FILES
-	"/build/;/.bzr/;bzrignore$;/misc/;~$;${CPACK_SOURCE_IGNORE_FILES}")
+	"/build/;/.bzr/;/.bzrignore$;/.git/;/.gitignore$;/misc/;~$;${CPACK_SOURCE_IGNORE_FILES}")
 include (CPack)
 
 add_custom_target(dist

diff --git a/GMenu/src/applet-entry.c b/GMenu/src/applet-entry.c
@@ -115,6 +115,8 @@ static void _add_results_in_menu (GldiModuleInstance *myApplet)
 			{
 				GtkWidget *pImage = gtk_image_new_from_gicon (pIcon,
 					GTK_ICON_SIZE_LARGE_TOOLBAR);
+				gtk_image_set_pixel_size (GTK_IMAGE (pImage),
+					myData.iPanelDefaultMenuIconSize); // force size
 				gldi_menu_item_set_image (pInfo->pMenuItem, pImage);
 			}
 

diff --git a/GMenu/src/applet-tree.c b/GMenu/src/applet-tree.c
@@ -76,7 +76,7 @@ static void add_image_to_menu_item (GtkWidget *image_menu_item,
 {
 	// make a GtkImage
 	GtkWidget *image = gtk_image_new ();
-	gtk_widget_set_size_request (image, myData.iPanelDefaultMenuIconSize, myData.iPanelDefaultMenuIconSize);
+	gtk_image_set_pixel_size (GTK_IMAGE (image), myData.iPanelDefaultMenuIconSize); // force size
 
 	if (pIcon)  // this just sets the gicon on the image, it doesn't load the pixbuf.
 		gtk_image_set_from_gicon (GTK_IMAGE (image), pIcon, GTK_ICON_SIZE_LARGE_TOOLBAR);