[gparted] Increase minimum required gtkmm to 2.16.0 (#794253)
- From: Curtis Gedak <gedakc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gparted] Increase minimum required gtkmm to 2.16.0 (#794253)
- Date: Mon, 26 Mar 2018 16:49:47 +0000 (UTC)
commit fc215d0c2e07539374622de4dfc0bffff3bf44de
Author: Mike Fleetwood <mike fleetwood googlemail com>
Date: Wed Mar 7 22:25:56 2018 +0000
Increase minimum required gtkmm to 2.16.0 (#794253)
Increase the minimum required version of gtkmm to 2.16.0, thus allowing
removal of HAVE_GTK_SHOW_URI autoconf definition and associated fallback
code.
Bug 794253 - Desupport RHEL / CentOS 5 and raise minimum required
versions to glibmm 2.14.0 and gtkmm 2.16.0
configure.ac | 13 +------------
src/Dialog_Rescue_Data.cc | 5 -----
src/Win_GParted.cc | 7 +------
3 files changed, 2 insertions(+), 23 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 740476e..462ec89 100644
--- a/configure.ac
+++ b/configure.ac
@@ -219,7 +219,7 @@ AC_SUBST([GTHREAD_LIBS])
AC_SUBST([GTHREAD_CFLAGS])
dnl GTKMM
-PKG_CHECK_MODULES([GTKMM], [gtkmm-2.4 >= 2.11.1])
+PKG_CHECK_MODULES([GTKMM], [gtkmm-2.4 >= 2.16.0])
AC_SUBST([GTKMM_LIBS])
AC_SUBST([GTKMM_CFLAGS])
@@ -228,17 +228,6 @@ dnl Check for glibmm minimum required version.
PKG_CHECK_MODULES([GLIBMM], [glibmm-2.4 >= 2.14.0])
-dnl GTKMM 2.16 needed for gtk_show_uri()
-AC_MSG_CHECKING([for gtk_show_uri function])
-PKG_CHECK_EXISTS(
- [gtkmm-2.4 >= 2.16.0],
- [AC_DEFINE([HAVE_GTK_SHOW_URI], 1, [Define to 1 if gtkmm provides gtk_show_uri() function.])
- AC_MSG_RESULT([yes])
- ],
- [AC_MSG_RESULT([no])]
-)
-
-
dnl Check for gtkmm >= 2.22 to determine availability of Gtk::MessageDialog::get_message_area().
AC_MSG_CHECKING([for Gtk::MessageDialog::get_message_area() method])
PKG_CHECK_EXISTS(
diff --git a/src/Dialog_Rescue_Data.cc b/src/Dialog_Rescue_Data.cc
index 5d99d81..5041034 100644
--- a/src/Dialog_Rescue_Data.cc
+++ b/src/Dialog_Rescue_Data.cc
@@ -217,12 +217,7 @@ void Dialog_Rescue_Data::open_ro_view(Glib::ustring mountPoint)
gscreen = gdk_screen_get_default() ;
-#ifdef HAVE_GTK_SHOW_URI
gtk_show_uri( gscreen, uri .c_str(), gtk_get_current_event_time(), &error ) ;
-#else
- Glib::ustring command = "gnome-open " + uri ;
- gdk_spawn_command_line_on_screen( gscreen, command .c_str(), &error ) ;
-#endif
if ( error != NULL )
{
diff --git a/src/Win_GParted.cc b/src/Win_GParted.cc
index e3ecd69..25247bf 100644
--- a/src/Win_GParted.cc
+++ b/src/Win_GParted.cc
@@ -1611,16 +1611,11 @@ void Win_GParted::show_help_dialog( const Glib::ustring & filename /* E.g., gpar
gscreen = gdk_screen_get_default() ;
-#ifdef HAVE_GTK_SHOW_URI
gtk_show_uri( gscreen, uri .c_str(), gtk_get_current_event_time(), &error ) ;
-#else
- Glib::ustring command = "gnome-open " + uri ;
- gdk_spawn_command_line_on_screen( gscreen, command .c_str(), &error ) ;
-#endif
if ( error != NULL )
{
//Try opening yelp application directly
- g_clear_error( &error ) ; //Clear error from trying to open gparted help manual above
(gtk_show_uri or gnome-open).
+ g_clear_error( &error ); // Clear error from trying to open gparted help manual above
(gtk_show_uri).
Glib::ustring command = "yelp " + uri ;
gdk_spawn_command_line_on_screen( gscreen, command .c_str(), &error ) ;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]