diff options
| author | Ted Gould <ted@gould.cx> | 2010-03-12 17:33:49 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-03-12 17:33:49 -0600 |
| commit | 62a79745a976eb7459a9f3aaeb9f6fa7e021897f (patch) | |
| tree | 79e6c7778a6d8a247bc0a661b61f10b5970a1ee8 /src/gconf-helper.c | |
| parent | 44d2e3243736990ca867eba36f4371252e2adf11 (diff) | |
| parent | eaf244dd1022818c3780b138497c79ff51bf0a54 (diff) | |
| download | ayatana-indicator-session-62a79745a976eb7459a9f3aaeb9f6fa7e021897f.tar.gz ayatana-indicator-session-62a79745a976eb7459a9f3aaeb9f6fa7e021897f.tar.bz2 ayatana-indicator-session-62a79745a976eb7459a9f3aaeb9f6fa7e021897f.zip | |
Merging to trunk to remove merge conflicts.
Diffstat (limited to 'src/gconf-helper.c')
| -rw-r--r-- | src/gconf-helper.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gconf-helper.c b/src/gconf-helper.c index 9262b19..5efc439 100644 --- a/src/gconf-helper.c +++ b/src/gconf-helper.c @@ -30,6 +30,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <libdbusmenu-glib/server.h> #include <libdbusmenu-glib/menuitem.h> +#include "dbus-shared-names.h" #include "gconf-helper.h" static GConfClient * gconf_client = NULL; @@ -50,11 +51,11 @@ static void update_menu_entries_callback (GConfClient *client, guint cnxn_id, GC if(g_strcmp0 (key, SUPPRESS_KEY) == 0) { if (gconf_value_get_bool (value)) { dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->logout_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Log Out")); - dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart")); + dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->restart_mi, RESTART_ITEM_LABEL, _("Restart")); dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Switch Off")); } else { dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->logout_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Log Out...")); - dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart...")); + dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->restart_mi, RESTART_ITEM_LABEL, _("Restart...")); dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Switch Off...")); } } |