beagle r4813 - in trunk/beagle: . search search/Beagle.Search.Tiles

[dbera svn gnome org]

Author: dbera
Date: Tue Jul  8 02:11:34 2008
New Revision: 4813
URL: http://svn.gnome.org/viewvc/beagle?rev=4813&view=rev

Log:
Why was the OpenWith menu disabled even with gtk+ > 2.8. I enabled it to see how it goes. If it does not work, then there is no sense in keeping around unused code.


Modified:
   trunk/beagle/configure.in
   trunk/beagle/search/Beagle.Search.Tiles/Tile.cs
   trunk/beagle/search/Makefile.am

Modified: trunk/beagle/configure.in
==============================================================================
--- trunk/beagle/configure.in	(original)
+++ trunk/beagle/configure.in	Tue Jul  8 02:11:34 2008
@@ -255,12 +255,6 @@
 
 dnl ----------------------------------------------
 
-dnl "Open With" Menu (Requires GTK 2.8)
-PKG_CHECK_MODULES(OPEN_WITH, gtk-sharp-2.0 >= 2.8, open_with=yes, open_with=no)
-AM_CONDITIONAL(ENABLE_OPEN_WITH, test "x$open_with" != "xno")
-
-dnl ----------------------------------------------
-
 dnl evolution support
 
 AC_ARG_ENABLE([evolution],

Modified: trunk/beagle/search/Beagle.Search.Tiles/Tile.cs
==============================================================================
--- trunk/beagle/search/Beagle.Search.Tiles/Tile.cs	(original)
+++ trunk/beagle/search/Beagle.Search.Tiles/Tile.cs	Tue Jul  8 02:11:34 2008
@@ -45,7 +45,9 @@
 
 		private List<TileAction> actions = new List<TileAction> ();
 
-		protected bool EnableOpenWith = false;
+		// FIXME: It was false initially. I enabled it but don't know
+		// why it was disabled. - dBera
+		protected bool EnableOpenWith = true;
 
 		public event EventHandler Selected;
 
@@ -100,7 +102,6 @@
 			ActionMenuItem open_menu_item = new ActionMenuItem (open);
 			menu.Append (open_menu_item);
 
-#if ENABLE_OPEN_WITH
 			if (EnableOpenWith) {
 				// FIXME: Not sure if going with the parent is
 				// the right thing to do in all cases.
@@ -110,7 +111,6 @@
 				owm.ApplicationActivated += OpenWith;
 				owm.AppendToMenu (menu);
 			}
-#endif
 
 			if (Actions.Count > 0) {
 				SeparatorMenuItem separator = new SeparatorMenuItem ();
@@ -313,14 +313,12 @@
 			System.Console.WriteLine ("Warning: Open method not implemented for '{0}'", this.GetType ());
 		}
 
-#if ENABLE_OPEN_WITH
 		private void OpenWith (Gnome.Vfs.MimeApplication mime_application)
 		{
 			GLib.List uri_list = new GLib.List (typeof (string));
 			uri_list.Append (Hit.EscapedUri);
 			mime_application.Launch (uri_list);
 		}
-#endif
 
 		protected void OpenFromMime (Hit hit)
 		{

Modified: trunk/beagle/search/Makefile.am
==============================================================================
--- trunk/beagle/search/Makefile.am	(original)
+++ trunk/beagle/search/Makefile.am	Tue Jul  8 02:11:34 2008
@@ -14,10 +14,6 @@
 CSFLAGS += -define:ENABLE_XDG_OPEN
 endif
 
-if ENABLE_OPEN_WITH
-CSFLAGS += -define:ENABLE_OPEN_WITH
-endif
-
 if ENABLE_GALAGO
 CSFLAGS += -define:ENABLE_GALAGO
 endif
@@ -59,6 +55,7 @@
 	$(srcdir)/Beagle.Search.Tiles/MailMessage.cs		\
 	$(srcdir)/Beagle.Search.Tiles/Manpage.cs		\
 	$(srcdir)/Beagle.Search.Tiles/Note.cs			\
+	$(srcdir)/Beagle.Search.Tiles/OpenWithMenu.cs		\
 	$(srcdir)/Beagle.Search.Tiles/Presentation.cs		\
 	$(srcdir)/Beagle.Search.Tiles/RSSFeed.cs		\
 	$(srcdir)/Beagle.Search.Tiles/Spreadsheet.cs		\
@@ -94,10 +91,6 @@
 	$(srcdir)/Beagle.Search/UIManager.cs			\
 	$(srcdir)/Beagle.Search/WidgetFu.cs
 
-if ENABLE_OPEN_WITH
-SOURCES += $(srcdir)/Beagle.Search.Tiles/OpenWithMenu.cs
-endif
-
 LOCAL_ASSEMBLIES =			\
 	../Util/Util.dll		\
 	../Util/UiUtil.dll		\