Import upstream version 0.3.90

1 files changed, 72 insertions, 70 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
index 693b442..5e973fb 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -35,8 +35,16 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-libexec_PROGRAMS = indicator-session-service$(EXEEXT) \
-	gtk-logout-helper$(EXEEXT)
+libexec_PROGRAMS = indicator-session-service$(EXEEXT) $(am__EXEEXT_1)
+@BUILD_GTKLOGOUTHELPER_TRUE@am__append_1 = \
+@BUILD_GTKLOGOUTHELPER_TRUE@	gtk-logout-helper
+
+@BUILD_APT_TRUE@am__append_2 = \
+@BUILD_APT_TRUE@	apt-watcher.h \
+@BUILD_APT_TRUE@	apt-watcher.c \
+@BUILD_APT_TRUE@	apt-transaction.h \
+@BUILD_APT_TRUE@	apt-transaction.c
+
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -82,18 +90,30 @@ am__v_lt_0 = --silent
 libsession_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libsession_la_CFLAGS) \
 	$(CFLAGS) $(libsession_la_LDFLAGS) $(LDFLAGS) -o $@
+@BUILD_GTKLOGOUTHELPER_TRUE@am__EXEEXT_1 = gtk-logout-helper$(EXEEXT)
 PROGRAMS = $(libexec_PROGRAMS)
-am_gtk_logout_helper_OBJECTS =  \
-	gtk_logout_helper-gtk-logout-helper.$(OBJEXT) \
-	gtk_logout_helper-settings-helper.$(OBJEXT) \
-	gtk_logout_helper-dialog.$(OBJEXT)
+am__gtk_logout_helper_SOURCES_DIST = gtk-logout-helper.c \
+	settings-helper.c settings-helper.h dialog.c dialog.h
+@BUILD_GTKLOGOUTHELPER_TRUE@am_gtk_logout_helper_OBJECTS = gtk_logout_helper-gtk-logout-helper.$(OBJEXT) \
+@BUILD_GTKLOGOUTHELPER_TRUE@	gtk_logout_helper-settings-helper.$(OBJEXT) \
+@BUILD_GTKLOGOUTHELPER_TRUE@	gtk_logout_helper-dialog.$(OBJEXT)
 gtk_logout_helper_OBJECTS = $(am_gtk_logout_helper_OBJECTS)
-gtk_logout_helper_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+@BUILD_GTKLOGOUTHELPER_TRUE@gtk_logout_helper_DEPENDENCIES =  \
+@BUILD_GTKLOGOUTHELPER_TRUE@	$(am__DEPENDENCIES_1) \
+@BUILD_GTKLOGOUTHELPER_TRUE@	$(am__DEPENDENCIES_1)
 gtk_logout_helper_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(gtk_logout_helper_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
 	-o $@
+am__indicator_session_service_SOURCES_DIST = lock-helper.c \
+	lock-helper.h session-service.c session-dbus.c session-dbus.h \
+	gen-session-dbus.xml.c dbusmenu-shared.h settings-helper.c \
+	users-service-dbus.h users-service-dbus.c user-menu-mgr.h \
+	user-menu-mgr.c device-menu-mgr.h device-menu-mgr.c udev-mgr.h \
+	udev-mgr.c sane-rules.h apt-watcher.h apt-watcher.c \
+	apt-transaction.h apt-transaction.c
+@BUILD_APT_TRUE@am__objects_1 = indicator_session_service-apt-watcher.$(OBJEXT) \
+@BUILD_APT_TRUE@	indicator_session_service-apt-transaction.$(OBJEXT)
 am_indicator_session_service_OBJECTS =  \
 	indicator_session_service-lock-helper.$(OBJEXT) \
 	indicator_session_service-session-service.$(OBJEXT) \
@@ -103,9 +123,7 @@ am_indicator_session_service_OBJECTS =  \
 	indicator_session_service-users-service-dbus.$(OBJEXT) \
 	indicator_session_service-user-menu-mgr.$(OBJEXT) \
 	indicator_session_service-device-menu-mgr.$(OBJEXT) \
-	indicator_session_service-apt-watcher.$(OBJEXT) \
-	indicator_session_service-apt-transaction.$(OBJEXT) \
-	indicator_session_service-udev-mgr.$(OBJEXT)
+	indicator_session_service-udev-mgr.$(OBJEXT) $(am__objects_1)
 indicator_session_service_OBJECTS =  \
 	$(am_indicator_session_service_OBJECTS)
 indicator_session_service_DEPENDENCIES = $(am__DEPENDENCIES_1)
@@ -141,8 +159,9 @@ am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libsession_la_SOURCES) $(gtk_logout_helper_SOURCES) \
 	$(indicator_session_service_SOURCES)
