From 4fba533170cb00524e9416e9e8cbe3e0f84778d4 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 12 May 2011 00:20:05 +0200 Subject: Getting the base files in. --- data/extra-sessions/classic-desktop.desktop | 4 ++++ data/extra-sessions/classic-desktop.sh | 5 +++++ 2 files changed, 9 insertions(+) create mode 100644 data/extra-sessions/classic-desktop.desktop create mode 100755 data/extra-sessions/classic-desktop.sh diff --git a/data/extra-sessions/classic-desktop.desktop b/data/extra-sessions/classic-desktop.desktop new file mode 100644 index 0000000..3532a6c --- /dev/null +++ b/data/extra-sessions/classic-desktop.desktop @@ -0,0 +1,4 @@ +[Desktop Entry] +Name=Classic Guest Session +Exec=/usr/share/indicators/session/applications/test.sh +Type=Application diff --git a/data/extra-sessions/classic-desktop.sh b/data/extra-sessions/classic-desktop.sh new file mode 100755 index 0000000..fea8787 --- /dev/null +++ b/data/extra-sessions/classic-desktop.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +export GDMSESSION=gnome-classic + +/usr/share/gdm/guest-session/guest-session-launch --lock -- cgit v1.2.3 From 6a43af0aab69beebe255ee40fc35b402ad6edaf9 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 12 May 2011 00:22:21 +0200 Subject: Connecting in the build system --- configure.ac | 1 + data/Makefile.am | 4 +++- data/extra-sessions/Makefile.am | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 data/extra-sessions/Makefile.am diff --git a/configure.ac b/configure.ac index a882555..04f9cd5 100644 --- a/configure.ac +++ b/configure.ac @@ -147,6 +147,7 @@ data/icons/32x32/status/Makefile data/icons/scalable/Makefile data/icons/scalable/actions/Makefile data/icons/scalable/status/Makefile +data/extra-sessions/Makefile po/Makefile.in ]) diff --git a/data/Makefile.am b/data/Makefile.am index f452897..1f522d7 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,4 +1,6 @@ -SUBDIRS = icons +SUBDIRS = \ + icons \ + extra-sessions dbus_servicesdir = $(DBUSSERVICEDIR) service_in_files = indicator-session.service.in diff --git a/data/extra-sessions/Makefile.am b/data/extra-sessions/Makefile.am new file mode 100644 index 0000000..139597f --- /dev/null +++ b/data/extra-sessions/Makefile.am @@ -0,0 +1,2 @@ + + -- cgit v1.2.3 From 16744428d235ec5999cb3d924be9a2f90ef36033 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 12 May 2011 11:16:26 +0200 Subject: Building and installing the files --- data/extra-sessions/Makefile.am | 20 ++++++++++++++++++++ data/extra-sessions/classic-desktop.desktop | 4 ---- data/extra-sessions/classic-desktop.desktop.in | 4 ++++ 3 files changed, 24 insertions(+), 4 deletions(-) delete mode 100644 data/extra-sessions/classic-desktop.desktop create mode 100644 data/extra-sessions/classic-desktop.desktop.in diff --git a/data/extra-sessions/Makefile.am b/data/extra-sessions/Makefile.am index 139597f..1a6f350 100644 --- a/data/extra-sessions/Makefile.am +++ b/data/extra-sessions/Makefile.am @@ -1,2 +1,22 @@ +extra_guests_desktop_in_files = \ + classic-desktop.desktop.in +extra_guests_sh_files = \ + classic-desktop.sh +extra_guestsdir = $(datadir)/indicators/session/applications/ +extra_guests_desktop_files = \ + $(extra_guests_desktop_in_files:.desktop.in=.desktop) + +%.desktop: %.desktop.in + sed -e "s|\@guestdir\@|$(extra_guestsdir)|" $< > $@ + +extra_guests_DATA = \ + $(extra_guests_desktop_files) \ + $(extra_guests_sh_files) + +EXTRA_DIST = \ + $(extra_guests_desktop_in_files) + +CLEANFILES = \ + $(extra_guests_desktop_files) diff --git a/data/extra-sessions/classic-desktop.desktop b/data/extra-sessions/classic-desktop.desktop deleted file mode 100644 index 3532a6c..0000000 --- a/data/extra-sessions/classic-desktop.desktop +++ /dev/null @@ -1,4 +0,0 @@ -[Desktop Entry] -Name=Classic Guest Session -Exec=/usr/share/indicators/session/applications/test.sh -Type=Application diff --git a/data/extra-sessions/classic-desktop.desktop.in b/data/extra-sessions/classic-desktop.desktop.in new file mode 100644 index 0000000..fad4516 --- /dev/null +++ b/data/extra-sessions/classic-desktop.desktop.in @@ -0,0 +1,4 @@ +[Desktop Entry] +Name=Classic Guest Session +Exec=@guestdir@/test.sh +Type=Application -- cgit v1.2.3 From eb2890fecd65d4c2b7750c0f9537dc8b661d0821 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 12 May 2011 11:18:08 +0200 Subject: Disting the shell files --- data/extra-sessions/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/extra-sessions/Makefile.am b/data/extra-sessions/Makefile.am index 1a6f350..2a157ad 100644 --- a/data/extra-sessions/Makefile.am +++ b/data/extra-sessions/Makefile.am @@ -16,7 +16,8 @@ extra_guests_DATA = \ $(extra_guests_sh_files) EXTRA_DIST = \ - $(extra_guests_desktop_in_files) + $(extra_guests_desktop_in_files) \ + $(extra_guests_sh_files) CLEANFILES = \ $(extra_guests_desktop_files) -- cgit v1.2.3 From b3c1ec1c84b26d1cf70b009eb3312d12cec622b1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 12 May 2011 11:28:06 +0200 Subject: Making the desktop translatable --- data/extra-sessions/Makefile.am | 18 ++++++++++++++---- data/extra-sessions/classic-desktop.desktop.in | 4 ---- data/extra-sessions/classic-desktop.desktop.in.in | 6 ++++++ po/POTFILES.in | 1 + 4 files changed, 21 insertions(+), 8 deletions(-) delete mode 100644 data/extra-sessions/classic-desktop.desktop.in create mode 100644 data/extra-sessions/classic-desktop.desktop.in.in diff --git a/data/extra-sessions/Makefile.am b/data/extra-sessions/Makefile.am index 2a157ad..e6b81a8 100644 --- a/data/extra-sessions/Makefile.am +++ b/data/extra-sessions/Makefile.am @@ -1,14 +1,24 @@ -extra_guests_desktop_in_files = \ - classic-desktop.desktop.in +################################### +# The files that are actually here +################################### + +extra_guests_desktop_in_in_files = \ + classic-desktop.desktop.in.in extra_guests_sh_files = \ classic-desktop.sh +################################### +# Rules to make things work +################################### + extra_guestsdir = $(datadir)/indicators/session/applications/ extra_guests_desktop_files = \ - $(extra_guests_desktop_in_files:.desktop.in=.desktop) + $(extra_guests_desktop_in_in_files:.desktop.in.in=.desktop) + +@INTLTOOL_DESKTOP_RULE@ -%.desktop: %.desktop.in +%.desktop.in: %.desktop.in.in sed -e "s|\@guestdir\@|$(extra_guestsdir)|" $< > $@ extra_guests_DATA = \ diff --git a/data/extra-sessions/classic-desktop.desktop.in b/data/extra-sessions/classic-desktop.desktop.in deleted file mode 100644 index fad4516..0000000 --- a/data/extra-sessions/classic-desktop.desktop.in +++ /dev/null @@ -1,4 +0,0 @@ -[Desktop Entry] -Name=Classic Guest Session -Exec=@guestdir@/test.sh -Type=Application diff --git a/data/extra-sessions/classic-desktop.desktop.in.in b/data/extra-sessions/classic-desktop.desktop.in.in new file mode 100644 index 0000000..d7ca3da --- /dev/null +++ b/data/extra-sessions/classic-desktop.desktop.in.in @@ -0,0 +1,6 @@ +[Desktop Entry] +Version=1.0 +_Name=Classic Guest Session +_Comment=Start a guest session using the classic desktop +Exec=@guestdir@/test.sh +Type=Application diff --git a/po/POTFILES.in b/po/POTFILES.in index 3a8bad7..c2256c1 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,5 +1,6 @@ [encoding: UTF-8] data/indicator-session.schemas.in +data/extra-sessions/classic-desktop.desktop.in.in src/gconf-helper.c src/lock-helper.c src/gtk-logout-helper.c -- cgit v1.2.3 From 9258cd855aef371fb1e83796271e1635e50be673 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 12 May 2011 11:30:04 +0200 Subject: Eh, forgot the .in.in files --- data/extra-sessions/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/extra-sessions/Makefile.am b/data/extra-sessions/Makefile.am index e6b81a8..ca9ba8e 100644 --- a/data/extra-sessions/Makefile.am +++ b/data/extra-sessions/Makefile.am @@ -26,7 +26,7 @@ extra_guests_DATA = \ $(extra_guests_sh_files) EXTRA_DIST = \ - $(extra_guests_desktop_in_files) \ + $(extra_guests_desktop_in_in_files) \ $(extra_guests_sh_files) CLEANFILES = \ -- cgit v1.2.3 From 6eb44e9133dc234ce48cf27454575a3cebf0376d Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Thu, 26 May 2011 11:54:30 -0400 Subject: port to gtk3; allow building with gtk2 --- configure.ac | 34 +++++++++++++++++++++++++++------- src/Makefile.am | 4 ++-- src/indicator-session.c | 5 +++++ src/session-service.c | 2 +- 4 files changed, 35 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index a882555..cf4a298 100644 --- a/configure.ac +++ b/configure.ac @@ -26,28 +26,44 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) ########################### GTK_REQUIRED_VERSION=2.12 +GTK3_REQUIRED_VERSION=3.0 INDICATOR_REQUIRED_VERSION=0.3.19 DBUSMENUGTK_REQUIRED_VERSION=0.3.91 POLKIT_REQUIRED_VERSION=0.92 -PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION - indicator >= $INDICATOR_REQUIRED_VERSION - dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION) +AC_ARG_WITH([indicator-gtk], + [AS_HELP_STRING([--with-indicator-gtk], + [Which version of gtk to use for the indicator @<:@default=3@:>@])], + [], + [with_indicator_gtk=3]) + +AS_IF([test "x$with_indicator_gtk" = x3], + [PKG_CHECK_MODULES(APPLET, gtk+-3.0 >= $GTK3_REQUIRED_VERSION + indicator3 >= $INDICATOR_REQUIRED_VERSION + dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION) + ], + [test "x$with_indicator_gtk" = x2], + [PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION + indicator >= $INDICATOR_REQUIRED_VERSION + dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION) + ], + [AC_MSG_FAILURE([Value for --with-indicator-gtk was neither 2 nor 3])] +) AC_SUBST(APPLET_CFLAGS) AC_SUBST(APPLET_LIBS) DBUSMENUGLIB_REQUIRED_VERSION=0.1.1 PKG_CHECK_MODULES(SESSIONSERVICE, dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION - dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION + dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION dbus-glib-1 gio-unix-2.0 - indicator >= $INDICATOR_REQUIRED_VERSION) + indicator3 >= $INDICATOR_REQUIRED_VERSION) AC_SUBST(SESSIONERVICE_CFLAGS) AC_SUBST(SESSIONERVICE_LIBS) -PKG_CHECK_MODULES(GTKLOGOUTHELPER, gtk+-2.0 >= $GTK_REQUIRED_VERSION +PKG_CHECK_MODULES(GTKLOGOUTHELPER, gtk+-3.0 >= $GTK3_REQUIRED_VERSION polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) @@ -78,9 +94,12 @@ AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], [install all if test "x$with_localinstall" = "xyes"; then INDICATORDIR="${libdir}/indicators/2/" INDICATORICONSDIR="${datadir}/indicator-applet/icons/" -else +elif test "x$with_indicator_gtk" = x2; then INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator` INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator` +else + INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3` + INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3` fi AC_SUBST(INDICATORDIR) AC_SUBST(INDICATORICONSDIR) @@ -159,4 +178,5 @@ AC_MSG_NOTICE([ SUS Indicator Configuration: Prefix: $prefix + Indicator GTK: $with_indicator_gtk ]) diff --git a/src/Makefile.am b/src/Makefile.am index 4fa43b9..0317de7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -69,13 +69,13 @@ users-service-marshal.c: $(srcdir)/users-service.list gen-%.xml.c: %.xml @echo "Building $@ from $<" - @echo "const char * _$(subst -,_,$(subst .,_,$(basename $<))) = " > $@ + @echo "const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<)))) = " > $@ @sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@ @echo ";" >> $@ gen-%.xml.h: %.xml @echo "Building $@ from $<" - @echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $<)));" > $@ + @echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<))));" > $@ ################# # Session Stuff diff --git a/src/indicator-session.c b/src/indicator-session.c index e8a2f97..c9617c4 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -29,7 +29,12 @@ with this program. If not, see . #include #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 dc53f74..ddcb7cb 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -36,7 +36,7 @@ with this program. If not, see . #include #include #include -#include +#include #include -- cgit v1.2.3 From e94209be9883443c69b2e50d4f98f08847ead1a5 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 21 Jun 2011 10:26:40 -0500 Subject: 0.2.90 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index afa82f0..5b724e2 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_INIT(src/indicator-session.c) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-session, 0.2.17) +AM_INIT_AUTOMAKE(indicator-session, 0.2.90) AM_MAINTAINER_MODE -- cgit v1.2.3 From 81976a21a0cf3e0035896d9e3c9548773d58e65c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 21 Jun 2011 10:42:34 -0500 Subject: releasing version 0.2.90-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a791c78..8e2a1af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-session (0.2.90-0ubuntu1~ppa1) UNRELEASED; urgency=low +indicator-session (0.2.90-0ubuntu1~ppa1) oneiric; urgency=low * New upstream release. * GTK3 support - -- Ted Gould Tue, 21 Jun 2011 10:40:03 -0500 + -- Ted Gould Tue, 21 Jun 2011 10:42:30 -0500 indicator-session (0.2.17-0ubuntu1) natty; urgency=low -- cgit v1.2.3