GNOME.org
 

beagle r4477 - in trunk/beagle: . conf-data po search search/Beagle.Search

Author: llipka
Date: Thu Feb 14 21:56:03 2008
New Revision: 4477
URL: http://svn.gnome.org/viewvc/beagle?rev=4477&view=rev

Log:
Update potfiles, svn ignore, makefiles and wrappers.

Modified:
   trunk/beagle/conf-data/   (props changed)
   trunk/beagle/configure.in
   trunk/beagle/po/POTFILES.in
   trunk/beagle/search/Beagle.Search/Driver.cs
   trunk/beagle/search/Beagle.Search/Search.cs
   trunk/beagle/search/Makefile.am
   trunk/beagle/search/beagle-search.in

Modified: trunk/beagle/configure.in
==============================================================================
--- trunk/beagle/configure.in	(original)
+++ trunk/beagle/configure.in	Thu Feb 14 21:56:03 2008
@@ -16,7 +16,7 @@
 MONODOC_REQUIRED=1.2.4
 NDESK_DBUS_REQUIRED=0.5.2
 NDESK_DBUS_GLIB_REQUIRED=0.3.0
-GTK_SHARP_REQUIRED=2.4.0
+GTK_SHARP_REQUIRED=2.6.0
 GMIME_SHARP_REQUIRED=2.2.0
 EVOLUTION_SHARP_REQUIRED=0.13.3
 GSF_SHARP_REQUIRED=0.6

Modified: trunk/beagle/po/POTFILES.in
==============================================================================
--- trunk/beagle/po/POTFILES.in	(original)
+++ trunk/beagle/po/POTFILES.in	Thu Feb 14 21:56:03 2008
@@ -1,69 +1,69 @@
 # List of source files containing translatable strings.
 # Please keep this file in alphabetical order.
 [encoding: UTF-8]
-epiphany-extension/beagle.ephy-extension.in
-epiphany-extension/beagle.py.in
 ImLogViewer/ImLogViewer.cs
 ImLogViewer/ImLogViewer.glade
 ImLogViewer/ImLogWindow.cs
-search/beagle-search.desktop.in.in
-search/Category.cs
-search/Entry.cs
-search/GroupView.cs
-search/NotificationArea.cs
-search/ListCategory.cs
-search/WidgetFu.cs
-search/Pages/Base.cs
-search/Pages/IndexInfo.cs
-search/Pages/NoMatch.cs
-search/Pages/QuickTips.cs
-search/Pages/RootUser.cs
-search/Pages/StartDaemon.cs
-search/Panes.cs
-search/Search.cs
-search/SortedTileList.cs
-search/Spinner.cs
-search/TileCategory.cs
-search/Tiles/ActionMenuItem.cs
-search/Tiles/Application.cs
-search/Tiles/ArchivedFile.cs
-search/Tiles/Audio.cs
-search/Tiles/Calendar.cs
-search/Tiles/CApplet.cs
-search/Tiles/Contact.cs
-search/Tiles/Docbook.cs
-search/Tiles/File.cs
-search/Tiles/Folder.cs
-search/Tiles/HitFlavor.cs
-search/Tiles/Image.cs
-search/Tiles/IMLog.cs
-search/Tiles/MailAttachment.cs
-search/Tiles/MailMessage.cs
-search/Tiles/Manpage.cs
-search/Tiles/Note.cs
-search/Tiles/OpenWithMenu.cs
-search/Tiles/Presentation.cs
-search/Tiles/RSSFeed.cs
-search/Tiles/Spreadsheet.cs
-search/Tiles/Task.cs
-search/Tiles/TextDocument.cs
-search/Tiles/TileAction.cs
-search/Tiles/TileActivator.cs
-search/Tiles/Tile.cs
-search/Tiles/TileGroup.cs
-search/Tiles/TileTemplate.cs
-search/Tiles/Utils.cs
-search/Tiles/Video.cs
-search/Tiles/WebHistory.cs
-search/Tray/NotificationArea.cs
-search/Tray/TrayIcon.cs
-search/TypeFilter.cs
-search/UIManager.cs
-tools/Config.cs
-tools/Settings.cs
-tools/settings.glade
-tools/beagle-settings.desktop.in.in
 Util/ChmFile.cs
 Util/Config.cs
 Util/Evolution.cs
 Util/StringFu.cs
