From 6b461deac9fb64ff6c92958475497b7050b0bc94 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 2 Feb 2012 14:54:58 +0100 Subject: 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 --- mate-panel/panel-properties-dialog.c | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) (limited to 'mate-panel/panel-properties-dialog.c') 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 #include -#include #include #include #include @@ -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); -- cgit v1.2.1