[nautilus-actions] Bump minimal required Gtk+ version to 2.20

From: Pierre Wieser <pwieser src gnome org>
To: commits-list gnome org
Cc:
Subject: [nautilus-actions] Bump minimal required Gtk+ version to 2.20
Date: Tue, 13 Dec 2011 20:22:07 +0000 (UTC)
commit 8cb7ce4e1aadf983c9aaf6b2d3efd9d13dd7f552
Author: Pierre Wieser <pwieser trychlos org>
Date:   Mon Dec 12 06:01:56 2011 +0100

    Bump minimal required Gtk+ version to 2.20
    
    This is the Gtk+ level of the oldest supported distribution:
    Ubuntu 10 LTS (Gnome 2.30), which must be supported until april 2013.

 ChangeLog                                |   17 ++++++++++++
 configure.ac                             |   10 ++-----
 src/core/na-gtk-utils.c                  |    8 -----
 src/core/na-importer-ask.ui              |    2 +-
 src/nact/nact-add-capability-dialog.c    |    9 ------
 src/nact/nact-add-capability.ui          |    2 +-
 src/nact/nact-add-scheme-dialog.c        |    9 ------
 src/nact/nact-add-scheme.ui              |    2 +-
 src/nact/nact-assistant-export.ui        |    2 +-
 src/nact/nact-clipboard.c                |   26 +-----------------
 src/nact/nact-icon-chooser.ui            |    2 +-
 src/nact/nact-main-tab.c                 |    9 ------
 src/nact/nact-menubar.c                  |   42 ++++-------------------------
 src/nact/nact-preferences.ui             |    2 +-
 src/nact/nact-schemes-list.c             |   16 -----------
 src/nact/nact-tree-model-dnd.c           |   28 --------------------
 src/nact/nautilus-actions-config-tool.ui |    2 +-
 17 files changed, 34 insertions(+), 154 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index e38e726..7734324 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
 2011-12-12 Pierre Wieser <pwieser trychlos org>
 
+	* configure.ac:
+	* src/core/na-gtk-utils.c:
+	* src/core/na-importer-ask.ui:
+	* src/nact/nact-add-capability-dialog.c:
+	* src/nact/nact-add-capability.ui:
+	* src/nact/nact-add-scheme-dialog.c:
+	* src/nact/nact-add-scheme.ui:
+	* src/nact/nact-assistant-export.ui:
+	* src/nact/nact-clipboard.c:
+	* src/nact/nact-icon-chooser.ui:
+	* src/nact/nact-main-tab.c:
+	* src/nact/nact-menubar.c:
+	* src/nact/nact-preferences.ui:
+	* src/nact/nact-schemes-list.c:
+	* src/nact/nact-tree-model-dnd.c:
+	* src/nact/nautilus-actions-config-tool.ui: Now requires Gtk 2.20.
+
 	* tools/release-tarball.sh: Automatically installs manuals on the website
 	when releasing a new stable version.
 
diff --git a/configure.ac b/configure.ac
index 030b0d0..0095b69 100644
--- a/configure.ac
+++ b/configure.ac
@@ -121,18 +121,14 @@ NA_CHECK_FOR_GCONF
 # nautilus itself (e.g. 2.24.2) instead of the library version info
 # (1.1.0) ; for the usual final user, this is very analog to requiring
 # a whole gnome version
-#
-# GLib >= 2.16: GVFS/GIO
-# Gtk  >= 2.12: GtkBuilder
-#
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 if test "${PKG_CONFIG}" = "no"; then
 	AC_MSG_ERROR([You need to install pkg-config])
 fi
 
-glib_required=2.16.0
-gtk_required=2.12.0
-
+# Oldest supported distribution: Ubuntu 10 LTS (Gnome 2.30): april 2013
+glib_required=2.24.0
+gtk_required=2.20.0
 NA_CHECK_FOR_GTK
 
 dnl aclocal complains if the comma is not just after the square bracket
