diff options
| author | Vincent Untz <[email protected]> | 2012-02-02 12:22:04 +0100 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2018-04-26 13:01:37 +0200 |
| commit | e1db0723dfba93d36d36b3b4e4327e9965aa90d4 (patch) | |
| tree | 8e2cdb4ea34596edc29d58142561a1216313e0e8 /applets/wncklet/showdesktop.c | |
| parent | 1b7c43adfa25eee678661e4d56dfa37888ff27c0 (diff) | |
| download | mate-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/showdesktop.c')
| -rw-r--r-- | applets/wncklet/showdesktop.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/applets/wncklet/showdesktop.c b/applets/wncklet/showdesktop.c index c1ab01ca..72b71763 100644 --- a/applets/wncklet/showdesktop.c +++ b/applets/wncklet/showdesktop.c @@ -372,7 +372,6 @@ gboolean show_desktop_applet_fill(MatePanelApplet* applet) { ShowDesktopData* sdd; GtkActionGroup* action_group; - gchar* ui_path; AtkObject* atk_obj; GtkCssProvider *provider; @@ -440,9 +439,9 @@ gboolean show_desktop_applet_fill(MatePanelApplet* applet) action_group = gtk_action_group_new("ShowDesktop Applet Actions"); gtk_action_group_set_translation_domain(action_group, GETTEXT_PACKAGE); gtk_action_group_add_actions(action_group, show_desktop_menu_actions, G_N_ELEMENTS (show_desktop_menu_actions), sdd); - ui_path = g_build_filename(WNCK_MENU_UI_DIR, "showdesktop-menu.xml", NULL); - mate_panel_applet_setup_menu_from_file(MATE_PANEL_APPLET(sdd->applet), ui_path, action_group); - g_free(ui_path); + mate_panel_applet_setup_menu_from_resource (MATE_PANEL_APPLET (sdd->applet), + WNCKLET_RESOURCE_PATH "showdesktop-menu.xml", + action_group); g_object_unref(action_group); g_signal_connect(G_OBJECT(sdd->applet), "destroy", G_CALLBACK(applet_destroyed), sdd); |