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/session-service.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/session-service.c')
| -rw-r--r-- | src/session-service.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/session-service.c b/src/session-service.c index 75c8650..ace4a7d 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -557,10 +557,11 @@ rebuild_items (DbusmenuMenuitem *root, g_signal_connect(G_OBJECT(hibernate_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(machine_sleep), "Hibernate"); restart_mi = dbusmenu_menuitem_new(); + dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_TYPE, RESTART_ITEM_TYPE); if (supress_confirmations()) { - dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart")); + dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart")); } else { - dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart...")); + dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart...")); } dbusmenu_menuitem_child_append(root, restart_mi); g_signal_connect(G_OBJECT(restart_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(show_dialog), "restart"); @@ -617,21 +618,21 @@ restart_dir_changed (void) if (restart_required) { if (supress_confirmations()) { - dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart Required")); + dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart Required")); } else { - dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart Required...")); + dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart Required...")); } - dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_ICON_NAME, "emblem-important"); + dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_ICON, "emblem-important"); if (session_dbus != NULL) { session_dbus_set_name(session_dbus, ICON_RESTART); } - } else { + } else { if (supress_confirmations()) { - dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart")); + dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart")); } else { - dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart...")); + dbusmenu_menuitem_property_set(restart_mi, RESTART_ITEM_LABEL, _("Restart...")); } - dbusmenu_menuitem_property_remove(restart_mi, DBUSMENU_MENUITEM_PROP_ICON_NAME); + dbusmenu_menuitem_property_remove(restart_mi, RESTART_ITEM_ICON); if (session_dbus != NULL) { session_dbus_set_name(session_dbus, ICON_DEFAULT); } |