cpw.darkrain42.xmpp.disco: b727fd1a: Avoid an assertion when nothing in dropd...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: b727fd1aecf23c72e9ec263c797199431603a1c5
Ancestor: 56e5729618b10eead2518c036bc2b12e7b326b5d
Author: darkrain42 at pidgin.im
Date: 2009-05-24T18:39:32
Branch: im.pidgin.cpw.darkrain42.xmpp.disco
URL: http://d.pidgin.im/viewmtn/revision/info/b727fd1aecf23c72e9ec263c797199431603a1c5

Modified files:
        pidgin/gtkutils.c

ChangeLog: 

Avoid an assertion when nothing in dropdown is selected.

This happens with an account filter on XMPP accounts and no XMPP accounts
are connected, so there's nothing in the dropdown.

-------------- next part --------------
============================================================
--- pidgin/gtkutils.c	17f8decb6d1cf73f09dc584079c05b94d54a7aeb
+++ pidgin/gtkutils.c	1830f376340273a9e88aa814def447150855abe2
@@ -525,7 +525,7 @@ aop_option_menu_get_selected(GtkWidget *
 	GtkWidget *item = gtk_menu_get_active(GTK_MENU(menu));
 	if (p_item)
 		(*p_item) = item;
-	return g_object_get_data(G_OBJECT(item), "aop_per_item_data");
+	return item ? g_object_get_data(G_OBJECT(item), "aop_per_item_data") : NULL;
 }
 
 static void