tomboy r2398 - in trunk: . Tomboy po

[sharm svn gnome org]

Author: sharm
Date: Mon Mar  2 22:45:42 2009
New Revision: 2398
URL: http://svn.gnome.org/viewvc/tomboy?rev=2398&view=rev

Log:
* po/POTFILES.in: Add MacApplication.cs. Fixes bug #570121.

* po/POTFILES.skip: Remove obsolete files.

* Tomboy/Makefile.am: Restructure CSFILES variables to make sure all
files are included in tarball, regardless of current configuration.

Modified:
   trunk/ChangeLog
   trunk/Tomboy/Makefile.am
   trunk/po/POTFILES.in
   trunk/po/POTFILES.skip

Modified: trunk/Tomboy/Makefile.am
==============================================================================
--- trunk/Tomboy/Makefile.am	(original)
+++ trunk/Tomboy/Makefile.am	Mon Mar  2 22:45:42 2009
@@ -6,27 +6,29 @@
 WRAPPER = tomboy
 PANEL_WRAPPER = tomboy-panel
 
-if ENABLE_DBUS
-DBUS_CSFLAGS = -define:ENABLE_DBUS
 DBUS_CSFILES = 				\
 	$(srcdir)/IRemoteControl.cs	\
 	$(srcdir)/RemoteControl.cs	\
 	$(srcdir)/RemoteControlProxy.cs
+
+if ENABLE_DBUS
+DBUS_CSFLAGS = -define:ENABLE_DBUS
+DBUS_USED_CSFILES = $(DBUS_CSFILES)
 endif
 
-if ENABLE_OSX
-OSX_CSFLAGS = -define:MAC
 OSX_CSFILES =					\
 	$(srcdir)/MacApplication.cs		\
 	$(srcdir)/MacFactory.cs			\
 	$(srcdir)/WindowsApplication.cs		\
 	$(srcdir)/XmlPreferencesClient.cs
+
+if ENABLE_OSX
+OSX_CSFLAGS = -define:MAC
+OSX_USED_CSFILES = $(OSX_CSFILES)
 OSX_LIBS =					\
 	-r:$(top_srcdir)/macbin/ige-mac-integration-sharp.dll
 endif
 
-if ENABLE_WIN
-WIN_CSFLAGS = -define:WIN32
 WIN_CSFILES =					\
 	$(srcdir)/ManagedWinapi.EventDispatchingNativeWindow.cs	\
 	$(srcdir)/ManagedWinapi.Hotkey.cs	\
@@ -34,11 +36,14 @@
 	$(srcdir)/WindowsFactory.cs		\
 	$(srcdir)/WindowsKeybinder.cs		\
 	$(srcdir)/XmlPreferencesClient.cs
+
+if ENABLE_WIN
+WIN_CSFLAGS = -define:WIN32
+WIN_USED_CSFILES = $(WIN_CSFILES)
 WIN_LIBS =					\
 	-r:System.Windows.Forms.dll
 endif
 
-if ENABLE_GNOME
 GNOME_CSFILES =					\
 	$(srcdir)/Applet.cs 			\
 	$(srcdir)/GConfPreferencesClient.cs	\
@@ -46,10 +51,13 @@
 	$(srcdir)/GnomeFactory.cs		\
 	$(srcdir)/XKeybinder.cs
 
+if ENABLE_GNOME
+GNOME_USED_CSFILES = $(GNOME_CSFILES)
+
 if FIXED_PANELAPPLET
 FIXED_PANELAPPLET_CSFLAGS = -define:FIXED_PANELAPPLET
 else
-PANELAPPLET_CSFILES =			\
+PANELAPPLET_USED_CSFILES =			\
 	$(srcdir)/panelapplet/*.cs
 endif
 endif
@@ -109,15 +117,15 @@
 	$(srcdir)/Notebooks/*.cs		\
 	$(srcdir)/Synchronization/*.cs		\
 	\
-	$(GNOME_CSFILES)			\
-	$(WIN_CSFILES)			\
-	$(OSX_CSFILES)			\
+	$(GNOME_USED_CSFILES)			\
+	$(WIN_USED_CSFILES)			\
+	$(OSX_USED_CSFILES)			\
 	\
-	$(PANELAPPLET_CSFILES)			\
+	$(PANELAPPLET_USED_CSFILES)			\
 	\
 	$(srcdir)/Gnome.Keyring/*.cs		\
 	\
-	$(DBUS_CSFILES)	
+	$(DBUS_USED_CSFILES)	
 
 
 ASSEMBLIES = 		\
@@ -190,6 +198,11 @@
 
 EXTRA_DIST =            		\
 	$(CSFILES)      		\
+	$(GNOME_CSFILES)		\
+	$(OSX_CSFILES)		\
+	$(WIN_CSFILES)		\
+	$(DBUS_CSFILES)		\
+	$(PANELAPPLET_CSFILES)		\
 	$(WRAPPER).in			\
 	$(PANEL_WRAPPER).in		\
 	$(TARGET).config.in		\

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Mon Mar  2 22:45:42 2009
@@ -39,6 +39,7 @@
 Tomboy/Addins/WebDavSyncService/WebDavSyncServiceAddin.cs
 Tomboy/Addins/WebDavSyncService/WebDavSyncService.addin.xml
 Tomboy/Applet.cs
+Tomboy/MacApplication.cs
 Tomboy/Notebooks/CreateNotebookDialog.cs
 Tomboy/Notebooks/Notebook.cs
 Tomboy/Notebooks/NotebookApplicationAddin.cs

Modified: trunk/po/POTFILES.skip
==============================================================================
--- trunk/po/POTFILES.skip	(original)
+++ trunk/po/POTFILES.skip	Mon Mar  2 22:45:42 2009
@@ -1,21 +1,4 @@
 data/GNOME_TomboyApplet.server.in
-libtomboy/eggtrayicon.c
-libtomboy/gtksourceprintjob.c
-Mono.Addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInfoDialog.cs
-Mono.Addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallDialog.cs
-Mono.Addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstaller.cs
-Mono.Addins/Mono.Addins.Gui/Mono.Addins.Gui/AddinInstallerDialog.cs
-Mono.Addins/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs
-Mono.Addins/Mono.Addins.Gui/Mono.Addins.Gui/Services.cs
-Mono.Addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs
-Mono.Addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs
-Mono.Addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs
-Mono.Addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinManagerDialog.cs
-Mono.Addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ErrorDialog.cs
-Mono.Addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.ManageSitesDialog.cs
-Mono.Addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.NewSiteDialog.cs
-Mono.Addins/Mono.Addins/Mono.Addins.Description/AssemblyDependency.cs
-Mono.Addins/Mono.Addins/Mono.Addins/AddinSessionService.cs
 Tomboy/Addins/Tasks/TaskListWindow.cs
 Tomboy/Addins/Tasks/TaskManager.cs
 Tomboy/Addins/Tasks/TaskOptionsDialog.cs