-DIST_SOURCES = $(libsession_la_SOURCES) $(gtk_logout_helper_SOURCES) \
-	$(indicator_session_service_SOURCES)
+DIST_SOURCES = $(libsession_la_SOURCES) \
+	$(am__gtk_logout_helper_SOURCES_DIST) \
+	$(am__indicator_session_service_SOURCES_DIST)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -329,29 +348,12 @@ libsession_la_LDFLAGS = -module -avoid-version
 #################
 # Session Stuff
 #################
-indicator_session_service_SOURCES = \
-	lock-helper.c \
-	lock-helper.h \
-	session-service.c \
-	session-dbus.c \
-	session-dbus.h \
-	gen-session-dbus.xml.c \
-	dbusmenu-shared.h \
-	settings-helper.c \
-	users-service-dbus.h \
-	users-service-dbus.c \
-	user-menu-mgr.h \
-	user-menu-mgr.c \
-	device-menu-mgr.h \
-	device-menu-mgr.c \
-	apt-watcher.h \
-	apt-watcher.c \
-	apt-transaction.h \
-	apt-transaction.c \
-	udev-mgr.h \
-	udev-mgr.c \
-	sane-rules.h
-
+indicator_session_service_SOURCES = lock-helper.c lock-helper.h \
+	session-service.c session-dbus.c session-dbus.h \
+	gen-session-dbus.xml.c dbusmenu-shared.h settings-helper.c \
+	users-service-dbus.h users-service-dbus.c user-menu-mgr.h \
+	user-menu-mgr.c device-menu-mgr.h device-menu-mgr.c udev-mgr.h \
+	udev-mgr.c sane-rules.h $(am__append_2)
 indicator_session_service_CFLAGS = \
 	$(SESSIONSERVICE_CFLAGS) \
 	$(GCONF_CFLAGS) \
@@ -367,24 +369,24 @@ indicator_session_service_LDADD = \
 #################
 # GTK Logout Stuff
 #################
-gtk_logout_helper_SOURCES = \
-	gtk-logout-helper.c \
-	settings-helper.c \
-	settings-helper.h \
-	dialog.c \
-	dialog.h
-
-gtk_logout_helper_CFLAGS = \
-	$(SESSIONSERVICE_CFLAGS) \
-	$(GTKLOGOUTHELPER_CFLAGS) \
-	$(GCONF_CFLAGS) \
-	-Wall -Werror \
-	-DINDICATOR_ICONS_DIR="\"$(INDICATORICONSDIR)\""
-
-gtk_logout_helper_LDADD = \
-	$(SESSIONSERVICE_LIBS) \
-	$(GTKLOGOUTHELPER_LIBS) \
-	$(GCONF_LIBS)
+@BUILD_GTKLOGOUTHELPER_TRUE@gtk_logout_helper_SOURCES = \
+@BUILD_GTKLOGOUTHELPER_TRUE@	gtk-logout-helper.c \
+@BUILD_GTKLOGOUTHELPER_TRUE@	settings-helper.c \
+@BUILD_GTKLOGOUTHELPER_TRUE@	settings-helper.h \
+@BUILD_GTKLOGOUTHELPER_TRUE@	dialog.c \
+@BUILD_GTKLOGOUTHELPER_TRUE@	dialog.h
+
+@BUILD_GTKLOGOUTHELPER_TRUE@gtk_logout_helper_CFLAGS = \
+@BUILD_GTKLOGOUTHELPER_TRUE@	$(SESSIONSERVICE_CFLAGS) \
+@BUILD_GTKLOGOUTHELPER_TRUE@	$(GTKLOGOUTHELPER_CFLAGS) \
+@BUILD_GTKLOGOUTHELPER_TRUE@	$(GCONF_CFLAGS) \
+@BUILD_GTKLOGOUTHELPER_TRUE@	-Wall -Werror \
+@BUILD_GTKLOGOUTHELPER_TRUE@	-DINDICATOR_ICONS_DIR="\"$(INDICATORICONSDIR)\""
+
+@BUILD_GTKLOGOUTHELPER_TRUE@gtk_logout_helper_LDADD = \
+@BUILD_GTKLOGOUTHELPER_TRUE@	$(SESSIONSERVICE_LIBS) \
+@BUILD_GTKLOGOUTHELPER_TRUE@	$(GTKLOGOUTHELPER_LIBS) \
+@BUILD_GTKLOGOUTHELPER_TRUE@	$(GCONF_LIBS)
 
 
 ###############
