From 39dd68c577930ea397ff80477b4ad50b7989a8d3 Mon Sep 17 00:00:00 2001 From: rbuj Date: Wed, 3 Feb 2021 12:58:10 +0100 Subject: applets: Do not build the path to the menu files --- applets/brightness/brightness-applet.c | 7 +++---- applets/inhibit/inhibit-applet.c | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/applets/brightness/brightness-applet.c b/applets/brightness/brightness-applet.c index e603d31..e2891da 100644 --- a/applets/brightness/brightness-applet.c +++ b/applets/brightness/brightness-applet.c @@ -1075,7 +1075,6 @@ gpm_applet_cb (MatePanelApplet *_applet, const gchar *iid, gpointer data) { GpmBrightnessApplet *applet = GPM_BRIGHTNESS_APPLET(_applet); GtkActionGroup *action_group; - gchar *ui_path; static const GtkActionEntry menu_actions [] = { { "About", "help-about", N_("_About"), @@ -1096,9 +1095,9 @@ gpm_applet_cb (MatePanelApplet *_applet, const gchar *iid, gpointer data) menu_actions, G_N_ELEMENTS (menu_actions), applet); - ui_path = g_build_filename (BRIGHTNESS_MENU_UI_DIR, "brightness-applet-menu.xml", NULL); - mate_panel_applet_setup_menu_from_file (MATE_PANEL_APPLET (applet), ui_path, action_group); - g_free (ui_path); + mate_panel_applet_setup_menu_from_file (MATE_PANEL_APPLET (applet), + BRIGHTNESS_MENU_UI_DIR "/brightness-applet-menu.xml", + action_group); g_object_unref (action_group); gpm_applet_draw_cb (applet); diff --git a/applets/inhibit/inhibit-applet.c b/applets/inhibit/inhibit-applet.c index 849ff7c..8daf645 100644 --- a/applets/inhibit/inhibit-applet.c +++ b/applets/inhibit/inhibit-applet.c @@ -497,7 +497,6 @@ gpm_applet_cb (MatePanelApplet *_applet, const gchar *iid, gpointer data) { GpmInhibitApplet *applet = GPM_INHIBIT_APPLET(_applet); GtkActionGroup *action_group; - gchar *ui_path; static const GtkActionEntry menu_actions [] = { { "About", "help-about", N_("_About"), @@ -518,9 +517,9 @@ gpm_applet_cb (MatePanelApplet *_applet, const gchar *iid, gpointer data) menu_actions, G_N_ELEMENTS (menu_actions), applet); - ui_path = g_build_filename (INHIBIT_MENU_UI_DIR, "inhibit-applet-menu.xml", NULL); - mate_panel_applet_setup_menu_from_file (MATE_PANEL_APPLET (applet), ui_path, action_group); - g_free (ui_path); + mate_panel_applet_setup_menu_from_file (MATE_PANEL_APPLET (applet), + INHIBIT_MENU_UI_DIR "/inhibit-applet-menu.xml", + action_group); g_object_unref (action_group); return TRUE; -- cgit v1.2.1