From 96137411b48cef5bd2228809e50dd6bd91cd2d2e Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev Date: Wed, 26 Oct 2011 11:03:43 +0400 Subject: Swap return values of indicator_session_get_location --- 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 9510807..7c43935 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -277,10 +277,10 @@ indicator_session_get_location (IndicatorObject * io, { IndicatorSession * self = INDICATOR_SESSION (io); if (entry == &self->users){ - return 1; + return 0; } else if (entry == &self->devices){ - return 0; + return 1; } g_warning ("IOEntry handed to us to position but we don't own it!"); return 0; -- cgit v1.2.3 From 7e6cd986af1e0885ac5424a359a6c104ca004936 Mon Sep 17 00:00:00 2001 From: "Marco Trevisan (Treviño)" Date: Tue, 8 Nov 2011 23:48:18 +0100 Subject: Export the indicators name hints Using the PACKAGE config.h variable both for the users and devices entries. --- src/indicator-session.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/indicator-session.c') diff --git a/src/indicator-session.c b/src/indicator-session.c index 9510807..ec49f0e 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -118,8 +118,8 @@ indicator_session_class_init (IndicatorSessionClass *klass) object_class->finalize = indicator_session_finalize; IndicatorObjectClass * io_class = INDICATOR_OBJECT_CLASS(klass); - io_class->get_entries = indicator_session_get_entries; - io_class->get_location = indicator_session_get_location; + io_class->get_entries = indicator_session_get_entries; + io_class->get_location = indicator_session_get_location; return; } @@ -140,6 +140,7 @@ indicator_session_init (IndicatorSession *self) GtkWidget* avatar_icon = NULL; // users + self->users.name_hint = PACKAGE"-users"; self->users.menu = GTK_MENU (dbusmenu_gtkmenu_new (INDICATOR_USERS_DBUS_NAME, INDICATOR_USERS_DBUS_OBJECT)); // Set the image to the default avator image @@ -169,7 +170,9 @@ indicator_session_init (IndicatorSession *self) const gchar *greeter_var; greeter_var = g_getenv("INDICATOR_GREETER_MODE"); greeter_mode = g_strcmp0(greeter_var, "1") == 0; + // devices + self->devices.name_hint = PACKAGE"-devices"; self->devices.menu = GTK_MENU (dbusmenu_gtkmenu_new(INDICATOR_SESSION_DBUS_NAME, INDICATOR_SESSION_DBUS_OBJECT)); if (greeter_mode){ -- cgit v1.2.3 From ab073d8e5adf1b6771f5d9e5f4b8aaf20800b604 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 31 Jan 2012 21:21:26 -0600 Subject: Modifying includes to not include libdbusmenu-gtk3 stuff --- src/apt-watcher.h | 4 ---- src/device-menu-mgr.c | 1 - src/indicator-session.c | 4 ---- src/session-service.c | 4 ---- src/udev-mgr.h | 4 ---- src/user-menu-mgr.h | 2 +- src/user-widget.h | 4 ---- 7 files changed, 1 insertion(+), 22 deletions(-) (limited to 'src/indicator-session.c') diff --git a/src/apt-watcher.h b/src/apt-watcher.h index 7b98a44..6b7d5e1 100644 --- a/src/apt-watcher.h +++ b/src/apt-watcher.h @@ -25,11 +25,7 @@ with this program. If not, see . #include #include -#if GTK_CHECK_VERSION(3, 0, 0) -#include -#else #include -#endif #include "session-dbus.h" diff --git a/src/device-menu-mgr.c b/src/device-menu-mgr.c index 3858564..6ce5962 100644 --- a/src/device-menu-mgr.c +++ b/src/device-menu-mgr.c @@ -19,7 +19,6 @@ with this program. If not, see . #include #include -#include #include "device-menu-mgr.h" #include "settings-helper.h" diff --git a/src/indicator-session.c b/src/indicator-session.c index ec49f0e..bd7bcd3 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -31,11 +31,7 @@ with this program. If not, see . #include #include -#if GTK_CHECK_VERSION(3, 0, 0) -#include -#else #include -#endif #include #include diff --git a/src/session-service.c b/src/session-service.c index 753e304..6ee18e9 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -39,11 +39,7 @@ with this program. If not, see . #include #include -#if GTK_CHECK_VERSION(3, 0, 0) -#include -#else #include -#endif #include diff --git a/src/udev-mgr.h b/src/udev-mgr.h index 5119803..2e57cff 100644 --- a/src/udev-mgr.h +++ b/src/udev-mgr.h @@ -24,11 +24,7 @@ with this program. If not, see . #include #include -#if GTK_CHECK_VERSION(3, 0, 0) -#include -#else #include -#endif G_BEGIN_DECLS diff --git a/src/user-menu-mgr.h b/src/user-menu-mgr.h index 01823e7..40f7b18 100644 --- a/src/user-menu-mgr.h +++ b/src/user-menu-mgr.h @@ -23,7 +23,7 @@ with this program. If not, see . #include -#include +#include #include "session-dbus.h" diff --git a/src/user-widget.h b/src/user-widget.h index e1f6d1a..52a5e34 100644 --- a/src/user-widget.h +++ b/src/user-widget.h @@ -20,11 +20,7 @@ with this program. If not, see . #define __USER_WIDGET_H__ #include -#if GTK_CHECK_VERSION(3, 0, 0) -#include -#else #include -#endif G_BEGIN_DECLS -- cgit v1.2.3