~agateau/libdbusmenu/fix-gtk3-warnings

« back to all changes in this revision

Viewing changes to libdbusmenu-gtk/parser.c

  • Committer: Ted Gould
  • Date: 2011-12-01 19:28:39 UTC
  • mfrom: (344.2.1 lp870742-show-image)
  • Revision ID: ted@gould.cx-20111201192839-b670uweut4l37f13
Add in a check for always-show-image getting a different type

Show diffs side-by-side

added added

removed removed

Lines of Context:
1059
1059
                                           DBUSMENU_MENUITEM_PROP_VISIBLE,
1060
1060
                                           g_value_get_boolean (&prop_value));
1061
1061
    }
1062
 
  else if (pspec->name == g_intern_static_string ("image") ||
1063
 
           pspec->name == g_intern_static_string ("always-show-image"))
 
1062
  else if (pspec->name == g_intern_static_string ("always-show-image"))
 
1063
    {
 
1064
      GtkWidget *image = NULL;
 
1065
      g_object_get(widget, "image", &image, NULL);
 
1066
      update_icon (child, GTK_IMAGE(image));
 
1067
    }
 
1068
  else if (pspec->name == g_intern_static_string ("image"))
1064
1069
    {
1065
1070
      GtkWidget *image;
1066
1071
      image = GTK_WIDGET (g_value_get_object (&prop_value));