+epiphany-extension/beagle.ephy-extension.in
+epiphany-extension/beagle.py.in
+search/Beagle.Search.Pages/Base.cs
+search/Beagle.Search.Pages/IndexInfo.cs
+search/Beagle.Search.Pages/NoMatch.cs
+search/Beagle.Search.Pages/QuickTips.cs
+search/Beagle.Search.Pages/RootUser.cs
+search/Beagle.Search.Pages/StartDaemon.cs
+search/Beagle.Search.Tiles/ActionMenuItem.cs
+search/Beagle.Search.Tiles/Application.cs
+search/Beagle.Search.Tiles/ArchivedFile.cs
+search/Beagle.Search.Tiles/Audio.cs
+search/Beagle.Search.Tiles/CApplet.cs
+search/Beagle.Search.Tiles/Calendar.cs
+search/Beagle.Search.Tiles/Contact.cs
+search/Beagle.Search.Tiles/Docbook.cs
+search/Beagle.Search.Tiles/File.cs
+search/Beagle.Search.Tiles/Folder.cs
+search/Beagle.Search.Tiles/HitFlavor.cs
+search/Beagle.Search.Tiles/IMLog.cs
+search/Beagle.Search.Tiles/Image.cs
+search/Beagle.Search.Tiles/MailAttachment.cs
+search/Beagle.Search.Tiles/MailMessage.cs
+search/Beagle.Search.Tiles/Manpage.cs
+search/Beagle.Search.Tiles/Note.cs
+search/Beagle.Search.Tiles/OpenWithMenu.cs
+search/Beagle.Search.Tiles/Presentation.cs
+search/Beagle.Search.Tiles/RSSFeed.cs
+search/Beagle.Search.Tiles/Spreadsheet.cs
+search/Beagle.Search.Tiles/Task.cs
+search/Beagle.Search.Tiles/TextDocument.cs
+search/Beagle.Search.Tiles/Tile.cs
+search/Beagle.Search.Tiles/TileAction.cs
+search/Beagle.Search.Tiles/TileActivator.cs
+search/Beagle.Search.Tiles/TileGroup.cs
+search/Beagle.Search.Tiles/TileTemplate.cs
+search/Beagle.Search.Tiles/Utils.cs
+search/Beagle.Search.Tiles/Video.cs
+search/Beagle.Search.Tiles/WebHistory.cs
+search/Beagle.Search.Tray/NotificationArea.cs
+search/Beagle.Search.Tray/TrayIcon.cs
+search/Beagle.Search/Category.cs
+search/Beagle.Search/Entry.cs
+search/Beagle.Search/GroupView.cs
+search/Beagle.Search/ListCategory.cs
+search/Beagle.Search/NotificationArea.cs
+search/Beagle.Search/Panes.cs
+search/Beagle.Search/Search.cs
+search/Beagle.Search/SortedTileList.cs
+search/Beagle.Search/Spinner.cs
+search/Beagle.Search/TileCategory.cs
+search/Beagle.Search/TypeFilter.cs
+search/Beagle.Search/UIManager.cs
+search/Beagle.Search/WidgetFu.cs
+search/beagle-search.desktop.in.in
+tools/Config.cs
+tools/Settings.cs
+tools/beagle-settings.desktop.in.in
+tools/settings.glade

