summaryrefslogtreecommitdiff
path: root/applets/wncklet/workspace-switcher.c
diff options
context:
space:
mode:
authorVincent Untz <[email protected]>2012-02-02 12:22:04 +0100
committerraveit65 <[email protected]>2018-04-26 13:01:37 +0200
commite1db0723dfba93d36d36b3b4e4327e9965aa90d4 (patch)
tree8e2cdb4ea34596edc29d58142561a1216313e0e8 /applets/wncklet/workspace-switcher.c
parent1b7c43adfa25eee678661e4d56dfa37888ff27c0 (diff)
downloadmate-panel-e1db0723dfba93d36d36b3b4e4327e9965aa90d4.tar.bz2
mate-panel-e1db0723dfba93d36d36b3b4e4327e9965aa90d4.tar.xz
wncklet: Convert to GResource
origin commits: https://git.gnome.org/browse/gnome-panel/commit/?h=gnome-3-4&id=9fbca7d https://git.gnome.org/browse/gnome-panel/commit/?h=gnome-3-4&id=695d30c https://git.gnome.org/browse/gnome-panel/commit/?h=gnome-3-4&id=00f9870
Diffstat (limited to 'applets/wncklet/workspace-switcher.c')
-rw-r--r--applets/wncklet/workspace-switcher.c19
1 files changed, 4 insertions, 15 deletions
diff --git a/applets/wncklet/workspace-switcher.c b/applets/wncklet/workspace-switcher.c
index 09a81d0b..2a13cebe 100644
--- a/applets/wncklet/workspace-switcher.c
+++ b/applets/wncklet/workspace-switcher.c
@@ -492,7 +492,6 @@ gboolean workspace_switcher_applet_fill(MatePanelApplet* applet)
{
PagerData* pager;
GtkActionGroup* action_group;
- gchar* ui_path;
gboolean display_names;
GtkCssProvider *provider;
@@ -577,9 +576,9 @@ gboolean workspace_switcher_applet_fill(MatePanelApplet* applet)
action_group = gtk_action_group_new("WorkspaceSwitcher Applet Actions");
gtk_action_group_set_translation_domain(action_group, GETTEXT_PACKAGE);
gtk_action_group_add_actions(action_group, pager_menu_actions, G_N_ELEMENTS(pager_menu_actions), pager);
- ui_path = g_build_filename(WNCK_MENU_UI_DIR, "workspace-switcher-menu.xml", NULL);
- mate_panel_applet_setup_menu_from_file(MATE_PANEL_APPLET(pager->applet), ui_path, action_group);
- g_free(ui_path);
+ mate_panel_applet_setup_menu_from_resource (MATE_PANEL_APPLET (pager->applet),
+ WNCKLET_RESOURCE_PATH "workspace-switcher-menu.xml",
+ action_group);
if (mate_panel_applet_get_locked_down(MATE_PANEL_APPLET(pager->applet)))
{
@@ -968,20 +967,10 @@ static void display_properties_dialog(GtkAction* action, PagerData* pager)
if (pager->properties_dialog == NULL)
{
GtkBuilder* builder;
- GError* error;
builder = gtk_builder_new();
gtk_builder_set_translation_domain(builder, GETTEXT_PACKAGE);
-
- error = NULL;
- gtk_builder_add_from_file(builder, PAGER_BUILDERDIR "/workspace-switcher.ui", &error);
-
- if (error)
- {
- g_warning("Error loading preferences: %s", error->message);
- g_error_free(error);
- return;
- }
+ gtk_builder_add_from_resource (builder, WNCKLET_RESOURCE_PATH "workspace-switcher.ui", NULL);
pager->properties_dialog = WID("pager_properties_dialog");