GNOME.org
 

[gtkhtml] Remove usage of deprecated gtk api

commit c77b34e4904dc729a0cf2267dcd0a00c93c1acd5
Author: Thomas Hindoe Paaboel Andersen <phomes gmail com>
Date:   Sun May 3 21:04:39 2009 +0200

    Remove usage of deprecated gtk api
    
    Replaces:
    gtk_signal_connect with g_signal_connect
    gtk_action_connect_proxy with gtk_activatable_set_related_action
    gtk_box_pack_start_defaults with gtk_box_pack_start
    
    Gtk 2.16 is needed for gtk_activatable_set_related_action so bumping the required version in configure.in too
    
    GNOME Bug #580946
---
 ChangeLog                          |   18 ++++++++
 components/editor/gtkhtml-editor.c |   84 ++++++++++++++++++------------------
 configure.in                       |    2 +-
 gtkhtml/htmlframe.c                |   11 +---
 gtkhtml/htmliframe.c               |   23 +++-------
 gtkhtml/testgtkhtml.c              |    2 +-
 6 files changed, 72 insertions(+), 68 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f877eba..595ae27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2009-05-03  Thomas H.P. Andersen  <phomes gmail com>
+
+	* components/editor/gtkhtml-editor.c:
+	* gtkhtml/htmlframe.c:
+	* gtkhtml/htmliframe.c:
+	* gtkhtml/testgtkhtml.c:
+	* configure.in:
+	Remove usage of deprecated gtk api
+	
+	Replaces:
+	gtk_signal_connect with g_signal_connect
+	gtk_action_connect_proxy with gtk_activatable_set_related_action
+	gtk_box_pack_start_defaults with gtk_box_pack_start
+	
+	Gtk 2.16 is needed for gtk_activatable_set_related_action so bumping the
+	required version in configure.in too.
+	GNOME Bug #580946
+
 2009-04-08  Matthew Barnes  <mbarnes redhat com>
 
 	** Fixes bug #571743
