/pidgin/main: 710f725725a8: Replace the deprecated gtk_misc_set_...

Elliott Sales de Andrade <[email protected]> Tue, 06 Sep 2016 15:45:50 -0400
Newsgroups	gmane.comp.gnome.gaim.cvs
Message-ID	<[email protected]>
Changeset: 710f725725a8682ee2d3d36b77d4088b5044b14f
Author:	 Elliott Sales de Andrade <[email protected]>
Date:	 2016-09-04 00:36 -0400
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/710f725725a8

Description:

Replace the deprecated gtk_misc_set_alignment function.

Where available, use the new gtk_label_set_[xy]align. Otherwise, set
halign and valign on the widget.

diffstat:

 pidgin/gtk3compat.h                           |  20 +++++++++++++++
 pidgin/gtkaccount.c                           |   2 +-
 pidgin/gtkblist.c                             |  16 +++++++-----
 pidgin/gtkconv.c                              |  18 +++++++------
 pidgin/gtkdialogs.c                           |   2 +-
 pidgin/gtklog.c                               |   4 +-
 pidgin/gtkmedia.c                             |   4 +-
 pidgin/gtknotify.c                            |  14 ++++++----
 pidgin/gtkplugin.c                            |  16 ++++++------
 pidgin/gtkpluginpref.c                        |   8 +++---
 pidgin/gtkpounce.c                            |   4 +-
 pidgin/gtkprivacy.c                           |   2 +-
 pidgin/gtkrequest.c                           |  34 +++++++++++++++-----------
 pidgin/gtksavedstatuses.c                     |   4 +-
 pidgin/gtkutils.c                             |   4 +-
 pidgin/gtkxfer.c                              |   4 +-
 pidgin/minidialog.c                           |   9 +++---
 pidgin/plugins/cap/cap.c                      |  12 ++++----
 pidgin/plugins/contact_priority.c             |   2 +-
 pidgin/plugins/gevolution/add_buddy_dialog.c  |   2 +-
 pidgin/plugins/gevolution/assoc-buddy.c       |   2 +-
 pidgin/plugins/gevolution/gevolution.c        |   2 +-
 pidgin/plugins/gevolution/new_person_dialog.c |   6 ++--
 pidgin/plugins/xmppconsole.c                  |  26 ++++++++++----------
 24 files changed, 125 insertions(+), 92 deletions(-)

diffs (truncated from 895 to 300 lines):

diff --git a/pidgin/gtk3compat.h b/pidgin/gtk3compat.h
--- a/pidgin/gtk3compat.h
+++ b/pidgin/gtk3compat.h
@@ -34,6 +34,26 @@
 #include <gtk/gtk.h>
 #include <math.h>
 
+#if GTK_CHECK_VERSION(3,16,0)
+
+static inline void
+gtk_label_set_alignment(GtkLabel *label, gfloat xalign, gfloat yalign)
+{
+	gtk_label_set_xalign(label, xalign);
+	gtk_label_set_yalign(label, yalign);
+}
+
+#else /* 3.16.0 */
+
+static inline void
+gtk_label_set_alignment(GtkLabel *label, gfloat xalign, gfloat yalign)
+{
+	gtk_misc_set_alignment(GTK_MISC(label), xalign, yalign);
+}
+
+#endif /* 3.16.0 */
+
+
 #if !GTK_CHECK_VERSION(3,4,0)
 
 #define gtk_color_chooser_dialog_new(title, parent) \
diff --git a/pidgin/gtkaccount.c b/pidgin/gtkaccount.c
--- a/pidgin/gtkaccount.c
+++ b/pidgin/gtkaccount.c
@@ -2417,7 +2417,7 @@ create_accounts_list(AccountsWindow *dia
 	gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
 	gtk_widget_show(label);
 
-	gtk_misc_set_alignment(GTK_MISC(label), 0.5, 0.5);
+	gtk_label_set_alignment(GTK_LABEL(label), 0.5, 0.5);
 	gtk_notebook_append_page(GTK_NOTEBOOK(accounts_window->notebook), label, NULL);
 
 	/* Create the list model. */
diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c
--- a/pidgin/gtkblist.c
+++ b/pidgin/gtkblist.c
@@ -1001,7 +1001,8 @@ make_blist_request_dialog(PidginBlistReq
 	gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(data->window))),
 	                  hbox);
 	gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
