gnome-session r4906 - in trunk: . data gnome-session po



Author: mccann
Date: Mon Aug  4 19:17:42 2008
New Revision: 4906
URL: http://svn.gnome.org/viewvc/gnome-session?rev=4906&view=rev

Log:
2008-08-04  William Jon McCann  <jmccann redhat com>

	* data/Makefile.am:
	* gnome-session/Makefile.am:
	* gnome-session/gsm-inhibit-dialog.glade:
	Move glade file to data as requested by Lucas.



Added:
   trunk/data/gsm-inhibit-dialog.glade
      - copied unchanged from r4903, /trunk/gnome-session/gsm-inhibit-dialog.glade
Removed:
   trunk/gnome-session/gsm-inhibit-dialog.glade
Modified:
   trunk/ChangeLog
   trunk/data/Makefile.am
   trunk/gnome-session/Makefile.am
   trunk/po/ChangeLog
   trunk/po/POTFILES.in

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Mon Aug  4 19:17:42 2008
@@ -1,7 +1,11 @@
+NULL =
 SUBDIRS = icons
 
-gladedir = $(datadir)/gnome-session
-glade_DATA = session-properties.glade
+gladedir = $(pkgdatadir)
+glade_DATA = \
+	session-properties.glade	\
+	gsm-inhibit-dialog.glade	\
+	$(NULL)
 
 @INTLTOOL_DESKTOP_RULE@
 

Modified: trunk/gnome-session/Makefile.am
==============================================================================
--- trunk/gnome-session/Makefile.am	(original)
+++ trunk/gnome-session/Makefile.am	Mon Aug  4 19:17:42 2008
@@ -24,11 +24,6 @@
 	-DGCONF_SANITY_CHECK=\""$(GCONF_SANITY_CHECK)"\" \
 	-DGCONFTOOL_CMD=\"$(GCONFTOOL)\"
 
-gladedir = $(pkgdatadir)
-glade_DATA = 					\
-	gsm-inhibit-dialog.glade		\
-	$(NULL)
-
 test_inhibit_SOURCES = 	\
 	test-inhibit.c	\
 	$(NULL)

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Mon Aug  4 19:17:42 2008
@@ -5,12 +5,12 @@
 data/gnome.desktop.in
 data/session-properties.desktop.in.in
 data/session-properties.glade
+data/gsm-inhibit-dialog.glade
 egg/eggdesktopfile.c
 egg/eggsmclient-libgnomeui.c
 egg/eggsmclient.c
 gnome-session/gsm-gconf.c
 gnome-session/gsm-inhibit-dialog.c
-gnome-session/gsm-inhibit-dialog.glade
 gnome-session/gsm-logout-dialog.c
 gnome-session/gsm-manager.c
 gnome-session/gsm-xsmp-client.c



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]