[genius] Tue Jun 28 14:09:30 2011 Jiri (George) Lebl <jirka 5z com>

[George Lebl <jirka src gnome org>]

commit 77c3b9ac4f9696f2b3cd7b89e9107f78136bcec1
Author: Jiri (George) Lebl <jirka 5z com>
Date:   Tue Jun 28 14:09:33 2011 -0700

    Tue Jun 28 14:09:30 2011  Jiri (George) Lebl <jirka 5z com>
    
    	* src/gnome-genius.c, ve/ve-miscui.c: update some deprecated things
    
    	* configure.in: require gtk 2.18 (my current benchmark for
    	  gtk version allowed: it appears in current Scientific Linux)

 ChangeLog          |    7 +++++++
 configure.in       |    2 +-
 src/gnome-genius.c |    8 +++++---
 ve/ve-miscui.c     |   16 ++++++++--------
 4 files changed, 21 insertions(+), 12 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6c106d0..abbe6f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Jun 28 14:09:30 2011  Jiri (George) Lebl <jirka 5z com>
+
+	* src/gnome-genius.c, ve/ve-miscui.c: update some deprecated things
+
+	* configure.in: require gtk 2.18 (my current benchmark for
+	  gtk version allowed: it appears in current Scientific Linux)
+
 Tue Jun 28 13:08:19 2011  Jiri (George) Lebl <jirka 5z com>
 
 	* src/gnome-genius.c: use pid_t properly
diff --git a/configure.in b/configure.in
index 7720168..7d5a0dc 100644
--- a/configure.in
+++ b/configure.in
@@ -13,7 +13,7 @@ AC_PROG_INTLTOOL([0.21])
 dnl ================= Requirements ================================================
 
 VTE_REQUIRED=0.17.1
-GTK_REQUIRED=2.14.0
+GTK_REQUIRED=2.18.0
 GLIB_REQUIRED=2.12.0
 GTKSOURCEVIEW_REQUIRED=0.3.0
 GTKSOURCEVIEW2_REQUIRED=2.0.2
diff --git a/src/gnome-genius.c b/src/gnome-genius.c
index 5d74c1b..7778123 100644
--- a/src/gnome-genius.c
+++ b/src/gnome-genius.c
@@ -494,7 +494,7 @@ menu_item_select_cb (GtkMenuItem *proxy, gpointer data)
 	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);
 
 	g_object_get (G_OBJECT (action), "tooltip", &message, NULL);
@@ -4419,7 +4419,7 @@ static int
 catch_interrupts (GtkWidget *w, GdkEvent *e)
 {
 	if (e->type == GDK_KEY_PRESS &&
-	    e->key.keyval == GDK_c &&
+	    e->key.keyval == GDK_KEY_c &&
 	    e->key.state & GDK_CONTROL_MASK) {
 		genius_interrupt_calc ();
 		return TRUE;
@@ -4671,7 +4671,9 @@ selection_changed (void)
 }
 
 static void
-switch_page (GtkNotebook *notebook, GtkNotebookPage *page, guint page_num)
+/* switch_page (GtkNotebook *notebook, GtkNotebookPage *page, guint page_num) */
+/* GTK3: switch_page (GtkNotebook *notebook, GtkWidget *page, guint page_num) */
+switch_page (GtkNotebook *notebook, gpointer page, guint page_num)
 {
 	if (page_num == 0) {
 		/* console */
diff --git a/ve/ve-miscui.c b/ve/ve-miscui.c
index b80b05a..6559758 100644
--- a/ve/ve-miscui.c
+++ b/ve/ve-miscui.c
@@ -153,7 +153,7 @@ ve_hig_dialog_new (GtkWindow      *parent,
 		
 			button = gtk_button_new_from_stock (GTK_STOCK_OK);
 			gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, GTK_RESPONSE_OK);
-			GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+			gtk_widget_set_can_default (button, TRUE);
 			gtk_widget_show (button);
 
 			gtk_dialog_set_default_response (GTK_DIALOG (dialog),
@@ -164,7 +164,7 @@ ve_hig_dialog_new (GtkWindow      *parent,
 		
 			button = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
 			gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, GTK_RESPONSE_CLOSE);
-			GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+			gtk_widget_set_can_default (button, TRUE);
 			gtk_widget_show (button);
 
 			gtk_dialog_set_default_response (GTK_DIALOG (dialog),
@@ -175,7 +175,7 @@ ve_hig_dialog_new (GtkWindow      *parent,
 		
 			button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
 			gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, GTK_RESPONSE_CANCEL);
-			GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+			gtk_widget_set_can_default (button, TRUE);
 			gtk_widget_show (button);
 
 			gtk_dialog_set_default_response (GTK_DIALOG (dialog),
@@ -186,12 +186,12 @@ ve_hig_dialog_new (GtkWindow      *parent,
 		
 			button = gtk_button_new_from_stock (GTK_STOCK_NO);
 			gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, GTK_RESPONSE_NO);
-			GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+			gtk_widget_set_can_default (button, TRUE);
 			gtk_widget_show (button);
 
 			button = gtk_button_new_from_stock (GTK_STOCK_YES);
 			gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, GTK_RESPONSE_YES);
-			GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+			gtk_widget_set_can_default (button, TRUE);
 			gtk_widget_show (button);
 
 			gtk_dialog_set_default_response (GTK_DIALOG (dialog),
@@ -204,12 +204,12 @@ ve_hig_dialog_new (GtkWindow      *parent,
 			button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
   			gtk_widget_show (button);
   			gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, GTK_RESPONSE_CANCEL);
-  			GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+			gtk_widget_set_can_default (button, TRUE);
 
 		  	button = gtk_button_new_from_stock (GTK_STOCK_OK);
   			gtk_widget_show (button);
   			gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, GTK_RESPONSE_OK);
-  			GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+			gtk_widget_set_can_default (button, TRUE);
 
 			gtk_dialog_set_default_response (GTK_DIALOG (dialog),
 							 GTK_RESPONSE_OK);
@@ -309,7 +309,7 @@ ve_dialog_run_nonmodal (GtkDialog *dialog)
 
   g_object_ref (dialog);
 
-  if (!GTK_WIDGET_VISIBLE (dialog))
+  if ( ! gtk_widget_get_visible (GTK_WIDGET (dialog)))
     gtk_widget_show (GTK_WIDGET (dialog));
   
   response_handler =