-	gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
+	gtk_widget_set_halign(img, GTK_ALIGN_START);
+	gtk_widget_set_valign(img, GTK_ALIGN_START);
 
 	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
 	gtk_container_add(GTK_CONTAINER(hbox), vbox);
@@ -1010,7 +1011,7 @@ make_blist_request_dialog(PidginBlistReq
 
 	gtk_widget_set_size_request(label, 400, -1);
 	gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
-	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+	gtk_label_set_alignment(GTK_LABEL(label), 0, 0);
 	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 
 	data->sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
@@ -5374,7 +5375,7 @@ create_account_label(PurpleAccount *acco
 	markup = g_strdup_printf("<span size=\"smaller\">%s</span>", username);
 	gtk_label_set_markup(GTK_LABEL(label), markup);
 	g_free(markup);
-	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+	gtk_label_set_alignment(GTK_LABEL(label), 0, 0);
 	g_object_set(G_OBJECT(label), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
 	description = purple_account_get_current_error(account)->description;
 	if (description != NULL && *description != '\0')
@@ -5554,14 +5555,14 @@ kiosk_page()
 
 	label = gtk_label_new(NULL);
 	gtk_label_set_markup(GTK_LABEL(label), _("<b>Username:</b>"));
-	gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
+	gtk_label_set_alignment(GTK_LABEL(label), 0.0, 0.5);
 	gtk_box_pack_start(GTK_BOX(ret), label, FALSE, FALSE, 0);
 	entry = gtk_entry_new();
 	gtk_box_pack_start(GTK_BOX(ret), entry, FALSE, FALSE, 0);
 
 	label = gtk_label_new(NULL);
 	gtk_label_set_markup(GTK_LABEL(label), _("<b>Password:</b>"));
-	gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
+	gtk_label_set_alignment(GTK_LABEL(label), 0.0, 0.5);
 	gtk_box_pack_start(GTK_BOX(ret), label, FALSE, FALSE, 0);
 	entry = gtk_entry_new();
 	gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
@@ -5868,7 +5869,7 @@ static void pidgin_blist_show(PurpleBudd
 	g_free(tmp);
 	label = gtk_label_new(NULL);
 	gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
-	gtk_misc_set_alignment(GTK_MISC(label), 0.5, 0.2);
+	gtk_label_set_alignment(GTK_LABEL(label), 0.5, 0.2);
 	gtk_label_set_markup(GTK_LABEL(label), pretty);
 	g_free(pretty);
 	gtk_notebook_append_page(GTK_NOTEBOOK(gtkblist->notebook),label, NULL);
@@ -5889,7 +5890,8 @@ static void pidgin_blist_show(PurpleBudd
 
 	content_area = gtk_info_bar_get_content_area(GTK_INFO_BAR(infobar));
 	gtkblist->headline_image = gtk_image_new_from_pixbuf(NULL);
-	gtk_misc_set_alignment(GTK_MISC(gtkblist->headline_image), 0.5, 0.5);
+	gtk_widget_set_halign(gtkblist->headline_image, GTK_ALIGN_CENTER);
+	gtk_widget_set_valign(gtkblist->headline_image, GTK_ALIGN_CENTER);
 	gtkblist->headline_label = gtk_label_new(NULL);
 	gtk_label_set_line_wrap(GTK_LABEL(gtkblist->headline_label), TRUE);
 	gtk_box_pack_start(GTK_BOX(content_area), gtkblist->headline_image,
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -953,7 +953,8 @@ invite_cb(GtkWidget *widget, PidginConve
 		hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BORDER);
 		gtk_container_add(GTK_CONTAINER(vbox), hbox);
 		gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
-		gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
+		gtk_widget_set_halign(img, GTK_ALIGN_START);
+		gtk_widget_set_valign(img, GTK_ALIGN_START);
 
 		/* Setup the right vbox. */
 		vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
@@ -965,7 +966,7 @@ invite_cb(GtkWidget *widget, PidginConve
 								"message."));
 		gtk_widget_set_size_request(label, 350, -1);
 		gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
-		gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+		gtk_label_set_alignment(GTK_LABEL(label), 0, 0);
 		gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 
 		/* hbox for the grid, and to give it some spacing on the left. */
@@ -984,7 +985,7 @@ invite_cb(GtkWidget *widget, PidginConve
 		gtk_label_set_markup_with_mnemonic(GTK_LABEL(label), _("_Buddy:"));
 		gtk_widget_set_hexpand(label, TRUE);
 		gtk_widget_set_vexpand(label, TRUE);
-		gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+		gtk_label_set_alignment(GTK_LABEL(label), 0, 0);
 		gtk_grid_attach(GTK_GRID(grid), label, 0, 0, 1, 1);
 
 		/* Now the Buddy drop-down entry field. */
@@ -1001,7 +1002,7 @@ invite_cb(GtkWidget *widget, PidginConve
 		gtk_label_set_markup_with_mnemonic(GTK_LABEL(label), _("_Message:"));
 		gtk_widget_set_hexpand(label, TRUE);
 		gtk_widget_set_vexpand(label, TRUE);
-		gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+		gtk_label_set_alignment(GTK_LABEL(label), 0, 0);
 		gtk_grid_attach(GTK_GRID(grid), label, 0, 1, 1, 1);
 
 		/* And finally, the Message entry field. */
@@ -9086,7 +9087,8 @@ build_warn_close_dialog(PidginConvWindow
 	hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12);
 	gtk_container_add(GTK_CONTAINER(vbox), hbox);
 	gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
-	gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
+	gtk_widget_set_halign(img, GTK_ALIGN_START);
+	gtk_widget_set_valign(img, GTK_ALIGN_START);
 
 	/* Setup the right vbox. */
 	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 12);
@@ -9095,7 +9097,7 @@ build_warn_close_dialog(PidginConvWindow
 	label = gtk_label_new(_("You have unread messages. Are you sure you want to close the window?"));
 	gtk_widget_set_size_request(label, 350, -1);
 	gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
-	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+	gtk_label_set_alignment(GTK_LABEL(label), 0, 0);
 	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 
 	/* Connect the signals. */
@@ -10403,7 +10405,7 @@ pidgin_conv_window_add_gtkconv(PidginCon
 
 	gtk_box_pack_start(GTK_BOX(gtkconv->menu_tabby), gtkconv->menu_label, TRUE, TRUE, 0);
 	gtk_widget_show(gtkconv->menu_label);
-	gtk_misc_set_alignment(GTK_MISC(gtkconv->menu_label), 0, 0);
+	gtk_label_set_alignment(GTK_LABEL(gtkconv->menu_label), 0, 0);
 
 	gtk_widget_show(gtkconv->menu_tabby);
 
@@ -10465,7 +10467,7 @@ pidgin_conv_tab_pack(PidginConvWindow *w
 	gtk_label_set_angle(GTK_LABEL(gtkconv->tab_label), angle);
 
 #if 0
-	gtk_misc_set_alignment(GTK_MISC(gtkconv->tab_label), 0.00, 0.5);
+	gtk_label_set_alignment(GTK_LABEL(gtkconv->tab_label), 0.0, 0.5);
 	gtk_misc_set_padding(GTK_MISC(gtkconv->tab_label), 4, 0);
 #endif
 
diff --git a/pidgin/gtkdialogs.c b/pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c
+++ b/pidgin/gtkdialogs.c
@@ -1060,7 +1060,7 @@ pidgin_dialogs_ee(const char *ee)
 	gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
 
 	gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
-	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+	gtk_label_set_alignment(GTK_LABEL(label), 0, 0);
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 
 	gtk_widget_show_all(window);
diff --git a/pidgin/gtklog.c b/pidgin/gtklog.c
--- a/pidgin/gtklog.c
+++ b/pidgin/gtklog.c
@@ -602,7 +602,7 @@ static PidginLogViewer *display_log_view
 	text = g_strdup_printf("<span size='larger' weight='bold'>%s</span>", title);
 
 	gtk_label_set_markup(lv->label, text);
-	gtk_misc_set_alignment(GTK_MISC(lv->label), 0, 0);
+	gtk_label_set_alignment(GTK_LABEL(lv->label), 0, 0);
 	gtk_box_pack_start(GTK_BOX(title_box), GTK_WIDGET(lv->label), FALSE, FALSE, 0);
 	g_free(text);
 
@@ -644,7 +644,7 @@ static PidginLogViewer *display_log_view
 		size_label = gtk_label_new(NULL);
 		gtk_label_set_markup(GTK_LABEL(size_label), text);
 		/*		gtk_paned_add1(GTK_PANED(pane), size_label); */
-		gtk_misc_set_alignment(GTK_MISC(size_label), 0, 0);
+		gtk_label_set_alignment(GTK_LABEL(size_label), 0, 0);
 		gtk_box_pack_end(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(lv->window))),
 		                 size_label, FALSE, FALSE, 0);
 		g_free(sz_txt);
diff --git a/pidgin/gtkmedia.c b/pidgin/gtkmedia.c
--- a/pidgin/gtkmedia.c
+++ b/pidgin/gtkmedia.c
@@ -786,10 +786,10 @@ phone_create_button(const gchar *text_hi
 
 	button = gtk_button_new();
 	label_hi = gtk_label_new(text_hi_local);
-	gtk_misc_set_alignment(GTK_MISC(label_hi), 0.5, 0.5);
+	gtk_label_set_alignment(GTK_LABEL(label_hi), 0.5, 0.5);
 	gtk_box_pack_end(GTK_BOX(grid), label_hi, FALSE, TRUE, 0);
 	label_lo = gtk_label_new(text_lo);
-	gtk_misc_set_alignment(GTK_MISC(label_lo), 0.5, 0.5);
+	gtk_label_set_alignment(GTK_LABEL(label_lo), 0.5, 0.5);
 	gtk_label_set_use_markup(GTK_LABEL(label_lo), TRUE);
 	gtk_box_pack_end(GTK_BOX(grid), label_lo, FALSE, TRUE, 0);
 	gtk_container_add(GTK_CONTAINER(button), grid);
diff --git a/pidgin/gtknotify.c b/pidgin/gtknotify.c
--- a/pidgin/gtknotify.c
+++ b/pidgin/gtknotify.c
@@ -525,7 +525,8 @@ pidgin_widget_decorate_account(GtkWidget
 		gtk_box_reorder_child(GTK_BOX(gtk_dialog_get_action_area(
 			GTK_DIALOG(cont))), image, 0);
 	} else if (GTK_IS_HBOX(cont)) {
-		gtk_misc_set_alignment(GTK_MISC(image), 0, 0);
+		gtk_widget_set_halign(image, GTK_ALIGN_START);
+		gtk_widget_set_valign(image, GTK_ALIGN_START);
 		gtk_box_pack_end(GTK_BOX(cont), image, FALSE, TRUE, 0);
 	}
 	gtk_widget_show(image);
@@ -566,7 +567,8 @@ pidgin_notify_message(PurpleNotifyMessag
 	if (icon_name != NULL)
 	{
 		img = gtk_image_new_from_stock(icon_name, gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE));
-		gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
+		gtk_widget_set_halign(img, GTK_ALIGN_START);
+		gtk_widget_set_valign(img, GTK_ALIGN_START);
 	}
 
 	dialog = gtk_dialog_new_with_buttons(title ? title : PIDGIN_ALERT_TITLE,
@@ -609,7 +611,7 @@ pidgin_notify_message(PurpleNotifyMessag
 	gtk_label_set_markup(GTK_LABEL(label), label_text);
 	gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
 	gtk_label_set_selectable(GTK_LABEL(label), TRUE);
-	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+	gtk_label_set_alignment(GTK_LABEL(label), 0, 0);
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 
 	g_object_set_data(G_OBJECT(dialog), "pidgin-parent-from",
@@ -912,7 +914,7 @@ pidgin_notify_formatted(const char *titl
 	gtk_label_set_markup(GTK_LABEL(label), label_text);
 	gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
 	gtk_label_set_selectable(GTK_LABEL(label), TRUE);
-	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+	gtk_label_set_alignment(GTK_LABEL(label), 0, 0);
 	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 	gtk_widget_show(label);
 
@@ -1037,7 +1039,7 @@ pidgin_notify_searchresults(PurpleConnec
 	label = gtk_label_new(NULL);
 	gtk_label_set_markup(GTK_LABEL(label), label_text);
 	gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
-	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+	gtk_label_set_alignment(GTK_LABEL(label), 0, 0);
 	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 	gtk_widget_show(label);
 	g_free(label_text);
@@ -1737,7 +1739,7 @@ pidgin_create_notification_dialog(Pidgin
 		GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
 
 	gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
-	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
+	gtk_label_set_alignment(GTK_LABEL(label), 0, 0);
 	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(vbox),
 		pidgin_make_scrollable(spec_dialog->treeview, GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS, GTK_SHADOW_IN, -1, -1),
diff --git a/pidgin/gtkplugin.c b/pidgin/gtkplugin.c
--- a/pidgin/gtkplugin.c
+++ b/pidgin/gtkplugin.c
@@ -893,7 +893,7 @@ create_details()
 	GtkWidget *label, *view, *website_button;
 

_______________________________________________
Commits mailing list
[email protected]
https://pidgin.im/cgi-bin/mailman/listinfo/commits