Modified: trunk/beagle/search/Beagle.Search/Driver.cs
==============================================================================
--- trunk/beagle/search/Beagle.Search/Driver.cs	(original)
+++ trunk/beagle/search/Beagle.Search/Driver.cs	Thu Feb 14 21:56:03 2008
@@ -16,38 +16,6 @@
 
 	public class Driver {
 
-		public static void Main (string[] args)
-		{
-			// Set our process name
-
-			SystemInformation.SetProcessName ("beagle-search");
-
-			// Initialize our translations catalog
-			
-			Catalog.Init ("beagle", ExternalStringsHack.LocaleDir);
-
-			// Set up DBus for our GLib main loop
-			
-			BusG.Init ();
-
-			// Parse arguments
-
-			string query = ParseArgs (args);
-
-			// Init Gnome program
-
-			Gnome.Program program = new Gnome.Program ("search", "0.0", Gnome.Modules.UI, args);
-
-			Search window = new Search (query);
-
-			//if (query != null && query != "" && !IconEnabled) {
-			//	window.entry.Text = query;
-			//	window.Search (true);
-			//}
-
-			program.Run ();
-		}
-
 		private static string ParseArgs (String[] args)
 		{
 			string query = String.Empty;
@@ -112,5 +80,37 @@
 			Console.WriteLine (usage);
 			System.Environment.Exit (0);
 		}
+
+		public static void Main (string[] args)
+		{
+			// Set our process name
+
+			SystemInformation.SetProcessName ("beagle-search");
+
+			// Initialize our translations catalog
+			
+			Catalog.Init ("beagle", ExternalStringsHack.LocaleDir);
+
+			// Set up DBus for our GLib main loop
+			
+			BusG.Init ();
+
+			// Parse arguments
+
+			string query = ParseArgs (args);
+
+			// Init Gnome program
+
+			Gnome.Program program = new Gnome.Program ("search", "0.0", Gnome.Modules.UI, args);
+
+			Search window = new Search (query);
+
+			//if (query != null && query != "" && !IconEnabled) {
+			//	window.entry.Text = query;
+			//	window.Search (true);
+			//}
+
+			program.Run ();
+		}
 	}
 }

