eog r5092 - in trunk: . cut-n-paste/toolbar-editor src

[friemann svn gnome org]

Author: friemann
Date: Tue Apr  7 18:48:04 2009
New Revision: 5092
URL: http://svn.gnome.org/viewvc/eog?rev=5092&view=rev

Log:
2009-04-07  Felix Riemann  <friemann svn gnome org>

	* configure.ac: Raise gtk+ dependency.
	* cut-n-paste/toolbar-editor/egg-editable-toolbar.c:
	(drag_begin_cb), (drag_end_cb), (configure_item_tooltip):
	* src/eog-properties-dialog.c: (eog_properties_dialog_new):
	* src/eog-window.c: (menu_item_select_cb):
	Fix symbols deprecated as of gtk+-2.16.


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
   trunk/src/eog-properties-dialog.c
   trunk/src/eog-window.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Apr  7 18:48:04 2009
@@ -81,7 +81,7 @@
 # GNOME Libs
 # **********
 
-GTK_REQUIRED=2.13.1
+GTK_REQUIRED=2.15.1
 GLIB_REQUIRED=2.15.3
 GNOME_DESKTOP_REQUIRED=2.25.1
 GDKPIXBUF_REQUIRED=2.4.0

Modified: trunk/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
==============================================================================
--- trunk/cut-n-paste/toolbar-editor/egg-editable-toolbar.c	(original)
+++ trunk/cut-n-paste/toolbar-editor/egg-editable-toolbar.c	Tue Apr  7 18:48:04 2009
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- *  $Id: egg-editable-toolbar.c 929 2009-02-19 14:49:56Z friemann $
+ *  $Id: egg-editable-toolbar.c 937 2009-04-07 11:16:53Z friemann $
  */
 
 #include "config.h"
@@ -200,7 +200,12 @@
 
   gtk_widget_hide (widget);
 
+#if GTK_CHECK_VERSION (2, 16, 0)
+  action = gtk_activatable_get_related_action (GTK_ACTIVATABLE (widget));
+#else
   action = gtk_widget_get_action (widget);
+#endif
+
   if (action == NULL) return;
 
   flags = egg_toolbars_model_get_name_flags (etoolbar->priv->model,
@@ -226,7 +231,12 @@
     {
       gtk_widget_show (widget);
 
+#if GTK_CHECK_VERSION (2, 16, 0)
+      action = gtk_activatable_get_related_action (GTK_ACTIVATABLE (widget));
+#else
       action = gtk_widget_get_action (widget);
+#endif
+
       if (action == NULL) return;
 
       flags = egg_toolbars_model_get_name_flags (etoolbar->priv->model,
@@ -497,7 +507,13 @@
 static void
 configure_item_tooltip (GtkToolItem *item)
 {
-  GtkAction *action = gtk_widget_get_action (GTK_WIDGET (item));
+  GtkAction *action;
+
+#if GTK_CHECK_VERSION (2, 16, 0)
+  action = gtk_activatable_get_related_action (GTK_ACTIVATABLE (item));
+#else
+  action = gtk_widget_get_action (GTK_WIDGET (item));
+#endif
 
   if (action != NULL)
     {

Modified: trunk/src/eog-properties-dialog.c
==============================================================================
--- trunk/src/eog-properties-dialog.c	(original)
+++ trunk/src/eog-properties-dialog.c	Tue Apr  7 18:48:04 2009
@@ -706,11 +706,9 @@
 			     	 "thumbview", thumbview,
 			     	 NULL);
 
-	gtk_action_connect_proxy (next_image_action,
-				  EOG_PROPERTIES_DIALOG (prop_dlg)->priv->next_button);
+	gtk_activatable_set_related_action (GTK_ACTIVATABLE (EOG_PROPERTIES_DIALOG (prop_dlg)->priv->next_button), next_image_action);
 
-	gtk_action_connect_proxy (previous_image_action,
-				  EOG_PROPERTIES_DIALOG (prop_dlg)->priv->previous_button);
+	gtk_activatable_set_related_action (GTK_ACTIVATABLE (EOG_PROPERTIES_DIALOG (prop_dlg)->priv->previous_button), previous_image_action);
 
 	return prop_dlg;
 }

Modified: trunk/src/eog-window.c
==============================================================================
--- trunk/src/eog-window.c	(original)
+++ trunk/src/eog-window.c	Tue Apr  7 18:48:04 2009
@@ -3547,7 +3547,7 @@
 	GtkAction *action;
 	char *message;
 
-	action = gtk_widget_get_action (GTK_WIDGET (proxy));
+	action = gtk_activatable_get_related_action (GTK_ACTIVATABLE (proxy));
 
 	g_return_if_fail (action != NULL);