Author: kelnos
Date: 2006-12-08 23:18:41 +0000 (Fri, 08 Dec 2006)
New Revision: 24064
Modified:
xfdesktop/trunk/src/windowlist.c
Log:
this NULL pointer should probably never happen, but klockwork noticed it,
so i might as well guard against it.
Modified: xfdesktop/trunk/src/windowlist.c
===================================================================
--- xfdesktop/trunk/src/windowlist.c 2006-12-08 22:18:01 UTC (rev 24063)
+++ xfdesktop/trunk/src/windowlist.c 2006-12-08 23:18:41 UTC (rev 24064)
@@ -199,6 +199,8 @@
gint w, h;
PangoFontDescription *italic_font_desc =
pango_font_description_from_string("italic");
+ g_return_val_if_fail(GDK_IS_SCREEN(gscreen), NULL);
+
gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &w, &h);
menu = gtk_menu_new();
@@ -340,18 +342,23 @@
if(!show_windowlist)
return;
+ g_return_if_fail(GDK_IS_SCREEN(gscreen));
+
root = gdk_screen_get_root_window(gscreen);
- if (xfdesktop_popup_grab_available(root, time)) {
+ if(xfdesktop_popup_grab_available(root, time)) {
GtkWidget *windowlist;
windowlist = windowlist_create(gscreen);
- gtk_menu_set_screen(GTK_MENU(windowlist), gscreen);
- g_signal_connect_swapped(G_OBJECT(windowlist), "deactivate",
- G_CALLBACK(g_idle_add), (gpointer)windowlist_deactivate_idled);
- gtk_menu_popup(GTK_MENU(windowlist), NULL, NULL, NULL, NULL, button,
time);
- }
- else
- g_critical("Unable to get keyboard/mouse grab. Unable to popup
windowlist");
+ if(windowlist) {
+ gtk_menu_set_screen(GTK_MENU(windowlist), gscreen);
+ g_signal_connect_swapped(G_OBJECT(windowlist), "deactivate",
+ G_CALLBACK(g_idle_add),
+ (gpointer)windowlist_deactivate_idled);
+ gtk_menu_popup(GTK_MENU(windowlist), NULL, NULL, NULL, NULL,
+ button, time);
+ }
+ } else
+ g_critical("Unable to get keyboard/mouse grab. Unable to pop up
windowlist");
}
void
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
