From c4d38ac2f3589a83cbd9127c178da4926d5773aa Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 23 Aug 2011 10:25:11 -0500 Subject: Activate prototype --- src/user-menu-mgr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/user-menu-mgr.c b/src/user-menu-mgr.c index 588d3d0..5ac1c63 100644 --- a/src/user-menu-mgr.c +++ b/src/user-menu-mgr.c @@ -44,6 +44,9 @@ static void activate_new_session (DbusmenuMenuitem * mi, static void activate_user_session (DbusmenuMenuitem *mi, guint timestamp, gpointer user_data); +static void activate_user_accounts (DbusmenuMenuitem *mi, + guint timestamp, + gpointer user_data); static gint compare_users_by_username (const gchar *a, const gchar *b); static void activate_online_accounts (DbusmenuMenuitem *mi, -- cgit v1.2.3 From efe088c4fc2fef11117012d088c96ddd418696bf Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 23 Aug 2011 11:10:02 -0500 Subject: Adding a desktop file for shutting down --- .bzrignore | 2 ++ data/Makefile.am | 17 +++++++++++++++-- data/indicator-session-shutdown.desktop.in.in | 8 ++++++++ po/POTFILES.in | 1 + 4 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 data/indicator-session-shutdown.desktop.in.in diff --git a/.bzrignore b/.bzrignore index 3a062ec..7c24aab 100644 --- a/.bzrignore +++ b/.bzrignore @@ -203,3 +203,5 @@ src/libsession_la-user-widget.lo consolekit-seat-client.h data/com.canonical.indicator.session.gschema.valid data/com.canonical.indicator.session.gschema.xml +indicator-session-shutdown.desktop +indicator-session-shutdown.desktop.in diff --git a/data/Makefile.am b/data/Makefile.am index 27328fb..f2cfee8 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -18,13 +18,26 @@ gsettings_SCHEMAS = com.canonical.indicator.session.gschema.xml convertdir = $(datadir)/GConf/gsettings dist_convert_DATA = indicator-session.convert +@INTLTOOL_DESKTOP_RULE@ + +%.desktop.in: %.desktop.in.in + sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ + +logout_helper_desktop_in_in_files = \ + indicator-session-shutdown.desktop.in.in + +logout_helperdir = $(datadir)/applications +logout_helper_desktop_files = \ + $(logout_helper_desktop_in_in_files:.desktop.in.in=.desktop) EXTRA_DIST = \ $(service_in_files) \ - $(gsettings_SCHEMAS:.xml=.xml.in) + $(gsettings_SCHEMAS:.xml=.xml.in) \ + $(logout_helper_desktop_in_in_files) CLEANFILES = \ $(dbus_services_DATA) \ - $(gsettings_SCHEMAS) + $(gsettings_SCHEMAS) \ + $(logout_helper_desktop_files) diff --git a/data/indicator-session-shutdown.desktop.in.in b/data/indicator-session-shutdown.desktop.in.in new file mode 100644 index 0000000..419a952 --- /dev/null +++ b/data/indicator-session-shutdown.desktop.in.in @@ -0,0 +1,8 @@ +[Desktop Entry] +_Name=Shut Down +Try-Exec=@libexecdir@/gtk-logout-helper +Exec=@libexecdir@/gtk-logout-helper --shutdown +Icon=system-shutdown +Terminal=false +Type=Application +OnlyShowIn=Unity; diff --git a/po/POTFILES.in b/po/POTFILES.in index df89ec9..d19dc2e 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,6 +1,7 @@ [encoding: UTF-8] data/com.canonical.indicator.session.gschema.xml.in data/extra-sessions/classic-desktop.desktop.in.in +data/indicator-session-shutdown.desktop.in.in src/settings-helper.c src/lock-helper.c src/gtk-logout-helper.c -- cgit v1.2.3 From e6492845f60367ddbaea1ffae359a8b5e2364075 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 23 Aug 2011 11:20:56 -0500 Subject: Adding logout and restart desktop files as well --- .bzrignore | 4 ++++ data/Makefile.am | 2 ++ data/indicator-session-logout.desktop.in.in | 8 ++++++++ data/indicator-session-restart.desktop.in.in | 8 ++++++++ po/POTFILES.in | 2 ++ 5 files changed, 24 insertions(+) create mode 100644 data/indicator-session-logout.desktop.in.in create mode 100644 data/indicator-session-restart.desktop.in.in diff --git a/.bzrignore b/.bzrignore index 7c24aab..1b8a265 100644 --- a/.bzrignore +++ b/.bzrignore @@ -205,3 +205,7 @@ data/com.canonical.indicator.session.gschema.valid data/com.canonical.indicator.session.gschema.xml indicator-session-shutdown.desktop indicator-session-shutdown.desktop.in +indicator-session-logout.desktop.in +indicator-session-logout.desktop +indicator-session-restart.desktop.in +indicator-session-restart.desktop diff --git a/data/Makefile.am b/data/Makefile.am index f2cfee8..347f91f 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -24,6 +24,8 @@ dist_convert_DATA = indicator-session.convert sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ logout_helper_desktop_in_in_files = \ + indicator-session-logout.desktop.in.in \ + indicator-session-restart.desktop.in.in \ indicator-session-shutdown.desktop.in.in logout_helperdir = $(datadir)/applications diff --git a/data/indicator-session-logout.desktop.in.in b/data/indicator-session-logout.desktop.in.in new file mode 100644 index 0000000..78548d1 --- /dev/null +++ b/data/indicator-session-logout.desktop.in.in @@ -0,0 +1,8 @@ +[Desktop Entry] +_Name=Log Out +Try-Exec=@libexecdir@/gtk-logout-helper +Exec=@libexecdir@/gtk-logout-helper --logout +Icon=system-log-out +Terminal=false +Type=Application +OnlyShowIn=Unity; diff --git a/data/indicator-session-restart.desktop.in.in b/data/indicator-session-restart.desktop.in.in new file mode 100644 index 0000000..68a2f7f --- /dev/null +++ b/data/indicator-session-restart.desktop.in.in @@ -0,0 +1,8 @@ +[Desktop Entry] +_Name=Restart +Try-Exec=@libexecdir@/gtk-logout-helper +Exec=@libexecdir@/gtk-logout-helper --restart +Icon=system-restart +Terminal=false +Type=Application +OnlyShowIn=Unity; diff --git a/po/POTFILES.in b/po/POTFILES.in index d19dc2e..7253dd6 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -2,6 +2,8 @@ data/com.canonical.indicator.session.gschema.xml.in data/extra-sessions/classic-desktop.desktop.in.in data/indicator-session-shutdown.desktop.in.in +data/indicator-session-logout.desktop.in.in +data/indicator-session-restart.desktop.in.in src/settings-helper.c src/lock-helper.c src/gtk-logout-helper.c -- cgit v1.2.3 From 41f7c6c709a74f90cd12ee2b09bbc1648fc8607f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 23 Aug 2011 14:29:06 -0500 Subject: Fixing the TryExecs and the versions --- data/indicator-session-logout.desktop.in.in | 3 ++- data/indicator-session-restart.desktop.in.in | 3 ++- data/indicator-session-shutdown.desktop.in.in | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/data/indicator-session-logout.desktop.in.in b/data/indicator-session-logout.desktop.in.in index 78548d1..46ba087 100644 --- a/data/indicator-session-logout.desktop.in.in +++ b/data/indicator-session-logout.desktop.in.in @@ -1,8 +1,9 @@ [Desktop Entry] _Name=Log Out -Try-Exec=@libexecdir@/gtk-logout-helper +TryExec=@libexecdir@/gtk-logout-helper Exec=@libexecdir@/gtk-logout-helper --logout Icon=system-log-out Terminal=false Type=Application OnlyShowIn=Unity; +Version=1.0 diff --git a/data/indicator-session-restart.desktop.in.in b/data/indicator-session-restart.desktop.in.in index 68a2f7f..67aa390 100644 --- a/data/indicator-session-restart.desktop.in.in +++ b/data/indicator-session-restart.desktop.in.in @@ -1,8 +1,9 @@ [Desktop Entry] _Name=Restart -Try-Exec=@libexecdir@/gtk-logout-helper +TryExec=@libexecdir@/gtk-logout-helper Exec=@libexecdir@/gtk-logout-helper --restart Icon=system-restart Terminal=false Type=Application OnlyShowIn=Unity; +Version=1.0 diff --git a/data/indicator-session-shutdown.desktop.in.in b/data/indicator-session-shutdown.desktop.in.in index 419a952..4bd51fe 100644 --- a/data/indicator-session-shutdown.desktop.in.in +++ b/data/indicator-session-shutdown.desktop.in.in @@ -1,8 +1,9 @@ [Desktop Entry] _Name=Shut Down -Try-Exec=@libexecdir@/gtk-logout-helper +TryExec=@libexecdir@/gtk-logout-helper Exec=@libexecdir@/gtk-logout-helper --shutdown Icon=system-shutdown Terminal=false Type=Application OnlyShowIn=Unity; +Version=1.0 -- cgit v1.2.3 From 4151eaaab0a2f4d5ee8f7cdadb3fa5bf7187ff83 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 23 Aug 2011 15:07:33 -0500 Subject: Adding a lock screen desktop file as well --- .bzrignore | 2 ++ data/Makefile.am | 1 + data/indicator-session-lock-screen.desktop.in.in | 9 +++++++++ po/POTFILES.in | 1 + 4 files changed, 13 insertions(+) create mode 100644 data/indicator-session-lock-screen.desktop.in.in diff --git a/.bzrignore b/.bzrignore index 1b8a265..1883f5c 100644 --- a/.bzrignore +++ b/.bzrignore @@ -209,3 +209,5 @@ indicator-session-logout.desktop.in indicator-session-logout.desktop indicator-session-restart.desktop.in indicator-session-restart.desktop +data/indicator-session-lock-screen.desktop.in +data/indicator-session-lock-screen.desktop diff --git a/data/Makefile.am b/data/Makefile.am index 347f91f..8b4a99c 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -24,6 +24,7 @@ dist_convert_DATA = indicator-session.convert sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ logout_helper_desktop_in_in_files = \ + indicator-session-lock-screen.desktop.in.in \ indicator-session-logout.desktop.in.in \ indicator-session-restart.desktop.in.in \ indicator-session-shutdown.desktop.in.in diff --git a/data/indicator-session-lock-screen.desktop.in.in b/data/indicator-session-lock-screen.desktop.in.in new file mode 100644 index 0000000..e44cd9f --- /dev/null +++ b/data/indicator-session-lock-screen.desktop.in.in @@ -0,0 +1,9 @@ +[Desktop Entry] +_Name=Lock Screen +TryExec=@bindir@/xdg-screensaver +Exec=@bindir@/xdg-screensaver lock +Icon=system-lock-screen +Terminal=false +Type=Application +OnlyShowIn=Unity; +Version=1.0 diff --git a/po/POTFILES.in b/po/POTFILES.in index 7253dd6..44a2269 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,6 +1,7 @@ [encoding: UTF-8] data/com.canonical.indicator.session.gschema.xml.in data/extra-sessions/classic-desktop.desktop.in.in +data/indicator-session-lock-screen.desktop.in.in data/indicator-session-shutdown.desktop.in.in data/indicator-session-logout.desktop.in.in data/indicator-session-restart.desktop.in.in -- cgit v1.2.3 From 6e6ca9a62c6325c3b130e6e26eac225a25b5a2b9 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 23 Aug 2011 15:16:40 -0500 Subject: Making the desktop files actually install --- data/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/data/Makefile.am b/data/Makefile.am index 8b4a99c..a545ec0 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -32,6 +32,7 @@ logout_helper_desktop_in_in_files = \ logout_helperdir = $(datadir)/applications logout_helper_desktop_files = \ $(logout_helper_desktop_in_in_files:.desktop.in.in=.desktop) +logout_helper_DATA = $(logout_helper_desktop_files) EXTRA_DIST = \ $(service_in_files) \ -- cgit v1.2.3 From 39806a70caf6b4a7dc9f6772d915ddacebc928a3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 23 Aug 2011 15:28:24 -0500 Subject: Adding the bin directory as well --- data/Makefile.am | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/data/Makefile.am b/data/Makefile.am index a545ec0..7e851a7 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -21,7 +21,10 @@ dist_convert_DATA = indicator-session.convert @INTLTOOL_DESKTOP_RULE@ %.desktop.in: %.desktop.in.in - sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ + sed \ + -e "s|\@libexecdir\@|$(libexecdir)|" \ + -e "s|\@bindir\@|$(bindir)|" \ + $< > $@ logout_helper_desktop_in_in_files = \ indicator-session-lock-screen.desktop.in.in \ -- cgit v1.2.3