Modified: trunk/beagle/search/Beagle.Search/Search.cs
==============================================================================
--- trunk/beagle/search/Beagle.Search/Search.cs	(original)
+++ trunk/beagle/search/Beagle.Search/Search.cs	Thu Feb 14 21:56:03 2008
@@ -60,12 +60,12 @@
 
 		public Search (string query_text) : base (WindowType.Toplevel)
 		{
-			Title = Catalog.GetString ("Desktop Search");
-			Icon = WidgetFu.LoadThemeIcon ("system-search", 16);
+			base.Title = Catalog.GetString ("Desktop Search");
+			base.Icon = WidgetFu.LoadThemeIcon ("system-search", 16);
 
-			DefaultWidth = 700;
-			DefaultHeight = 550;
-			DeleteEvent += OnWindowDelete;
+			base.DefaultWidth = 700;
+			base.DefaultHeight = 550;
+			base.DeleteEvent += OnWindowDelete;
 			
 			VBox vbox = new VBox ();
 			vbox.Spacing = 3;

Modified: trunk/beagle/search/Makefile.am
==============================================================================
--- trunk/beagle/search/Makefile.am	(original)
+++ trunk/beagle/search/Makefile.am	Thu Feb 14 21:56:03 2008
@@ -1,6 +1,9 @@
 CSC = $(MCS) -debug
 CSFLAGS = -target:exe
 
+ASSEMBLY_NAME = Beagle.Search
+ASSEMBLY = $(ASSEMBLY_NAME).exe
+
 if ENABLE_DESKTOP_LAUNCH
 CSFLAGS += -define:ENABLE_DESKTOP_LAUNCH
 endif
@@ -25,28 +28,14 @@
 CSFLAGS += -define:ENABLE_AVAHI
 endif
 
-pkglib_DATA = Search.exe Search.exe.mdb
-
-BIN_WRAPPERS = beagle-search
-
-CSFILES =							\
+SOURCES =							\
 	$(srcdir)/AssemblyInfo.cs				\
-	$(srcdir)/Beagle.Search/Category.cs			\
-	$(srcdir)/Beagle.Search/Driver.cs			\
-	$(srcdir)/Beagle.Search/DetailsPane.cs			\
-	$(srcdir)/Beagle.Search/Entry.cs			\
-	$(srcdir)/Beagle.Search/GroupView.cs			\
-	$(srcdir)/Beagle.Search/ISearch.cs			\
-	$(srcdir)/Beagle.Search/ListCategory.cs			\
-	$(srcdir)/Beagle.Search/NotificationArea.cs		\
-	$(srcdir)/Beagle.Search/Panes.cs			\
-	$(srcdir)/Beagle.Search/Search.cs			\
-	$(srcdir)/Beagle.Search/SortedTileList.cs		\
-	$(srcdir)/Beagle.Search/Spinner.cs			\
-	$(srcdir)/Beagle.Search/TileCategory.cs			\
-	$(srcdir)/Beagle.Search/TypeFilter.cs			\
-	$(srcdir)/Beagle.Search/UIManager.cs			\
-	$(srcdir)/Beagle.Search/WidgetFu.cs			\
+	$(srcdir)/Beagle.Search.Pages/Base.cs			\
+	$(srcdir)/Beagle.Search.Pages/IndexInfo.cs		\
+	$(srcdir)/Beagle.Search.Pages/NoMatch.cs		\
+	$(srcdir)/Beagle.Search.Pages/QuickTips.cs		\
+	$(srcdir)/Beagle.Search.Pages/RootUser.cs		\
+	$(srcdir)/Beagle.Search.Pages/StartDaemon.cs		\
 	$(srcdir)/Beagle.Search.Tiles/ActionMenuItem.cs		\
 	$(srcdir)/Beagle.Search.Tiles/Application.cs		\
 	$(srcdir)/Beagle.Search.Tiles/ArchivedFile.cs		\
@@ -60,8 +49,8 @@
 	$(srcdir)/Beagle.Search.Tiles/HitFlavor.cs		\
 	$(srcdir)/Beagle.Search.Tiles/IMLog.cs			\
 	$(srcdir)/Beagle.Search.Tiles/Image.cs			\
-	$(srcdir)/Beagle.Search.Tiles/MailMessage.cs		\
 	$(srcdir)/Beagle.Search.Tiles/MailAttachment.cs		\
+	$(srcdir)/Beagle.Search.Tiles/MailMessage.cs		\
 	$(srcdir)/Beagle.Search.Tiles/Manpage.cs		\
 	$(srcdir)/Beagle.Search.Tiles/Note.cs			\
 	$(srcdir)/Beagle.Search.Tiles/Presentation.cs		\
@@ -79,20 +68,29 @@
 	$(srcdir)/Beagle.Search.Tiles/Utils.cs			\
 	$(srcdir)/Beagle.Search.Tiles/Video.cs			\
 	$(srcdir)/Beagle.Search.Tiles/WebHistory.cs		\
-	$(srcdir)/Beagle.Search.Pages/Base.cs			\
-	$(srcdir)/Beagle.Search.Pages/IndexInfo.cs		\
-	$(srcdir)/Beagle.Search.Pages/NoMatch.cs		\
-	$(srcdir)/Beagle.Search.Pages/QuickTips.cs		\
-	$(srcdir)/Beagle.Search.Pages/RootUser.cs		\
-	$(srcdir)/Beagle.Search.Pages/StartDaemon.cs		\
 	$(srcdir)/Beagle.Search.Tray/NotificationArea.cs	\
-	$(srcdir)/Beagle.Search.Tray/TrayIcon.cs
+	$(srcdir)/Beagle.Search.Tray/TrayIcon.cs		\
+	$(srcdir)/Beagle.Search/Category.cs			\
+	$(srcdir)/Beagle.Search/DetailsPane.cs			\
+	$(srcdir)/Beagle.Search/Driver.cs			\
+	$(srcdir)/Beagle.Search/Entry.cs			\
+	$(srcdir)/Beagle.Search/GroupView.cs			\
+	$(srcdir)/Beagle.Search/ISearch.cs			\
+	$(srcdir)/Beagle.Search/ListCategory.cs			\
+	$(srcdir)/Beagle.Search/NotificationArea.cs		\
+	$(srcdir)/Beagle.Search/Panes.cs			\
+	$(srcdir)/Beagle.Search/Search.cs			\
+	$(srcdir)/Beagle.Search/SortedTileList.cs		\
+	$(srcdir)/Beagle.Search/Spinner.cs			\
+	$(srcdir)/Beagle.Search/TileCategory.cs			\
+	$(srcdir)/Beagle.Search/TypeFilter.cs			\
+	$(srcdir)/Beagle.Search/UIManager.cs			\
+	$(srcdir)/Beagle.Search/WidgetFu.cs
 
 if ENABLE_OPEN_WITH
-CSFILES += $(srcdir)/Beagle.Search.Tiles/OpenWithMenu.cs
+SOURCES += $(srcdir)/Beagle.Search.Tiles/OpenWithMenu.cs
 endif
 
-
 LOCAL_ASSEMBLIES =			\
 	../Util/Util.dll		\
 	../Util/UiUtil.dll		\
@@ -105,10 +103,14 @@
 	$(NDESK_DBUS_GLIB_LIBS)		\
 	-r:Mono.Posix
 
-Search.exe: $(CSFILES) $(LOCAL_ASSEMBLIES)
-	$(CSC) -out:$@ $(CSFLAGS) $(CSFILES) $(ASSEMBLIES)
+pkglib_DATA = $(ASSEMBLY) $(ASSEMBLY).mdb
+
+BIN_WRAPPERS = beagle-search
+
+$(ASSEMBLY): $(SOURCES) $(LOCAL_ASSEMBLIES)
+	$(CSC) -out:$@ $(CSFLAGS) $(SOURCES) $(ASSEMBLIES)
 
-Search.exe.mdb: Search.exe
+$(ASSEMBLY).mdb: Search.exe
 
 beagle-search: beagle-search.in
 	sed 					\
@@ -144,10 +146,7 @@
 	rm -f $(DESTDIR)$(bindir)/beagle-search
 
 EXTRA_DIST =			\
-	$(CSFILES)		\
-	$(TILES)		\
-	$(PAGES)		\
-	$(TRAY)			\
+	$(SOURCES)		\
 	$(man_MANS)		\
 	$(desktop_DATA).in	\
 	$(autostart_DATA)	\
@@ -155,8 +154,8 @@
 	beagle-search.desktop.in.in
 
 CLEANFILES =			\
-	Search.exe		\
-	Search.exe.mdb		\
+	$(ASSEMBLY)		\
+	$(ASSEMBLY).mdb		\
 	beagle-search		\
 	$(desktop_DATA)		\
 	$(desktop_h_files)

Modified: trunk/beagle/search/beagle-search.in
==============================================================================
--- trunk/beagle/search/beagle-search.in	(original)
+++ trunk/beagle/search/beagle-search.in	Thu Feb 14 21:56:03 2008
@@ -5,12 +5,12 @@
 
 if [ -z $installed ] ; then
     echo "*** Running uninstalled beagle-search ***"
-    THIS_EXE="./Search.exe"
+    THIS_EXE="./Beagle.Search.exe"
 
     export LD_LIBRARY_PATH="../glue/.libs${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
     export MONO_PATH="../Util:../BeagleClient${MONO_PATH+:MONO_PATH}"
 else
-    THIS_EXE="@pkglibdir@/Search.exe"
+    THIS_EXE="@pkglibdir@/Beagle.Search.exe"
 
     export LD_LIBRARY_PATH="@pkglibdir ${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
 fi
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]