/pidgin/main: 3b971d2ecae1: Simplify gtk_label_set_[xy]align calls.

Elliott Sales de Andrade <[email protected]> Tue, 06 Sep 2016 15:45:52 -0400
Newsgroups	gmane.comp.gnome.gaim.cvs
Message-ID	<[email protected]>
Changeset: 3b971d2ecae10b3d7a60c8fbef4dffcb667f41c7
Author:	 Elliott Sales de Andrade <[email protected]>
Date:	 2016-09-05 03:12 -0400
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/3b971d2ecae1

Description:

Simplify gtk_label_set_[xy]align calls.

Instead of a single function, use the new separate functions, and create
individual wrappers for GTK <3.16.

Additionally, since the default is, and has always been, 0.5, remove any
redundant calls that set 0.5 alignment.

diffstat:

 pidgin/gtk3compat.h                           |  13 +++++--------
 pidgin/gtkaccount.c                           |   1 -
 pidgin/gtkblist.c                             |  12 +++++++-----
 pidgin/gtkconv.c                              |  17 +++++++++++------
 pidgin/gtkdialogs.c                           |   3 ++-
 pidgin/gtklog.c                               |   6 ++++--
 pidgin/gtkmedia.c                             |   2 --
 pidgin/gtknotify.c                            |  12 ++++++++----
 pidgin/gtkplugin.c                            |  23 +++++++++++++++--------
 pidgin/gtkpluginpref.c                        |   9 +++++----
 pidgin/gtkpounce.c                            |   4 ++--
 pidgin/gtkprivacy.c                           |   2 +-
 pidgin/gtkrequest.c                           |  23 +++++++++++++++--------
 pidgin/gtksavedstatuses.c                     |   4 ++--
 pidgin/gtkutils.c                             |   5 +++--
 pidgin/gtkxfer.c                              |   4 ++--
 pidgin/minidialog.c                           |   7 ++++---
 pidgin/plugins/cap/cap.c                      |  12 ++++++------
 pidgin/plugins/contact_priority.c             |   3 ++-
 pidgin/plugins/gevolution/add_buddy_dialog.c  |   3 ++-
 pidgin/plugins/gevolution/assoc-buddy.c       |   3 ++-
 pidgin/plugins/gevolution/gevolution.c        |   2 +-
 pidgin/plugins/gevolution/new_person_dialog.c |   8 +++++---
 pidgin/plugins/xmppconsole.c                  |  26 +++++++++++++-------------
 24 files changed, 117 insertions(+), 87 deletions(-)

diffs (truncated from 801 to 300 lines):

diff --git a/pidgin/gtk3compat.h b/pidgin/gtk3compat.h
--- a/pidgin/gtk3compat.h
+++ b/pidgin/gtk3compat.h
@@ -33,21 +33,18 @@
 
 #include <gtk/gtk.h>
 
-#if GTK_CHECK_VERSION(3,16,0)
+#if !GTK_CHECK_VERSION(3,16,0)
 
 static inline void
-gtk_label_set_alignment(GtkLabel *label, gfloat xalign, gfloat yalign)
+gtk_label_set_xalign(GtkLabel *label, gfloat xalign)
 {
-	gtk_label_set_xalign(label, xalign);
-	gtk_label_set_yalign(label, yalign);
+	g_object_set(label, "xalign", xalign, NULL);
 }
 
-#else /* 3.16.0 */
-
 static inline void
-gtk_label_set_alignment(GtkLabel *label, gfloat xalign, gfloat yalign)
+gtk_label_set_yalign(GtkLabel *label, gfloat yalign)
 {
-	gtk_misc_set_alignment(GTK_MISC(label), xalign, yalign);
+	g_object_set(label, "yalign", yalign, NULL);
 }
 
 #endif /* 3.16.0 */
