DBus Menu

Merge lp:~ted/libdbusmenu/annoying-image-error into lp:libdbusmenu/0.5

  1. annoying-image-error
  2. Merge into trunk
Proposed by Ted Gould
Status: Merged
Merged at revision: not available
Proposed branch: lp:~ted/libdbusmenu/annoying-image-error
Merge into: lp:libdbusmenu/0.5
Diff against target: 14 lines (+4/-1)
1 file modified
libdbusmenu-gtk/client.c (+4/-1)
To merge this branch: bzr merge lp:~ted/libdbusmenu/annoying-image-error
Reviewer Review Type Date Requested Status
Cody Russell (community) Approve
Review via email: mp+17926@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ted Gould (ted) wrote :

Changes a g_return_if_fail to be a traditional check. The message that
is printed isn't useful and unnecessarily scary.

Revision history for this message
Cody Russell (bratsche) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libdbusmenu-gtk/client.c'
2--- libdbusmenu-gtk/client.c 2010-01-11 18:42:55 +0000
3+++ libdbusmenu-gtk/client.c 2010-01-22 21:15:22 +0000
4@@ -468,7 +468,10 @@
5 image_property_handle (DbusmenuMenuitem * item, const gchar * property, const GValue * invalue, gpointer userdata)
6 {
7 /* We're only looking at these two properties here */
8- g_return_if_fail(!g_strcmp0(property, DBUSMENU_MENUITEM_PROP_ICON) || !g_strcmp0(property, DBUSMENU_MENUITEM_PROP_ICON_DATA));
9+ if (g_strcmp0(property, DBUSMENU_MENUITEM_PROP_ICON) != 0 &&
10+ g_strcmp0(property, DBUSMENU_MENUITEM_PROP_ICON_DATA) != 0) {
11+ return;
12+ }
13
14 const gchar * value = NULL;
15

Subscribers

People subscribed via source and target branches