[gnote] Remove define HAVE_GTK_SHOW_URI



commit caa5a8528d6b15d82f5662e50209972943a2b69b
Author: Aurimas Ä?ernius <aurisc4 gmail com>
Date:   Sat Sep 18 22:05:34 2010 +0300

    Remove define HAVE_GTK_SHOW_URI
    
    Since minimum required version of GTK+ is 2.20, HAVE_GTK_SHOW_URI
    macro is no longer necessairy and can be assumed to be always 1.

 configure.ac  |    3 ---
 src/utils.cpp |    8 --------
 2 files changed, 0 insertions(+), 11 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7f870c2..3a74658 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,9 +71,6 @@ PKG_CHECK_MODULES(LIBXSLT, [libxslt])
 PKG_CHECK_MODULES(GCONF, [gconf-2.0])
 PKG_CHECK_MODULES(PCRE, [libpcrecpp])
 
-PKG_CHECK_EXISTS(gtk+-2.0 >= 2.14.0,
-  [AC_DEFINE(HAVE_GTK_SHOW_URI, 1, [Define to 1 if you have gtk_show_uri])],
-  [])
 PKG_CHECK_EXISTS(gtkmm-2.4 >= 2.14.0,
   [AC_DEFINE(HAVE_CLASS_GTK__WIDGET_SIGNAL_POPUP_MENU, 1, [Define to 1 if class Gtk::Widget has signal_popup_menu])],
   [])
diff --git a/src/utils.cpp b/src/utils.cpp
index 28aa79b..afa956e 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -124,7 +124,6 @@ namespace gnote {
       }
       GError *error = NULL;
 
-#ifdef HAVE_GTK_SHOW_URI
       if(!gtk_show_uri (screen, uri.c_str(), gtk_get_current_event_time (), &error)) {
         
         std::string message = _("The \"Gnote Manual\" could "
@@ -142,9 +141,6 @@ namespace gnote {
           g_error_free(error);
         }
       }
-#else
-      Glib::spawn_command_line_async ("xdg-open " + uri);
-#endif
     }
 
 
@@ -154,11 +150,7 @@ namespace gnote {
       if(!url.empty()) {
         GError *err = NULL;
         DBG_OUT("Opening url '%s'...", url.c_str());
-#ifdef HAVE_GTK_SHOW_URI
         gtk_show_uri (NULL, url.c_str(), GDK_CURRENT_TIME, &err);
-#else
-        Glib::spawn_command_line_async ("xdg-open " + url);
-#endif
         if(err) {
           throw Glib::Error(err, true);
         }



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