diff options
| author | Ted Gould <ted@gould.cx> | 2010-03-12 15:49:52 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-03-12 15:49:52 -0600 |
| commit | 2dd05e216cdc0e7ab9318a410758eade2d3e68a4 (patch) | |
| tree | 3627bd1ba8b497c49739dc5b917b27bc0a2bb57f | |
| parent | 746636765323cb223ef84af13920a9620176eb4f (diff) | |
| download | ayatana-indicator-session-2dd05e216cdc0e7ab9318a410758eade2d3e68a4.tar.gz ayatana-indicator-session-2dd05e216cdc0e7ab9318a410758eade2d3e68a4.tar.bz2 ayatana-indicator-session-2dd05e216cdc0e7ab9318a410758eade2d3e68a4.zip | |
Moving the icon names into the shared header files
| -rw-r--r-- | src/dbus-shared-names.h | 3 | ||||
| -rw-r--r-- | src/indicator-session.c | 4 | ||||
| -rw-r--r-- | src/session-dbus.c | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/dbus-shared-names.h b/src/dbus-shared-names.h index 2c30b36..8cbb488 100644 --- a/src/dbus-shared-names.h +++ b/src/dbus-shared-names.h @@ -45,4 +45,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #define USER_ITEM_PROP_NAME "user-item-name" #define USER_ITEM_PROP_LOGGED_IN "user-item-logged-in" +#define ICON_DEFAULT "system-shutdown-panel" +#define ICON_RESTART "system-shutdown-restart-panel" + #endif /* __DBUS_SHARED_NAMES_H__ */ diff --git a/src/indicator-session.c b/src/indicator-session.c index 6e259dc..de18bb3 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -107,7 +107,7 @@ indicator_session_init (IndicatorSession *self) self->service = indicator_service_manager_new_version(INDICATOR_SESSION_DBUS_NAME, INDICATOR_SESSION_DBUS_VERSION); g_signal_connect(G_OBJECT(self->service), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(service_connection_cb), self); - self->status_image = GTK_IMAGE(gtk_image_new_from_icon_name("system-shutdown-panel", GTK_ICON_SIZE_MENU)); + self->status_image = GTK_IMAGE(gtk_image_new_from_icon_name(ICON_DEFAULT, GTK_ICON_SIZE_MENU)); self->menu = dbusmenu_gtkmenu_new(INDICATOR_SESSION_DBUS_NAME, INDICATOR_SESSION_DBUS_OBJECT); DbusmenuClient * client = DBUSMENU_CLIENT(dbusmenu_gtkmenu_get_client(self->menu)); @@ -174,7 +174,7 @@ service_connection_cb (IndicatorServiceManager * sm, gboolean connected, gpointe if (connected) { org_ayatana_indicator_session_service_get_icon_async(self->service_proxy, icon_name_get_cb, user_data); } else { - gtk_image_set_from_icon_name(self->status_image, "system-shutdown-panel", GTK_ICON_SIZE_MENU); + gtk_image_set_from_icon_name(self->status_image, ICON_DEFAULT, GTK_ICON_SIZE_MENU); } return; diff --git a/src/session-dbus.c b/src/session-dbus.c index 7159d7f..1413916 100644 --- a/src/session-dbus.c +++ b/src/session-dbus.c @@ -63,7 +63,7 @@ session_dbus_init (SessionDbus *self) SessionDbusPrivate * priv = SESSION_DBUS_GET_PRIVATE(self); - priv->name = g_strdup("system-shutdown-panel"); + priv->name = g_strdup(ICON_DEFAULT); return; } |