ayatana-commits team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Ted Gould (ted)
Related merge proposals:
  https://code.launchpad.net/~ted/dbusmenu/group-warning-okay/+merge/29406
  proposed by: Ted Gould (ted)
  review: Approve - Cody Russell (bratsche)
------------------------------------------------------------
revno: 129 [merge]
committer: Ted Gould <ted@xxxxxxxx>
branch nick: trunk
timestamp: Wed 2010-07-07 13:48:58 -0500
message:
  Lowering the warning from group not being found warnings.
modified:
  libdbusmenu-gtk/menuitem.c


--
lp:dbusmenu
https://code.launchpad.net/~dbusmenu-team/dbusmenu/trunk

Your team ayatana-commits is subscribed to branch lp:dbusmenu.
To unsubscribe from this branch go to https://code.launchpad.net/~dbusmenu-team/dbusmenu/trunk/+edit-subscription

=== modified file 'libdbusmenu-gtk/menuitem.c'
--- libdbusmenu-gtk/menuitem.c	2010-06-23 19:50:26 +0000
+++ libdbusmenu-gtk/menuitem.c	2010-07-07 16:46:37 +0000
@@ -264,9 +264,10 @@
 
 	GtkAccelGroup * group = gtk_accel_group_from_accel_closure(closure);
 
-	/* Seriously, if this returns NULL something is seriously
-	   wrong in GTK. */
-	g_return_val_if_fail(group != NULL, FALSE);
+	/* Apparently this is more common than I thought. */
+	if (group == NULL) {
+		return FALSE;
+	}
 
 	GtkAccelKey * key = gtk_accel_group_find(group, find_closure, closure);
 	/* Again, not much we can do except complain loudly. */