@@ -771,6 +773,22 @@ indicator_session_service-device-menu-mgr.obj: device-menu-mgr.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-device-menu-mgr.obj `if test -f 'device-menu-mgr.c'; then $(CYGPATH_W) 'device-menu-mgr.c'; else $(CYGPATH_W) '$(srcdir)/device-menu-mgr.c'; fi`
 
+indicator_session_service-udev-mgr.o: udev-mgr.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -MT indicator_session_service-udev-mgr.o -MD -MP -MF $(DEPDIR)/indicator_session_service-udev-mgr.Tpo -c -o indicator_session_service-udev-mgr.o `test -f 'udev-mgr.c' || echo '$(srcdir)/'`udev-mgr.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_session_service-udev-mgr.Tpo $(DEPDIR)/indicator_session_service-udev-mgr.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='udev-mgr.c' object='indicator_session_service-udev-mgr.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-udev-mgr.o `test -f 'udev-mgr.c' || echo '$(srcdir)/'`udev-mgr.c
+
+indicator_session_service-udev-mgr.obj: udev-mgr.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -MT indicator_session_service-udev-mgr.obj -MD -MP -MF $(DEPDIR)/indicator_session_service-udev-mgr.Tpo -c -o indicator_session_service-udev-mgr.obj `if test -f 'udev-mgr.c'; then $(CYGPATH_W) 'udev-mgr.c'; else $(CYGPATH_W) '$(srcdir)/udev-mgr.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_session_service-udev-mgr.Tpo $(DEPDIR)/indicator_session_service-udev-mgr.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='udev-mgr.c' object='indicator_session_service-udev-mgr.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-udev-mgr.obj `if test -f 'udev-mgr.c'; then $(CYGPATH_W) 'udev-mgr.c'; else $(CYGPATH_W) '$(srcdir)/udev-mgr.c'; fi`
+
 indicator_session_service-apt-watcher.o: apt-watcher.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -MT indicator_session_service-apt-watcher.o -MD -MP -MF $(DEPDIR)/indicator_session_service-apt-watcher.Tpo -c -o indicator_session_service-apt-watcher.o `test -f 'apt-watcher.c' || echo '$(srcdir)/'`apt-watcher.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_session_service-apt-watcher.Tpo $(DEPDIR)/indicator_session_service-apt-watcher.Po
@@ -803,22 +821,6 @@ indicator_session_service-apt-transaction.obj: apt-transaction.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-apt-transaction.obj `if test -f 'apt-transaction.c'; then $(CYGPATH_W) 'apt-transaction.c'; else $(CYGPATH_W) '$(srcdir)/apt-transaction.c'; fi`
 
-indicator_session_service-udev-mgr.o: udev-mgr.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -MT indicator_session_service-udev-mgr.o -MD -MP -MF $(DEPDIR)/indicator_session_service-udev-mgr.Tpo -c -o indicator_session_service-udev-mgr.o `test -f 'udev-mgr.c' || echo '$(srcdir)/'`udev-mgr.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_session_service-udev-mgr.Tpo $(DEPDIR)/indicator_session_service-udev-mgr.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='udev-mgr.c' object='indicator_session_service-udev-mgr.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-udev-mgr.o `test -f 'udev-mgr.c' || echo '$(srcdir)/'`udev-mgr.c
-
-indicator_session_service-udev-mgr.obj: udev-mgr.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -MT indicator_session_service-udev-mgr.obj -MD -MP -MF $(DEPDIR)/indicator_session_service-udev-mgr.Tpo -c -o indicator_session_service-udev-mgr.obj `if test -f 'udev-mgr.c'; then $(CYGPATH_W) 'udev-mgr.c'; else $(CYGPATH_W) '$(srcdir)/udev-mgr.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_session_service-udev-mgr.Tpo $(DEPDIR)/indicator_session_service-udev-mgr.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='udev-mgr.c' object='indicator_session_service-udev-mgr.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-udev-mgr.obj `if test -f 'udev-mgr.c'; then $(CYGPATH_W) 'udev-mgr.c'; else $(CYGPATH_W) '$(srcdir)/udev-mgr.c'; fi`
-
 mostlyclean-libtool:
 	-rm -f *.lo