← Back to branch summary

~ubuntu-branches/ubuntu/saucy/xfce4-panel/saucy

« back to all changes in this revision

Viewing changes to plugins/applicationsmenu/applicationsmenu.c

  • Committer: Package Import Robot
  • Author(s): Lionel Le Folgoc
  • Date: 2011-09-22 20:49:42 UTC
  • mfrom: (1.1.34 upstream)
  • Revision ID: package-import@ubuntu.com-20110922204942-i4ajy71ldiq17sz2
Tags: 4.8.6-0ubuntu1
https://launchpad.net/bugs/747137
* Upload pkg-xfce trunk (r6047) to oneiric, remaining Ubuntu changes:
  - debian/patches:
    + xubuntu_support-multiple-vendor-default-configs.patch: search for
      the default.xml default config in XDG_CONFIG_DIRS as well, and do
      not display the chooser dialog in this case. lp: #747137
    + series: refreshed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/applicationsmenu/applicationsmenu.c
1031
1031
      else
1032
1032
        {
1033
1033
          xfce_dialog_show_error (NULL, error, _("Failed to load the applications menu"));
1034
 
          g_error_free (error);
1035
1034
 
1036
1035
          gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), FALSE);
1037
1036
 
 
1037
          if (G_LIKELY (error != NULL))
 
1038
            g_error_free (error);
1038
1039
          if (G_LIKELY (menu != NULL))
1039
1040
            g_object_unref (G_OBJECT (menu));
1040
1041