From 229e92aa9c59c822808bf9e129592247347e22b8 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 19 Aug 2011 21:23:57 -0500 Subject: Fix all the ellipsis --- src/indicator-session.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/indicator-session.c') diff --git a/src/indicator-session.c b/src/indicator-session.c index bfe0b75..80bf63f 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -529,7 +529,7 @@ switch_property_change (DbusmenuMenuitem * item, if (variant == NULL || g_variant_get_string(variant, NULL) == NULL || g_variant_get_string(variant, NULL)[0] == '\0' || no_name_in_lang) { - finalstring = _("Switch User..."); + finalstring = _("Switch User…"); set_ellipsize = FALSE; } @@ -556,7 +556,7 @@ switch_property_change (DbusmenuMenuitem * item, gdouble ems = width / pixels_per_em; g_debug("Username width %fem", ems); - finalstring = g_strdup_printf(_("Switch From %s..."), username); + finalstring = g_strdup_printf(_("Switch From %s…"), username); if (ems >= 20.0f) { set_ellipsize = TRUE; } else { -- cgit v1.2.3 From 84a75758a3a76b024168612b3932d7b09e5bd1a8 Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Mon, 22 Aug 2011 14:05:48 +0100 Subject: used the set aside defines for icon names --- src/dbus-shared-names.h | 4 ++-- src/indicator-session.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/indicator-session.c') diff --git a/src/dbus-shared-names.h b/src/dbus-shared-names.h index d9dfff1..c71dc61 100644 --- a/src/dbus-shared-names.h +++ b/src/dbus-shared-names.h @@ -61,7 +61,7 @@ typedef enum { #define RESTART_ITEM_LABEL "restart-label" #define RESTART_ITEM_ICON "restart-icon" -#define ICON_DEFAULT "system-shutdown-panel" -#define ICON_RESTART "system-shutdown-panel-restart" +#define ICON_DEFAULT "system-devices-panel" +#define ICON_RESTART "system-devices-panel-alert" #endif /* __DBUS_SHARED_NAMES_H__ */ diff --git a/src/indicator-session.c b/src/indicator-session.c index c980378..fab47b3 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -167,7 +167,7 @@ indicator_session_init (IndicatorSession *self) // devices self->devices.menu = GTK_MENU (dbusmenu_gtkmenu_new(INDICATOR_SESSION_DBUS_NAME, INDICATOR_SESSION_DBUS_OBJECT)); - self->devices.image = indicator_image_helper ("system-devices-panel"); + self->devices.image = indicator_image_helper (ICON_DEFAULT); gtk_widget_show (GTK_WIDGET(self->devices.menu)); gtk_widget_show (GTK_WIDGET(self->devices.image)); @@ -499,7 +499,7 @@ receive_signal (GDBusProxy * proxy, } else if (g_strcmp0(signal_name, "RebootRequired") == 0) { // TODO waiting on design to give me a name. - self->devices.image = indicator_image_helper ("system-devices-alert-panel"); + self->devices.image = indicator_image_helper (ICON_RESTART); } } -- cgit v1.2.3