diff --git a/src/core/na-gtk-utils.c b/src/core/na-gtk-utils.c
index d2db706..0dbd1b6 100644
--- a/src/core/na-gtk-utils.c
+++ b/src/core/na-gtk-utils.c
@@ -61,11 +61,7 @@ na_gtk_utils_search_for_child_widget( GtkContainer *container, const gchar *name
 
 		if( GTK_IS_WIDGET( ic->data )){
 			child = GTK_WIDGET( ic->data );
-#if GTK_CHECK_VERSION( 2, 20, 0 )
 			child_name = gtk_buildable_get_name( GTK_BUILDABLE( child ));
-#else
-			child_name = gtk_widget_get_name( child );
-#endif
 			if( child_name && strlen( child_name )){
 				/*g_debug( "%s: child=%s", thisfn, child_name );*/
 
@@ -104,11 +100,7 @@ dump_children( const gchar *thisfn, GtkContainer *container, int level )
 
 		if( GTK_IS_WIDGET( ic->data )){
 			child = GTK_WIDGET( ic->data );
-#if GTK_CHECK_VERSION( 2, 20, 0 )
 			child_name = gtk_buildable_get_name( GTK_BUILDABLE( child ));
-#else
-			child_name = gtk_widget_get_name( child );
-#endif
 			g_debug( "%s: %s%s\t%p %s",
 					thisfn, prefix->str, G_OBJECT_TYPE_NAME( child ), ( void * ) child, child_name );
 
diff --git a/src/core/na-importer-ask.ui b/src/core/na-importer-ask.ui
index b272efa..924dd0d 100644
--- a/src/core/na-importer-ask.ui
+++ b/src/core/na-importer-ask.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 2.12 -->
+  <!-- interface-requires gtk+ 2.20 -->
   <object class="GtkDialog" id="ImporterAskDialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
diff --git a/src/nact/nact-add-capability-dialog.c b/src/nact/nact-add-capability-dialog.c
index 21381bd..e881576 100644
--- a/src/nact/nact-add-capability-dialog.c
+++ b/src/nact/nact-add-capability-dialog.c
@@ -509,16 +509,7 @@ try_for_send_ok( NactAddCapabilityDialog *dialog )
 
 	button = base_window_get_widget( BASE_WINDOW( dialog ), "OKButton" );
 
-/* gtk_widget_is_sensitive() appears with Gtk+ 2.17.5 released on 2009-07-18
- * see http://git.gnome.org/browse/gtk+/commit/?id=8f6017622937770082f7b49dfbe135fae5608704
- * GTK_WIDGET_IS_SENSITIVE macro is deprecated since 2.19.7 released on 2010-03-09
- * see http://git.gnome.org/browse/gtk+/commit/?id=a27d5a2c9eba7af5b056de32ff9b2b4dd1eb97e1
- */
-#if GTK_CHECK_VERSION( 2, 17, 5 )
 	is_sensitive = gtk_widget_is_sensitive( button );
-#else
-	is_sensitive = GTK_WIDGET_IS_SENSITIVE( button );
-#endif
 
 	if( is_sensitive ){
 		send_ok( dialog );
diff --git a/src/nact/nact-add-capability.ui b/src/nact/nact-add-capability.ui
index 226e495..7e231a5 100644
--- a/src/nact/nact-add-capability.ui
+++ b/src/nact/nact-add-capability.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <!-- interface-requires gtk+ 2.12 -->
+  <!-- interface-requires gtk+ 2.20 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkDialog" id="AddCapabilityDialog">
     <property name="border_width">5</property>
diff --git a/src/nact/nact-add-scheme-dialog.c b/src/nact/nact-add-scheme-dialog.c
index ca7439e..e2e76d0 100644
--- a/src/nact/nact-add-scheme-dialog.c
+++ b/src/nact/nact-add-scheme-dialog.c
@@ -381,16 +381,7 @@ try_for_send_ok( NactAddSchemeDialog *dialog )
 
 	button = base_window_get_widget( BASE_WINDOW( dialog ), "OKButton" );
 
-/* gtk_widget_is_sensitive() appears with Gtk+ 2.17.5 released on 2009-07-18
- * see http://git.gnome.org/browse/gtk+/commit/?id=8f6017622937770082f7b49dfbe135fae5608704
- * GTK_WIDGET_IS_SENSITIVE macro is deprecated since 2.19.7 released on 2010-03-09
- * see http://git.gnome.org/browse/gtk+/commit/?id=a27d5a2c9eba7af5b056de32ff9b2b4dd1eb97e1
- */
-#if GTK_CHECK_VERSION( 2, 17, 5 )
 	is_sensitive = gtk_widget_is_sensitive( button );
-#else
-	is_sensitive = GTK_WIDGET_IS_SENSITIVE( button );
-#endif
 
 	if( is_sensitive ){
 		send_ok( dialog );
diff --git a/src/nact/nact-add-scheme.ui b/src/nact/nact-add-scheme.ui
index a2d06a0..320d497 100644
--- a/src/nact/nact-add-scheme.ui
+++ b/src/nact/nact-add-scheme.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <!-- interface-requires gtk+ 2.12 -->
+  <!-- interface-requires gtk+ 2.20 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkDialog" id="AddSchemeDialog">
     <property name="border_width">5</property>
diff --git a/src/nact/nact-assistant-export.ui b/src/nact/nact-assistant-export.ui
index 1ef4119..3eb217f 100644
--- a/src/nact/nact-assistant-export.ui
+++ b/src/nact/nact-assistant-export.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <!-- interface-requires gtk+ 2.12 -->
+  <!-- interface-requires gtk+ 2.20 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkListStore" id="liststore1"/>
   <object class="GtkAssistant" id="ExportAssistant">
diff --git a/src/nact/nact-clipboard.c b/src/nact/nact-clipboard.c
index 264beac..68ef98d 100644
--- a/src/nact/nact-clipboard.c
+++ b/src/nact/nact-clipboard.c
@@ -347,17 +347,9 @@ nact_clipboard_dnd_get_data( NactClipboard *clipboard, gboolean *copy_data )
 
 		selection = gtk_clipboard_wait_for_contents( clipboard->private->dnd, NACT_CLIPBOARD_NACT_ATOM );
 		if( selection ){
-
-/* gtk_selection_data_get_data() appears with Gtk+ 2.14.0 release on 2008-09-04
- * see http://git.gnome.org/browse/gtk+/commit/?id=9eae7a1d2e7457d67ba00bb8c35775c1523fa186
- */
-#if GTK_CHECK_VERSION( 2, 14, 0 )
 			data = ( NactClipboardDndData * ) gtk_selection_data_get_data( selection );
-#else
-			data = ( NactClipboardDndData * ) selection->data;
-#endif
-			if( data->target == NACT_XCHANGE_FORMAT_NACT ){
 
+			if( data->target == NACT_XCHANGE_FORMAT_NACT ){
 				for( it = data->rows ; it ; it = it->next ){
 					rows = g_list_append( rows,
 							gtk_tree_row_reference_copy(( GtkTreeRowReference * ) it->data ));
@@ -430,11 +422,7 @@ nact_clipboard_dnd_drag_end( NactClipboard *clipboard )
 		g_debug( "%s: selection=%p", thisfn, ( void * ) selection );
 
 		if( selection ){
-#if GTK_CHECK_VERSION( 2, 14, 0 )
 			data = ( NactClipboardDndData * ) gtk_selection_data_get_data( selection );
-#else
-			data = ( NactClipboardDndData * ) selection->data;
-#endif
 			g_debug( "%s: data=%p (NactClipboardDndData)", thisfn, ( void * ) data );
 
 			if( data->target == NACT_XCHANGE_FORMAT_XDS ){
@@ -469,11 +457,7 @@ get_from_dnd_clipboard_callback( GtkClipboard *clipboard, GtkSelectionData *sele
 	static const gchar *thisfn = "nact_clipboard_get_from_dnd_clipboard_callback";
 	GdkAtom selection_data_target;
 
-#if GTK_CHECK_VERSION( 2, 14, 0 )
 	selection_data_target = gtk_selection_data_get_target( selection_data );
-#else
-	selection_data_target = selection_data->target;
-#endif
 
 	g_debug( "%s: clipboard=%p, selection_data=%p, target=%s, info=%d, data=%p",
 			thisfn, ( void * ) clipboard,
@@ -732,11 +716,7 @@ nact_clipboard_primary_get( NactClipboard *clipboard, gboolean *relabel )
 		selection = gtk_clipboard_wait_for_contents( clipboard->private->primary, NACT_CLIPBOARD_NACT_ATOM );
 
 		if( selection ){
-#if GTK_CHECK_VERSION( 2, 14, 0 )
 			user_data = ( PrimaryData * ) gtk_selection_data_get_data( selection );
-#else
-			user_data = ( PrimaryData * ) selection->data;
-#endif
 			g_debug( "%s: retrieving PrimaryData=%p", thisfn, ( void * ) user_data );
 
 			if( user_data ){
@@ -798,11 +778,7 @@ get_from_primary_clipboard_callback( GtkClipboard *gtk_clipboard, GtkSelectionDa
 	gchar *buffer;
 	GdkAtom selection_data_target;
 
-#if GTK_CHECK_VERSION( 2, 14, 0 )
 	selection_data_target = gtk_selection_data_get_target( selection_data );
-#else
-	selection_data_target = selection_data->target;
-#endif
 
 	g_debug( "%s: gtk_clipboard=%p, selection_data=%p, target=%s, info=%d, clipboard=%p",
 			thisfn, ( void * ) gtk_clipboard,
diff --git a/src/nact/nact-icon-chooser.ui b/src/nact/nact-icon-chooser.ui
index e4f075b..430ce8e 100644
--- a/src/nact/nact-icon-chooser.ui
+++ b/src/nact/nact-icon-chooser.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <!-- interface-requires gtk+ 2.12 -->
+  <!-- interface-requires gtk+ 2.20 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkDialog" id="IconChooserDialog">
     <property name="border_width">6</property>
diff --git a/src/nact/nact-main-tab.c b/src/nact/nact-main-tab.c
index 3933bcd..99e5a25 100644
--- a/src/nact/nact-main-tab.c
+++ b/src/nact/nact-main-tab.c
@@ -75,16 +75,7 @@ nact_main_tab_is_page_enabled( NactMainWindow *window, gint num_page )
 	notebook = GTK_NOTEBOOK( base_window_get_widget( BASE_WINDOW( window ), "MainNotebook" ));
 	page = gtk_notebook_get_nth_page( notebook, num_page );
 
-/* gtk_widget_is_sensitive() appears with Gtk+ 2.17.5 released on 2009-07-18
- * see http://git.gnome.org/browse/gtk+/commit/?id=8f6017622937770082f7b49dfbe135fae5608704
- * GTK_WIDGET_IS_SENSITIVE macro is deprecated since 2.19.7 released on 2010-03-09
- * see http://git.gnome.org/browse/gtk+/commit/?id=a27d5a2c9eba7af5b056de32ff9b2b4dd1eb97e1
- */
-#if GTK_CHECK_VERSION( 2, 17, 5 )
 	is_sensitive = gtk_widget_is_sensitive( page );
-#else
-	is_sensitive = GTK_WIDGET_IS_SENSITIVE( page );
-#endif
 
 	g_debug( "nact_main_tab_is_page_enabled: num_page=%d, is_sensitive=%s", num_page, is_sensitive ? "True":"False" );
 
diff --git a/src/nact/nact-menubar.c b/src/nact/nact-menubar.c
index 7240f3c..6f58410 100644
--- a/src/nact/nact-menubar.c
+++ b/src/nact/nact-menubar.c
@@ -184,20 +184,6 @@ static const GtkToggleActionEntry toolbar_entries[] = {
 				G_CALLBACK( nact_menubar_view_on_toolbar_help ), FALSE },
 };
 
-/* GtkActivatable
- * gtk_action_get_tooltip() is only available starting with Gtk 2.16
- * until this is a required level, we must have some code to do the
- * same thing
- */
-#undef NA_HAS_GTK_ACTIVATABLE
-#if GTK_CHECK_VERSION( 2,16,0 )
-	#define NA_HAS_GTK_ACTIVATABLE
-#endif
-
-#ifndef NA_HAS_GTK_ACTIVATABLE
-#define MENUBAR_PROP_ITEM_ACTION			"menubar-item-action"
-#endif
-
 #define MENUBAR_PROP_STATUS_CONTEXT			"menubar-status-context"
 #define MENUBAR_PROP_MAIN_STATUS_CONTEXT	"menubar-main-status-context"
 
@@ -539,16 +525,11 @@ on_ui_manager_proxy_connect( GtkUIManager *ui_manager, GtkAction *action, GtkWid
 			( void * ) window, G_OBJECT_TYPE_NAME( window ));
 
 	if( GTK_IS_MENU_ITEM( proxy )){
-
 		base_window_signal_connect( window,
 				G_OBJECT( proxy ), "select", G_CALLBACK( on_menu_item_selected ));
 
 		base_window_signal_connect( window,
 				G_OBJECT( proxy ), "deselect", G_CALLBACK( on_menu_item_deselected ));
-
-#ifndef NA_HAS_GTK_ACTIVATABLE
-		g_object_set_data( G_OBJECT( proxy ), MENUBAR_PROP_ITEM_ACTION, action );
-#endif
 	}
 }
 
@@ -560,33 +541,22 @@ static void
 on_menu_item_selected( GtkMenuItem *proxy, BaseWindow *window )
 {
 	GtkAction *action;
-	gchar *tooltip;
+	const gchar *tooltip;
 
 	/*g_debug( "nact_menubar_on_menu_item_selected: proxy=%p (%s), window=%p (%s)",
 			( void * ) proxy, G_OBJECT_TYPE_NAME( proxy ),
 			( void * ) window, G_OBJECT_TYPE_NAME( window ));*/
 
 	tooltip = NULL;
-
-#ifdef NA_HAS_GTK_ACTIVATABLE
 	action = gtk_activatable_get_related_action( GTK_ACTIVATABLE( proxy ));
+
 	if( action ){
-		tooltip = ( gchar * ) gtk_action_get_tooltip( action );
-	}
-#else
-	action = GTK_ACTION( g_object_get_data( G_OBJECT( proxy ), MENUBAR_PROP_ITEM_ACTION ));
-	if( action ){
-		g_object_get( G_OBJECT( action ), "tooltip", &tooltip, NULL );
-	}
-#endif
+		tooltip = gtk_action_get_tooltip( action );
 
-	if( tooltip ){
-		nact_main_statusbar_display_status( NACT_MAIN_WINDOW( window ), MENUBAR_PROP_STATUS_CONTEXT, tooltip );
+		if( tooltip ){
+			nact_main_statusbar_display_status( NACT_MAIN_WINDOW( window ), MENUBAR_PROP_STATUS_CONTEXT, tooltip );
+		}
 	}
-
-#ifndef NA_HAS_GTK_ACTIVATABLE
-	g_free( tooltip );
-#endif
 }
 
 static void
diff --git a/src/nact/nact-preferences.ui b/src/nact/nact-preferences.ui
index b059d07..79514a3 100644
--- a/src/nact/nact-preferences.ui
+++ b/src/nact/nact-preferences.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <!-- interface-requires gtk+ 2.12 -->
+  <!-- interface-requires gtk+ 2.20 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkImage" id="image3">
     <property name="visible">True</property>
diff --git a/src/nact/nact-schemes-list.c b/src/nact/nact-schemes-list.c
index 46c45a3..d31a029 100644
--- a/src/nact/nact-schemes-list.c
+++ b/src/nact/nact-schemes-list.c
@@ -430,26 +430,10 @@ nact_schemes_list_show_all( BaseWindow *window )
 	data = get_schemes_list_data( listview );
 
 	button = get_add_button( window );
-#if GTK_CHECK_VERSION( 2, 18, 0 )
 	gtk_widget_set_visible( GTK_WIDGET( button ), data->mode == SCHEMES_LIST_FOR_PREFERENCES );
-#else
-	if( data->mode == SCHEMES_LIST_FOR_PREFERENCES ){
-		gtk_widget_show( GTK_WIDGET( button ));
-	} else {
-		gtk_widget_hide( GTK_WIDGET( button ));
-	}
-#endif
 
 	button = get_remove_button( window );
-#if GTK_CHECK_VERSION( 2, 18, 0 )
 	gtk_widget_set_visible( GTK_WIDGET( button ), data->mode == SCHEMES_LIST_FOR_PREFERENCES );
-#else
-	if( data->mode == SCHEMES_LIST_FOR_PREFERENCES ){
-		gtk_widget_show( GTK_WIDGET( button ));
-	} else {
-		gtk_widget_hide( GTK_WIDGET( button ));
-	}
-#endif
 
 	init_view_select_first_row( data );
 }
diff --git a/src/nact/nact-tree-model-dnd.c b/src/nact/nact-tree-model-dnd.c
index 6d517df..60f4260 100644
--- a/src/nact/nact-tree-model-dnd.c
+++ b/src/nact/nact-tree-model-dnd.c
@@ -169,43 +169,23 @@ nact_tree_model_dnd_idrag_dest_drag_data_received( GtkTreeDragDest *drag_dest, G
 	g_debug( "%s: drag_dest=%p, dest=%p, selection_data=%p", thisfn, ( void * ) drag_dest, ( void * ) dest, ( void * ) selection_data );
 	g_return_val_if_fail( NACT_IS_TREE_MODEL( drag_dest ), FALSE );
 
-/* gtk_selection_data_get_data() appears with Gtk+ 2.14.0 release on 2008-09-04
- * see http://git.gnome.org/browse/gtk+/commit/?id=9eae7a1d2e7457d67ba00bb8c35775c1523fa186
- */
-#if GTK_CHECK_VERSION( 2, 14, 0 )
 	selection_data_selection = gtk_selection_data_get_selection( selection_data );
-#else
-	selection_data_selection = selection_data->selection;
-#endif
 	atom_name = gdk_atom_name( selection_data_selection );
 	g_debug( "%s: selection=%s", thisfn, atom_name );
 	g_free( atom_name );
 
-#if GTK_CHECK_VERSION( 2, 14, 0 )
 	selection_data_target = gtk_selection_data_get_target( selection_data );
-#else
-	selection_data_target = selection_data->target;
-#endif
 	atom_name = gdk_atom_name( selection_data_target );
 	g_debug( "%s: target=%s", thisfn, atom_name );
 	g_free( atom_name );
 
-#if GTK_CHECK_VERSION( 2, 14, 0 )
 	selection_data_type = gtk_selection_data_get_data_type( selection_data );
-#else
-	selection_data_type = selection_data->type;
-#endif
 	atom_name = gdk_atom_name( selection_data_type );
 	g_debug( "%s: type=%s", thisfn, atom_name );
 	g_free( atom_name );
 
-#if GTK_CHECK_VERSION( 2, 14, 0 )
 	selection_data_format = gtk_selection_data_get_format( selection_data );
 	selection_data_length = gtk_selection_data_get_length( selection_data );
-#else
-	selection_data_format = selection_data->format;
-	selection_data_length = selection_data->length;
-#endif
 	g_debug( "%s: format=%d, length=%d", thisfn, selection_data_format, selection_data_length );
 
 	info = target_atom_to_id( selection_data_type );
@@ -307,11 +287,7 @@ nact_tree_model_dnd_imulti_drag_source_drag_data_get( EggTreeMultiDragSource *dr
 	GdkDragAction context_suggested_action;
 	GdkDragAction context_selected_action;
 
-#if GTK_CHECK_VERSION( 2, 14, 0 )
 	selection_data_target = gtk_selection_data_get_target( selection_data );
-#else
-	selection_data_target = selection_data->target;
-#endif
 
 #if GTK_CHECK_VERSION( 2, 22, 0 )
 	context_suggested_action = gdk_drag_context_get_suggested_action( context );
@@ -878,11 +854,7 @@ drop_uri_list( NactTreeModel *model, GtkTreePath *dest, GtkSelectionData  *selec
 	g_return_val_if_fail( NACT_IS_MAIN_WINDOW( model->private->window ), FALSE );
 	main_window = NACT_MAIN_WINDOW( model->private->window );
 
-#if GTK_CHECK_VERSION( 2, 14, 0 )
 	selection_data_data = ( const gchar * ) gtk_selection_data_get_data( selection_data );
-#else
-	selection_data_data = ( const gchar * ) selection_data->data;
-#endif
 	g_debug( "%s", selection_data_data );
 
 	parms.parent = base_window_get_gtk_toplevel( BASE_WINDOW( main_window ));
diff --git a/src/nact/nautilus-actions-config-tool.ui b/src/nact/nautilus-actions-config-tool.ui
index 036c3db..67df782 100644
--- a/src/nact/nautilus-actions-config-tool.ui
+++ b/src/nact/nautilus-actions-config-tool.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <interface>
-  <!-- interface-requires gtk+ 2.12 -->
+  <!-- interface-requires gtk+ 2.20 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkWindow" id="MainWindow">
     <child>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]