diff options
| author | Vincent Untz <[email protected]> | 2012-02-02 14:54:58 +0100 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2018-04-26 13:01:37 +0200 |
| commit | 1b7c43adfa25eee678661e4d56dfa37888ff27c0 (patch) | |
| tree | 0da6e30fd46ec17040d7aec92bc24040983eb8ac /mate-panel/panel-properties-dialog.c | |
| parent | ee07e90d14c15dbf45899d6c70614fe2068cd640 (diff) | |
| download | mate-panel-1b7c43adfa25eee678661e4d56dfa37888ff27c0.tar.bz2 mate-panel-1b7c43adfa25eee678661e4d56dfa37888ff27c0.tar.xz | |
panel: Convert to GResource
origin commits:
https://git.gnome.org/browse/gnome-panel/commit/?h=gnome-3-4&id=9fca67f
https://git.gnome.org/browse/gnome-panel/commit/?h=gnome-3-4&id=695d30c
https://git.gnome.org/browse/gnome-panel/patch/?id=00f9870cb28e6ef657d1
Diffstat (limited to 'mate-panel/panel-properties-dialog.c')
| -rw-r--r-- | mate-panel/panel-properties-dialog.c | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/mate-panel/panel-properties-dialog.c b/mate-panel/panel-properties-dialog.c index 809d7ff8..97a9babd 100644 --- a/mate-panel/panel-properties-dialog.c +++ b/mate-panel/panel-properties-dialog.c @@ -30,7 +30,6 @@ #include <glib/gi18n.h> #include <gio/gio.h> -#include <libpanel-util/panel-error.h> #include <libpanel-util/panel-glib.h> #include <libpanel-util/panel-gtk.h> #include <libpanel-util/panel-icon-chooser.h> @@ -911,7 +910,6 @@ panel_properties_dialog_present (PanelToplevel *toplevel) { PanelPropertiesDialog *dialog; GtkBuilder *gui; - GError *error; if (!panel_properties_dialog_quark) panel_properties_dialog_quark = @@ -927,29 +925,9 @@ panel_properties_dialog_present (PanelToplevel *toplevel) gui = gtk_builder_new (); gtk_builder_set_translation_domain (gui, GETTEXT_PACKAGE); - - error = NULL; - gtk_builder_add_from_file (gui, - BUILDERDIR "/panel-properties-dialog.ui", - &error); - - if (error) { - char *secondary; - - secondary = g_strdup_printf (_("Unable to load file '%s': %s."), - BUILDERDIR"/panel-properties-dialog.ui", - error->message); - panel_error_dialog (GTK_WINDOW (toplevel), - gtk_window_get_screen (GTK_WINDOW (toplevel)), - "cannot_display_properties_dialog", TRUE, - _("Could not display properties dialog"), - secondary); - g_free (secondary); - g_error_free (error); - g_object_unref (gui); - - return; - } + gtk_builder_add_from_resource (gui, + PANEL_RESOURCE_PATH "panel-properties-dialog.ui", + NULL); dialog = panel_properties_dialog_new (toplevel, gui); |