[Xfce4-commits] r23101 - in xfdesktop/trunk: common modules/menu src

[Olivier Fourdan]

Author: olivier
Date: 2006-09-07 19:48:00 +0000 (Thu, 07 Sep 2006)
New Revision: 23101

Modified:
   xfdesktop/trunk/common/xfdesktop-common.c
   xfdesktop/trunk/common/xfdesktop-common.h
   xfdesktop/trunk/modules/menu/desktop-menu.c
   xfdesktop/trunk/src/menu.c
Log:
My little contribution to xfdesktop, make it more robust to broken install (bug #2268)

Modified: xfdesktop/trunk/common/xfdesktop-common.c
===================================================================
--- xfdesktop/trunk/common/xfdesktop-common.c	2006-09-07 19:46:26 UTC (rev 23100)
+++ xfdesktop/trunk/common/xfdesktop-common.c	2006-09-07 19:48:00 UTC (rev 23101)
@@ -132,7 +132,7 @@
 }
 
 gchar *
-xfce_desktop_get_menufile()
+xfce_desktop_get_menufile(void)
 {
     XfceKiosk *kiosk;
     gboolean user_menu;

Modified: xfdesktop/trunk/common/xfdesktop-common.h
===================================================================
--- xfdesktop/trunk/common/xfdesktop-common.h	2006-09-07 19:46:26 UTC (rev 23100)
+++ xfdesktop/trunk/common/xfdesktop-common.h	2006-09-07 19:48:00 UTC (rev 23101)
@@ -46,7 +46,7 @@
 gchar **get_list_from_file(const gchar *);
 gboolean is_backdrop_list(const gchar *path);
 gboolean xfdesktop_check_image_file(const gchar *filename);
-gchar *xfce_desktop_get_menufile();
+gchar *xfce_desktop_get_menufile(void);
 gboolean xfdesktop_check_is_running(Window *xid);
 void xfdesktop_send_client_message(Window xid, const gchar *msg);
 gboolean xfdesktop_popup_grab_available(GdkWindow *win, guint32 timestamp);

Modified: xfdesktop/trunk/modules/menu/desktop-menu.c
===================================================================
--- xfdesktop/trunk/modules/menu/desktop-menu.c	2006-09-07 19:46:26 UTC (rev 23100)
+++ xfdesktop/trunk/modules/menu/desktop-menu.c	2006-09-07 19:48:00 UTC (rev 23101)
@@ -209,7 +209,7 @@
 }
 
 void
-_desktop_menu_ensure_unknown_icon()
+_desktop_menu_ensure_unknown_icon(void)
 {
     if(!unknown_icon)
         unknown_icon = gdk_pixbuf_new_from_inline(-1, xfce_unknown, TRUE, NULL);
@@ -242,6 +242,7 @@
         desktop_menu->using_default_menu = TRUE;
     }
     
+    g_return_val_if_fail (desktop_menu->filename != NULL, NULL);
     desktop_menu->cache_file_suffix = g_strdup(desktop_menu->filename);
     p = desktop_menu->cache_file_suffix;
     while(*p) {

Modified: xfdesktop/trunk/src/menu.c
===================================================================
--- xfdesktop/trunk/src/menu.c	2006-09-07 19:46:26 UTC (rev 23100)
+++ xfdesktop/trunk/src/menu.c	2006-09-07 19:48:00 UTC (rev 23101)
@@ -86,6 +86,9 @@
         xfce_desktop_menu_force_regen(desktop_menu);
     
     menu_widget = xfce_desktop_menu_get_widget(desktop_menu);
+    if (!menu_widget)
+        return;
+
     gtk_menu_set_screen(GTK_MENU(menu_widget), gscreen);
     
     root = gdk_screen_get_root_window(gscreen);