diff --git a/components/editor/gtkhtml-editor.c b/components/editor/gtkhtml-editor.c
index 765ad7e..e672367 100644
--- a/components/editor/gtkhtml-editor.c
+++ b/components/editor/gtkhtml-editor.c
@@ -510,48 +510,48 @@ editor_constructor (GType type,
 	gtk_container_add (GTK_CONTAINER (object), editor->vbox);
 	gtk_window_set_default_size (GTK_WINDOW (object), 600, 440);
 
-	gtk_action_connect_proxy (
-		ACTION (BOLD),
-		WIDGET (TEXT_PROPERTIES_BOLD_BUTTON));
-	gtk_action_connect_proxy (
-		ACTION (CONFIRM_REPLACE),
-		WIDGET (REPLACE_CONFIRMATION_REPLACE_BUTTON));
-	gtk_action_connect_proxy (
-		ACTION (CONFIRM_REPLACE_ALL),
-		WIDGET (REPLACE_CONFIRMATION_REPLACE_ALL_BUTTON));
-	gtk_action_connect_proxy (
-		ACTION (CONFIRM_REPLACE_CANCEL),
-		WIDGET (REPLACE_CONFIRMATION_CLOSE_BUTTON));
-	gtk_action_connect_proxy (
-		ACTION (CONFIRM_REPLACE_NEXT),
-		WIDGET (REPLACE_CONFIRMATION_NEXT_BUTTON));
-	gtk_action_connect_proxy (
-		ACTION (FIND),
-		WIDGET (FIND_BUTTON));
-	gtk_action_connect_proxy (
-		ACTION (FIND_AND_REPLACE),
-		WIDGET (REPLACE_BUTTON));
-	gtk_action_connect_proxy (
-		ACTION (ITALIC),
-		WIDGET (TEXT_PROPERTIES_ITALIC_BUTTON));
-	gtk_action_connect_proxy (
-		ACTION (JUSTIFY_CENTER),
-		WIDGET (PARAGRAPH_PROPERTIES_CENTER_BUTTON));
-	gtk_action_connect_proxy (
-		ACTION (JUSTIFY_LEFT),
-		WIDGET (PARAGRAPH_PROPERTIES_LEFT_BUTTON));
-	gtk_action_connect_proxy (
-		ACTION (JUSTIFY_RIGHT),
-		WIDGET (PARAGRAPH_PROPERTIES_RIGHT_BUTTON));
-	gtk_action_connect_proxy (
-		ACTION (STRIKETHROUGH),
-		WIDGET (TEXT_PROPERTIES_STRIKETHROUGH_BUTTON));
-	gtk_action_connect_proxy (
-		ACTION (TEST_URL),
-		WIDGET (LINK_PROPERTIES_TEST_BUTTON));
-	gtk_action_connect_proxy (
-		ACTION (UNDERLINE),
-		WIDGET (TEXT_PROPERTIES_UNDERLINE_BUTTON));
+	gtk_activatable_set_related_action (
+		GTK_ACTIVATABLE (WIDGET (TEXT_PROPERTIES_BOLD_BUTTON)),
+		ACTION (BOLD));
+	gtk_activatable_set_related_action (
+		GTK_ACTIVATABLE (WIDGET (REPLACE_CONFIRMATION_REPLACE_BUTTON)),
+		ACTION (CONFIRM_REPLACE));
+	gtk_activatable_set_related_action (
+		GTK_ACTIVATABLE (WIDGET (REPLACE_CONFIRMATION_REPLACE_ALL_BUTTON)),
+		ACTION (CONFIRM_REPLACE_ALL));
+	gtk_activatable_set_related_action (
+		GTK_ACTIVATABLE (WIDGET (REPLACE_CONFIRMATION_CLOSE_BUTTON)),
+		ACTION (CONFIRM_REPLACE_CANCEL));
+	gtk_activatable_set_related_action (
+		GTK_ACTIVATABLE (WIDGET (REPLACE_CONFIRMATION_NEXT_BUTTON)),
+		ACTION (CONFIRM_REPLACE_NEXT));
+	gtk_activatable_set_related_action (
+		GTK_ACTIVATABLE (WIDGET (FIND_BUTTON)),
+		ACTION (FIND));
+	gtk_activatable_set_related_action (
+		GTK_ACTIVATABLE (WIDGET (REPLACE_BUTTON)),
+		ACTION (FIND_AND_REPLACE));
+	gtk_activatable_set_related_action (
+		GTK_ACTIVATABLE (WIDGET (TEXT_PROPERTIES_ITALIC_BUTTON)),
+		ACTION (ITALIC));
+	gtk_activatable_set_related_action (
+		GTK_ACTIVATABLE (WIDGET (PARAGRAPH_PROPERTIES_CENTER_BUTTON)),
+		ACTION (JUSTIFY_CENTER));
+	gtk_activatable_set_related_action (
+		GTK_ACTIVATABLE (WIDGET (PARAGRAPH_PROPERTIES_LEFT_BUTTON)),
+		ACTION (JUSTIFY_LEFT));
+	gtk_activatable_set_related_action (
+		GTK_ACTIVATABLE (WIDGET (PARAGRAPH_PROPERTIES_RIGHT_BUTTON)),
+		ACTION (JUSTIFY_RIGHT));
+	gtk_activatable_set_related_action (
+		GTK_ACTIVATABLE (WIDGET (TEXT_PROPERTIES_STRIKETHROUGH_BUTTON)),
+		ACTION (STRIKETHROUGH));
+	gtk_activatable_set_related_action (
+		GTK_ACTIVATABLE (WIDGET (LINK_PROPERTIES_TEST_BUTTON)),
+		ACTION (TEST_URL));
+	gtk_activatable_set_related_action (
+		GTK_ACTIVATABLE (WIDGET (TEXT_PROPERTIES_UNDERLINE_BUTTON)),
+		ACTION (UNDERLINE));
 
 	gtk_window_set_transient_for (
 		GTK_WINDOW (WIDGET (CELL_PROPERTIES_WINDOW)),
diff --git a/configure.in b/configure.in
index 6b2361c..f2015ee 100644
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@ AM_CONFIG_HEADER(config.h)
 PACKAGE=gtkhtml
 
 # Required Package Versions
-m4_define([gtk_minimum_version], [2.14.0])
+m4_define([gtk_minimum_version], [2.16.0])
 m4_define([gail_minimum_version], [1.1.0])
 m4_define([gnome_icon_theme_minimum_version], [2.22.0])
 m4_define([libglade_minimum_version], [2.0.0])
diff --git a/gtkhtml/htmlframe.c b/gtkhtml/htmlframe.c
index 8173512..461835e 100644
--- a/gtkhtml/htmlframe.c
+++ b/gtkhtml/htmlframe.c
@@ -514,12 +514,8 @@ html_frame_init (HTMLFrame *frame,
 	 * on_url and link_clicked are emitted from the toplevel widget not
 	 * proxied like url_requested is.
 	 */
-	gtk_signal_connect (GTK_OBJECT (new_html), "on_url",
-			    G_CALLBACK (frame_on_url),
-			    (gpointer)frame);
-	gtk_signal_connect (GTK_OBJECT (new_html), "link_clicked",
-			    G_CALLBACK (frame_link_clicked),
-			    (gpointer)frame);
+	g_signal_connect (new_html, "on_url", G_CALLBACK (frame_on_url), frame);
+	g_signal_connect (new_html, "link_clicked", G_CALLBACK (frame_link_clicked), frame);
 #endif
 	g_signal_connect (new_html, "size_changed", G_CALLBACK (frame_size_changed), frame);
 	g_signal_connect (new_html, "object_requested", G_CALLBACK (frame_object_requested), frame);
@@ -530,8 +526,7 @@ html_frame_init (HTMLFrame *frame,
 	html_frame_set_margin_width (frame, 0);
 
 	/*
-	  gtk_signal_connect (GTK_OBJECT (html), "button_press_event",
-	  G_CALLBACK (frame_button_press_event), frame);
+	  g_signal_connect (html, "button_press_event", G_CALLBACK (frame_button_press_event), frame);
 	*/
 
 	gtk_widget_set_size_request (scrolled_window, width, height);
diff --git a/gtkhtml/htmliframe.c b/gtkhtml/htmliframe.c
index 2b3ad1f..494ff12 100644
--- a/gtkhtml/htmliframe.c
+++ b/gtkhtml/htmliframe.c
@@ -649,20 +649,15 @@ html_iframe_init (HTMLIFrame *iframe,
 	 * on_url and link_clicked are emitted from the toplevel widget not
 	 * proxied like url_requested is.
 	 */
-	gtk_signal_connect (GTK_OBJECT (new_html), "on_url",
-			    G_CALLBACK (iframe_on_url),
-			    (gpointer)iframe);
-	gtk_signal_connect (GTK_OBJECT (new_html), "link_clicked",
-			    G_CALLBACK (iframe_link_clicked),
-			    (gpointer)iframe);
+	g_signal_connect (new_html, "on_url", G_CALLBACK (iframe_on_url), iframe);
+	g_signal_connect (new_html, "link_clicked", G_CALLBACK (iframe_link_clicked), iframe);
 #endif
 	g_signal_connect (new_html, "size_changed", G_CALLBACK (iframe_size_changed), iframe);
 	g_signal_connect (new_html, "set_base", G_CALLBACK (iframe_set_base), iframe);
 	g_signal_connect (new_html, "object_requested", G_CALLBACK (iframe_object_requested), iframe);
 
 	/*
-	  gtk_signal_connect (GTK_OBJECT (html), "button_press_event",
-	  G_CALLBACK (iframe_button_press_event), iframe);
+	  g_signal_connect (html, "button_press_event", G_CALLBACK (iframe_button_press_event), iframe);
 	*/
 
 	gtk_widget_set_size_request (scrolled_window, width, height);
@@ -680,14 +675,10 @@ html_iframe_init (HTMLIFrame *iframe,
 				     parent_html->engine->settings->color_set);
 	html_painter_set_focus (new_html->engine->painter, parent_html->engine->have_focus);
 	/*
-	gtk_signal_connect (GTK_OBJECT (html), "title_changed",
-			    G_CALLBACK (title_changed_cb), (gpointer)app);
-	gtk_signal_connect (GTK_OBJECT (html), "button_press_event",
-			    G_CALLBACK (on_button_press_event), popup_menu);
-	gtk_signal_connect (GTK_OBJECT (html), "redirect",
-			    G_CALLBACK (on_redirect), NULL);
-	gtk_signal_connect (GTK_OBJECT (html), "object_requested",
-			    G_CALLBACK (object_requested_cmd), NULL);
+	g_signal_connect (html, "title_changed", G_CALLBACK (title_changed_cb), (gpointer)app);
+	g_signal_connect (html, "button_press_event", G_CALLBACK (on_button_press_event), popup_menu);
+	g_signal_connect (html, "redirect", G_CALLBACK (on_redirect), NULL);
+	g_signal_connect (html, "object_requested", G_CALLBACK (object_requested_cmd), NULL);
 	*/
 }
 
diff --git a/gtkhtml/testgtkhtml.c b/gtkhtml/testgtkhtml.c
index ea7e9b1..c0de89b 100644
--- a/gtkhtml/testgtkhtml.c
+++ b/gtkhtml/testgtkhtml.c
@@ -1101,7 +1101,7 @@ main (gint argc, gchar *argv[])
 	g_signal_connect (html, "motion_notify_event", G_CALLBACK (motion_notify_event), app);
 
 #if 0
-	gtk_box_pack_start_defaults (GTK_BOX (hbox), GTK_WIDGET (html));
+	gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (html), TRUE, TRUE, 0);
 	vscrollbar = gtk_vscrollbar_new (GTK_LAYOUT (html)->vadjustment);
 	gtk_box_pack_start (GTK_BOX (hbox), vscrollbar, FALSE, TRUE, 0);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]