diff --git a/pidgin/gtkaccount.c b/pidgin/gtkaccount.c
--- a/pidgin/gtkaccount.c
+++ b/pidgin/gtkaccount.c
@@ -2298,7 +2298,6 @@ create_accounts_list(AccountsWindow *dia
 	gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
 	gtk_widget_show(label);
 
-	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
@@ -1011,7 +1011,8 @@ make_blist_request_dialog(PidginBlistReq
 
 	gtk_widget_set_size_request(label, 400, -1);
 	gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
-	gtk_label_set_alignment(GTK_LABEL(label), 0, 0);
+	gtk_label_set_xalign(GTK_LABEL(label), 0);
+	gtk_label_set_yalign(GTK_LABEL(label), 0);
 	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 
 	data->sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
@@ -5377,7 +5378,8 @@ 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_label_set_alignment(GTK_LABEL(label), 0, 0);
+	gtk_label_set_xalign(GTK_LABEL(label), 0);
+	gtk_label_set_yalign(GTK_LABEL(label), 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')
@@ -5557,14 +5559,14 @@ kiosk_page()
 
 	label = gtk_label_new(NULL);
 	gtk_label_set_markup(GTK_LABEL(label), _("<b>Username:</b>"));
-	gtk_label_set_alignment(GTK_LABEL(label), 0.0, 0.5);
+	gtk_label_set_xalign(GTK_LABEL(label), 0.0);
 	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_label_set_alignment(GTK_LABEL(label), 0.0, 0.5);
+	gtk_label_set_xalign(GTK_LABEL(label), 0.0);
 	gtk_box_pack_start(GTK_BOX(ret), label, FALSE, FALSE, 0);
 	entry = gtk_entry_new();
 	gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
@@ -5871,7 +5873,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_label_set_alignment(GTK_LABEL(label), 0.5, 0.2);
+	gtk_label_set_yalign(GTK_LABEL(label), 0.2);
 	gtk_label_set_markup(GTK_LABEL(label), pretty);
 	g_free(pretty);
 	gtk_notebook_append_page(GTK_NOTEBOOK(gtkblist->notebook),label, NULL);
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -965,7 +965,8 @@ invite_cb(GtkWidget *widget, PidginConve
 								"message."));
 		gtk_widget_set_size_request(label, 350, -1);
 		gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
-		gtk_label_set_alignment(GTK_LABEL(label), 0, 0);
+		gtk_label_set_xalign(GTK_LABEL(label), 0);
+		gtk_label_set_yalign(GTK_LABEL(label), 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,8 @@ 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_label_set_alignment(GTK_LABEL(label), 0, 0);
+		gtk_label_set_xalign(GTK_LABEL(label), 0);
+		gtk_label_set_yalign(GTK_LABEL(label), 0);
 		gtk_grid_attach(GTK_GRID(grid), label, 0, 0, 1, 1);
 
 		/* Now the Buddy drop-down entry field. */
@@ -1001,7 +1003,8 @@ 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_label_set_alignment(GTK_LABEL(label), 0, 0);
+		gtk_label_set_xalign(GTK_LABEL(label), 0);
+		gtk_label_set_yalign(GTK_LABEL(label), 0);
 		gtk_grid_attach(GTK_GRID(grid), label, 0, 1, 1, 1);
 
 		/* And finally, the Message entry field. */
@@ -9109,7 +9112,8 @@ 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_label_set_alignment(GTK_LABEL(label), 0, 0);
+	gtk_label_set_xalign(GTK_LABEL(label), 0);
+	gtk_label_set_yalign(GTK_LABEL(label), 0);
 	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 
 	/* Connect the signals. */
@@ -10419,7 +10423,8 @@ 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_label_set_alignment(GTK_LABEL(gtkconv->menu_label), 0, 0);
+	gtk_label_set_xalign(GTK_LABEL(gtkconv->menu_label), 0);
+	gtk_label_set_yalign(GTK_LABEL(gtkconv->menu_label), 0);
 
 	gtk_widget_show(gtkconv->menu_tabby);
 
@@ -10481,7 +10486,7 @@ pidgin_conv_tab_pack(PidginConvWindow *w
 	gtk_label_set_angle(GTK_LABEL(gtkconv->tab_label), angle);
 
 #if 0
-	gtk_label_set_alignment(GTK_LABEL(gtkconv->tab_label), 0.0, 0.5);
+	gtk_label_set_xalign(GTK_LABEL(gtkconv->tab_label), 0.0);
 #if GTK_CHECK_VERSION(3,12,0)
 	gtk_widget_set_margin_start(gtkconv->tab_label, 4);
 	gtk_widget_set_margin_end(gtkconv->tab_label, 4);
diff --git a/pidgin/gtkdialogs.c b/pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c
+++ b/pidgin/gtkdialogs.c
@@ -1060,7 +1060,8 @@ 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_label_set_alignment(GTK_LABEL(label), 0, 0);
+	gtk_label_set_xalign(GTK_LABEL(label), 0);
+	gtk_label_set_yalign(GTK_LABEL(label), 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,8 @@ 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_label_set_alignment(GTK_LABEL(lv->label), 0, 0);
+	gtk_label_set_xalign(GTK_LABEL(lv->label), 0);
+	gtk_label_set_yalign(GTK_LABEL(lv->label), 0);
 	gtk_box_pack_start(GTK_BOX(title_box), GTK_WIDGET(lv->label), FALSE, FALSE, 0);
 	g_free(text);
 
@@ -644,7 +645,8 @@ 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_label_set_alignment(GTK_LABEL(size_label), 0, 0);
+		gtk_label_set_xalign(GTK_LABEL(size_label), 0);
+		gtk_label_set_yalign(GTK_LABEL(size_label), 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
@@ -787,10 +787,8 @@ phone_create_button(const gchar *text_hi
 
 	button = gtk_button_new();
 	label_hi = gtk_label_new(text_hi_local);
-	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_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
@@ -611,7 +611,8 @@ 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_label_set_alignment(GTK_LABEL(label), 0, 0);
+	gtk_label_set_xalign(GTK_LABEL(label), 0);
+	gtk_label_set_yalign(GTK_LABEL(label), 0);
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 
 	g_object_set_data(G_OBJECT(dialog), "pidgin-parent-from",
@@ -914,7 +915,8 @@ 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_label_set_alignment(GTK_LABEL(label), 0, 0);
+	gtk_label_set_xalign(GTK_LABEL(label), 0);
+	gtk_label_set_yalign(GTK_LABEL(label), 0);
 	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 	gtk_widget_show(label);
 
@@ -1039,7 +1041,8 @@ 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_label_set_alignment(GTK_LABEL(label), 0, 0);
+	gtk_label_set_xalign(GTK_LABEL(label), 0);
+	gtk_label_set_yalign(GTK_LABEL(label), 0);
 	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 	gtk_widget_show(label);
 	g_free(label_text);
@@ -1739,7 +1742,8 @@ pidgin_create_notification_dialog(Pidgin
 		GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
 
 	gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
-	gtk_label_set_alignment(GTK_LABEL(label), 0, 0);
+	gtk_label_set_xalign(GTK_LABEL(label), 0);
+	gtk_label_set_yalign(GTK_LABEL(label), 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,8 @@ create_details()
 	GtkWidget *label, *view, *website_button;
 
 	plugin_name = GTK_LABEL(gtk_label_new(NULL));
-	gtk_label_set_alignment(plugin_name, 0, 0);
+	gtk_label_set_xalign(plugin_name, 0);
+	gtk_label_set_yalign(plugin_name, 0);
 	gtk_label_set_line_wrap(plugin_name, FALSE);
 	gtk_label_set_selectable(plugin_name, TRUE);
 	gtk_box_pack_start(vbox, GTK_WIDGET(plugin_name), FALSE, FALSE, 0);
@@ -908,19 +909,22 @@ create_details()
 	gtk_box_pack_start(vbox, view, TRUE, TRUE, 0);
 
 	plugin_error = GTK_LABEL(gtk_label_new(NULL));
-	gtk_label_set_alignment(plugin_error, 0, 0);
+	gtk_label_set_xalign(plugin_error, 0);
+	gtk_label_set_yalign(plugin_error, 0);
 	gtk_label_set_line_wrap(plugin_error, FALSE);
 	gtk_label_set_selectable(plugin_error, TRUE);
 	gtk_box_pack_start(vbox, GTK_WIDGET(plugin_error), FALSE, FALSE, 0);
 
 	plugin_authors = GTK_LABEL(gtk_label_new(NULL));
 	gtk_label_set_line_wrap(plugin_authors, FALSE);
-	gtk_label_set_alignment(plugin_authors, 0, 0);
+	gtk_label_set_xalign(plugin_authors, 0);
+	gtk_label_set_yalign(plugin_authors, 0);
 	gtk_label_set_selectable(plugin_authors, TRUE);
 	pidgin_add_widget_to_vbox(vbox, "", sg,
 		GTK_WIDGET(plugin_authors), TRUE, &label);
 	gtk_label_set_markup(GTK_LABEL(label), _("<b>Written by:</b>"));
-	gtk_label_set_alignment(GTK_LABEL(label), 0, 0);
+	gtk_label_set_xalign(GTK_LABEL(label), 0);
+	gtk_label_set_yalign(GTK_LABEL(label), 0);
 
 	website_button = gtk_event_box_new();
 	gtk_event_box_set_visible_window(GTK_EVENT_BOX(website_button), FALSE);
@@ -928,7 +932,8 @@ create_details()
 	plugin_website = GTK_LABEL(gtk_label_new(NULL));
 	g_object_set(G_OBJECT(plugin_website),
 		"ellipsize", PANGO_ELLIPSIZE_MIDDLE, NULL);
-	gtk_label_set_alignment(plugin_website, 0, 0);
+	gtk_label_set_xalign(plugin_website, 0);
+	gtk_label_set_yalign(plugin_website, 0);
 	gtk_container_add(GTK_CONTAINER(website_button),
 		GTK_WIDGET(plugin_website));
 	g_signal_connect(website_button, "button-release-event",
@@ -940,16 +945,18 @@ create_details()
 
 	pidgin_add_widget_to_vbox(vbox, "", sg, website_button, TRUE, &label);
 	gtk_label_set_markup(GTK_LABEL(label), _("<b>Web site:</b>"));
-	gtk_label_set_alignment(GTK_LABEL(label), 0, 0.5);
+	gtk_label_set_xalign(GTK_LABEL(label), 0);

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