From 2fe4c360b2eb616cb43472b8e8e7b69bdefd349d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 19 Aug 2011 11:08:30 -0500 Subject: Dropping gconf from build --- data/Makefile.am | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'data/Makefile.am') diff --git a/data/Makefile.am b/data/Makefile.am index 1f522d7..2a9ea62 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -9,25 +9,8 @@ dbus_services_DATA = $(service_in_files:.service.in=.service) %.service: %.service.in sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ -############################## -# GConf Schema -############################## - -schemadir = \ - $(GCONF_SCHEMA_FILE_DIR) - -schema_in_files = \ - indicator-session.schemas.in - -schema_DATA = \ - $(schema_in_files:.schemas.in=.schemas) - @INTLTOOL_SCHEMAS_RULE@ - -#$(dbus_services_DATA): $(service_in_files) Makefile -# sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ - EXTRA_DIST = \ $(service_in_files) \ $(schema_in_files) @@ -36,10 +19,3 @@ CLEANFILES = \ $(dbus_services_DATA) \ $(schema_DATA) -if GCONF_SCHEMAS_INSTALL -install-data-local: - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ - gconftool-2 --makefile-install-rule $(schema_DATA) -else -install-data-local: -endif -- cgit v1.2.3 From 20b7a5e043b0c751791e775cb96094b53e38cb6f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 19 Aug 2011 14:32:20 -0500 Subject: Setting up convert script and completing the GSettings transition including translations --- data/Makefile.am | 13 +++++- data/com.canonical.indicator.session.gschema.xml | 24 ----------- .../com.canonical.indicator.session.gschema.xml.in | 24 +++++++++++ data/indicator-session.convert | 6 +++ data/indicator-session.schemas.in | 50 ---------------------- 5 files changed, 41 insertions(+), 76 deletions(-) delete mode 100644 data/com.canonical.indicator.session.gschema.xml create mode 100644 data/com.canonical.indicator.session.gschema.xml.in create mode 100644 data/indicator-session.convert delete mode 100644 data/indicator-session.schemas.in (limited to 'data/Makefile.am') diff --git a/data/Makefile.am b/data/Makefile.am index 2a9ea62..27328fb 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -10,12 +10,21 @@ dbus_services_DATA = $(service_in_files:.service.in=.service) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ @INTLTOOL_SCHEMAS_RULE@ +@INTLTOOL_XML_NOMERGE_RULE@ + +@GSETTINGS_RULES@ +gsettings_SCHEMAS = com.canonical.indicator.session.gschema.xml + +convertdir = $(datadir)/GConf/gsettings +dist_convert_DATA = indicator-session.convert + EXTRA_DIST = \ $(service_in_files) \ - $(schema_in_files) + $(gsettings_SCHEMAS:.xml=.xml.in) + CLEANFILES = \ $(dbus_services_DATA) \ - $(schema_DATA) + $(gsettings_SCHEMAS) diff --git a/data/com.canonical.indicator.session.gschema.xml b/data/com.canonical.indicator.session.gschema.xml deleted file mode 100644 index ba09583..0000000 --- a/data/com.canonical.indicator.session.gschema.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - false - Suppress the dialog to confirm logout, restart and shutdown action - Whether or not to show confirmation dialogs for logout, restart and shutdown actions. - - - false - Remove the Log Out item from the session menu - Makes it so that the logout button doesn't show in the session menu. - - - false - Remove the Restart item from the session menu - Makes it so that the restart button doesn't show in the session menu. - - - false - Remove the shutdown item from the session menu - Makes it so that the shutdown button doesn't show in the session menu. - - - diff --git a/data/com.canonical.indicator.session.gschema.xml.in b/data/com.canonical.indicator.session.gschema.xml.in new file mode 100644 index 0000000..0cb6815 --- /dev/null +++ b/data/com.canonical.indicator.session.gschema.xml.in @@ -0,0 +1,24 @@ + + + + false + <_summary>Suppress the dialog to confirm logout, restart and shutdown action + <_description>Whether or not to show confirmation dialogs for logout, restart and shutdown actions. + + + false + <_summary>Remove the Log Out item from the session menu + <_description>Makes it so that the logout button doesn't show in the session menu. + + + false + <_summary>Remove the Restart item from the session menu + <_description>Makes it so that the restart button doesn't show in the session menu. + + + false + <_summary>Remove the shutdown item from the session menu + <_description>Makes it so that the shutdown button doesn't show in the session menu. + + + diff --git a/data/indicator-session.convert b/data/indicator-session.convert new file mode 100644 index 0000000..92775d8 --- /dev/null +++ b/data/indicator-session.convert @@ -0,0 +1,6 @@ +[com.canonical.indicator.session] +panel_user_name = /system/indicator/me/display +suppress_logout_restart_shutdown = /apps/indicator-session/suppress_logout_restart_shutdown +suppress_logout_menuitem = /apps/indicator-session/suppress_logout_menuitem +suppress_restart_menuitem = /apps/indicator-session/suppress_restart_menuitem +suppress_shutdown_menuitem = /apps/indicator-session/suppress_shutdown_menuitem diff --git a/data/indicator-session.schemas.in b/data/indicator-session.schemas.in deleted file mode 100644 index f4e70da..0000000 --- a/data/indicator-session.schemas.in +++ /dev/null @@ -1,50 +0,0 @@ - - - - - /schemas/apps/indicator-session/suppress_logout_restart_shutdown - /apps/indicator-session/suppress_logout_restart_shutdown - indicator-session - bool - FALSE - - Suppress the dialog to confirm logout, restart and shutdown action - Whether or not to show confirmation dialogs for logout, - restart and shutdown actions. - - - - /schemas/apps/indicator-session/suppress_logout_menuitem - /apps/indicator-session/suppress_logout_menuitem - indicator-session - bool - FALSE - - Remove the Log Out item from the session menu - Makes it so that the logout button doesn't show in the session menu. - - - - /schemas/apps/indicator-session/suppress_restart_menuitem - /apps/indicator-session/suppress_restart_menuitem - indicator-session - bool - FALSE - - Remove the Restart item from the session menu - Makes it so that the restart button doesn't show in the session menu. - - - - /schemas/apps/indicator-session/suppress_shutdown_menuitem - /apps/indicator-session/suppress_shutdown_menuitem - indicator-session - bool - FALSE - - Remove the shutdown item from the session menu - Makes it so that the shutdown button doesn't show in the session menu. - - - - -- 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 (limited to 'data/Makefile.am') 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 (limited to 'data/Makefile.am') 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 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 (limited to 'data/Makefile.am') 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(+) (limited to 'data/Makefile.am') 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(-) (limited to 'data/Makefile.am') 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