[blam: 13/15] Merge branch 'blam-1.8'

[Carlos MartÃn Nieto <cmartin src gnome org>]

commit 7fdfb67dabade9f9e3ffecfaccd5f6fae1e885f9
Merge: e4155e3 07cbef6
Author: Carlos MartÃn Nieto <carlos cmartin tk>
Date:   Sun May 13 01:27:21 2012 +0200

    Merge branch 'blam-1.8'
    
    Conflicts:
    	Makefile.am
    	lib/Makefile.am
    	src/ItemView.cs
    	src/Makefile.am

 Makefile.am                   |    1 +
 blam.exe.config               |    1 +
 configure.in                  |   62 ++++++++++++++++++-----------------------
 src/Application.cs            |   33 +++++----------------
 src/ChannelCollection.cs      |    3 +-
 src/ChannelList.cs            |    5 ++-
 src/Defines.cs.in             |    2 +-
 src/ItemList.cs               |    6 ++--
 src/ItemView.cs               |    2 +-
 src/Makefile.am               |   14 +++------
 src/gtk-sharp-beans/Global.cs |   46 ++++++++++++++++++++++++++++++
 11 files changed, 99 insertions(+), 76 deletions(-)
---
diff --cc Makefile.am
index 6197b66,c9afe72..e04ff5c
--- a/Makefile.am
+++ b/Makefile.am
@@@ -1,4 -1,5 +1,5 @@@
 -SUBDIRS = icons lib src themes po
 +SUBDIRS = icons src themes po
+ DIST_SUBDIRS = $(SUBDIRS)
  
  desktop_in_files=blam.desktop.in
  desktop_files=$(desktop_in_files:.desktop.in=.desktop)
diff --cc configure.in
index 2059864,d0b4316..045caa8
--- a/configure.in
+++ b/configure.in
@@@ -38,9 -37,8 +38,8 @@@ if test "x$PKG_CONFIG" = "xno"; the
  fi
  
  dnl Find mono
 -MONO_REQUIRED_VERSION=1.1.17
 +MONO_REQUIRED_VERSION=2.6.0
  GTKSHARP_REQUIRED_VERSION=2.8.2
- GNOMESHARP_REQUIRED_VERSION=2.16.1
  GCONF_REQUIRED_VERSION=2.4
  WEBKITSHARP_REQUIRED_VERSION=0.2
  
@@@ -88,13 -70,22 +71,22 @@@ AM_CONDITIONAL(ENABLE_DBUS, test "x$hav
  #
  # Use libnotify is available
  #
- PKG_CHECK_MODULES(NOTIFY, notify-sharp, ENABLE_NOTIFY="yes", ENABLE_NOTIFY="no")
- AM_CONDITIONAL(ENABLE_NOTIFY, test "$ENABLE_NOTIFY" = "yes")
- AC_SUBST(NOTIFY_LIBS)
+ AC_ARG_WITH([notify],
+ 	AC_HELP_STRING([--without-notify], [Remove notification support]))
+ 
+ AS_IF([test "x$with_notify" != "xno"],
+       [PKG_CHECK_EXISTS([notify-sharp], [have_notify=yes], [have_notify=no])],
+       [have_notify=no])
+ 
+ AS_IF([test "x$have_notify" = "xyes"],
+       [PKG_CHECK_MODULES(NOTIFY, notify-sharp, ENABLE_NOTIFY="yes", ENABLE_NOTIFY="no")
+        AC_SUBST(NOTIFY_LIBS)],
+        [])
  
+ AM_CONDITIONAL(ENABLE_NOTIFY, test "x$have_notify" = "xyes")
  
  dnl Intl
 -ALL_LINGUAS="ar bg bs ca cs da de dz el en_CA en_GB es et eu fi fr ga gl gu he hr hu it lt lv ja nb ne nl oc pa pl pt_BR pt ru rw sk sl sq sr Latn sr sv tr uk vi zh_CN zh_HK zh_TW"
 +ALL_LINGUAS="ar bg bs ca cs da de dz el en_CA en_GB eo es et eu fi fr ga gl gu he hr hu it lt lv ja nb ne nl oc pa pl pt_BR pt ro ru rw sk sl sq sr Latn sr sv tr uk vi zh_CN zh_HK zh_TW"
  GETTEXT_PACKAGE=blam
  AC_SUBST(GETTEXT_PACKAGE)
  AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
diff --cc src/Application.cs
index 4b52e95,fb3f63a..e7bbf46
--- a/src/Application.cs
+++ b/src/Application.cs
@@@ -555,10 -538,9 +538,10 @@@ namespace Imendio.Blam 
              SaveWindowState();
              mainWindow.Hide();
              mCollection.SaveToFile ();
 +            ItemStore.Save();
              mCollection.StopAllThreads();
  
-             Quit();
+             Gtk.Main.Quit();
          }
  
          public void CopyActivated (object obj, EventArgs args)
diff --cc src/ItemView.cs
index c603b2f,3375b4d..7faa67c
--- a/src/ItemView.cs
+++ b/src/ItemView.cs
@@@ -69,17 -68,14 +69,17 @@@ namespace Imendio.Blam 
  
  		webView.NavigationRequested += delegate (object sender, NavigationRequestedArgs args) {
          try {
 -            /* Allow our local files to be downloaded. Needed to load the theme */
 -            if(args.Request.Uri.StartsWith(baseDir)){
 -                    args.RetVal = NavigationResponse.Accept;
 -                    return;
 -            }
 -
 -            GtkBeans.Global.ShowUri(null, args.Request.Uri);
 -            args.RetVal = NavigationResponse.Ignore;
 +			/*
 +			 * If last_link is the same as args.Request.Uri, the user clicked on a link
 +			 * (as we know he was hovering). Thus, try to open it on the browser
 +			 */
 +			if(args.Request.Uri.Equals(last_link)){
- 				Gnome.Url.Show(args.Request.Uri);
++				GtkBeans.Global.ShowUri(null, args.Request.Uri);
 +				args.RetVal = NavigationResponse.Ignore;
 +			} else {
 +				/* Otherwise, it's part of the post, so accept it (like the facebook iframe) */
 +				args.RetVal = NavigationResponse.Accept;
 +			}
          }
          catch (Exception e) {
              Console.Error.WriteLine("Couldn't show URL: " + args.Request.Uri + e.Message);
diff --cc src/Makefile.am
index a239998,5daed86..89274d1
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -35,8 -36,7 +35,9 @@@ BLAM_CSFILES = Application.cs 
  	       TrayIcon.cs \
  	       Utils.cs \
  	       Proxy.cs \
 +	       ItemStore.cs \
- 	       Filter.cs
++	       Filter.cs \
+ 	       gtk-sharp-beans/*.cs
  
  GENERATED_CSFILES = \
  	       Defines.cs