diff options
| author | Vincent Untz <[email protected]> | 2012-02-02 14:54:58 +0100 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2018-04-26 13:05:10 +0200 |
| commit | 6b461deac9fb64ff6c92958475497b7050b0bc94 (patch) | |
| tree | dab6d30cfd9d0750b84604fe795e9f96c1905c62 /mate-panel/panel-run-dialog.c | |
| parent | 72982f7175c1badf2b177cc9eeaa3e696551f354 (diff) | |
| download | mate-panel-6b461deac9fb64ff6c92958475497b7050b0bc94.tar.bz2 mate-panel-6b461deac9fb64ff6c92958475497b7050b0bc94.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-run-dialog.c')
| -rw-r--r-- | mate-panel/panel-run-dialog.c | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/mate-panel/panel-run-dialog.c b/mate-panel/panel-run-dialog.c index 4d5cce0a..a42ad39d 100644 --- a/mate-panel/panel-run-dialog.c +++ b/mate-panel/panel-run-dialog.c @@ -55,6 +55,7 @@ #include "panel-globals.h" #include "panel-enums.h" #include "panel-profile.h" +#include "panel-schemas.h" #include "panel-stock-icons.h" #include "panel-multiscreen.h" #include "menu.h" @@ -2011,7 +2012,6 @@ panel_run_dialog_present (GdkScreen *screen, guint32 activate_time) { GtkBuilder *gui; - GError *error; if (panel_lockdown_get_disable_command_line ()) return; @@ -2026,28 +2026,9 @@ panel_run_dialog_present (GdkScreen *screen, gui = gtk_builder_new (); gtk_builder_set_translation_domain (gui, GETTEXT_PACKAGE); - - error = NULL; - gtk_builder_add_from_file (gui, - BUILDERDIR "/panel-run-dialog.ui", - &error); - - if (error) { - char *secondary; - - secondary = g_strdup_printf (_("Unable to load file '%s': %s."), - BUILDERDIR"/panel-run-dialog.ui", - error->message); - panel_error_dialog (NULL, screen, "cannot_display_run_dialog", - TRUE, - _("Could not display run dialog"), - secondary); - g_free (secondary); - g_error_free (error); - g_object_unref (gui); - - return; - } + gtk_builder_add_from_resource (gui, + PANEL_RESOURCE_PATH "panel-run-dialog.ui", + NULL); static_dialog = panel_run_dialog_new (screen, gui, activate_time); |