pidgin/pidgin

Simplify gtk_label_set_[xy]align calls.

2016-09-05, Elliott Sales de Andrade
3b971d2ecae1
Parents 98fc851b9c99
Children f8f4b8015cd1
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.
24 files changed, 117 insertions(+), 87 deletions(-)
  • +5 -8
    pidgin/gtk3compat.h
  • +0 -1
    pidgin/gtkaccount.c
  • +7 -5
    pidgin/gtkblist.c
  • +11 -6
    pidgin/gtkconv.c
  • +2 -1
    pidgin/gtkdialogs.c
  • +4 -2
    pidgin/gtklog.c
  • +0 -2
    pidgin/gtkmedia.c
  • +8 -4
    pidgin/gtknotify.c
  • +15 -8
    pidgin/gtkplugin.c
  • +5 -4
    pidgin/gtkpluginpref.c
  • +2 -2
    pidgin/gtkpounce.c
  • +1 -1
    pidgin/gtkprivacy.c
  • +15 -8
    pidgin/gtkrequest.c
  • +2 -2
    pidgin/gtksavedstatuses.c
  • +3 -2
    pidgin/gtkutils.c
  • +2 -2
    pidgin/gtkxfer.c
  • +4 -3
    pidgin/minidialog.c
  • +6 -6
    pidgin/plugins/cap/cap.c
  • +2 -1
    pidgin/plugins/contact_priority.c
  • +2 -1
    pidgin/plugins/gevolution/add_buddy_dialog.c
  • +2 -1
    pidgin/plugins/gevolution/assoc-buddy.c
  • +1 -1
    pidgin/plugins/gevolution/gevolution.c
  • +5 -3
    pidgin/plugins/gevolution/new_person_dialog.c
  • +13 -13
    pidgin/plugins/xmppconsole.c
    • --- a/pidgin/gtk3compat.h Mon Sep 05 02:42:47 2016 -0400
    +++ b/pidgin/gtk3compat.h Mon Sep 05 03:12:22 2016 -0400
    @@ -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 */
    --- a/pidgin/gtkaccount.c Mon Sep 05 02:42:47 2016 -0400
    +++ b/pidgin/gtkaccount.c Mon Sep 05 03:12:22 2016 -0400
    @@ -2298,7 +2298,6 @@
    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. */
    --- a/pidgin/gtkblist.c Mon Sep 05 02:42:47 2016 -0400
    +++ b/pidgin/gtkblist.c Mon Sep 05 03:12:22 2016 -0400
    @@ -1011,7 +1011,8 @@
    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 @@
    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 @@
    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 @@
    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);
    --- a/pidgin/gtkconv.c Mon Sep 05 02:42:47 2016 -0400
    +++ b/pidgin/gtkconv.c Mon Sep 05 03:12:22 2016 -0400
    @@ -965,7 +965,8 @@
    "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 @@
    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 @@
    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 @@
    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 @@
    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 @@
    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);
    --- a/pidgin/gtkdialogs.c Mon Sep 05 02:42:47 2016 -0400
    +++ b/pidgin/gtkdialogs.c Mon Sep 05 03:12:22 2016 -0400
    @@ -1060,7 +1060,8 @@
    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);
    --- a/pidgin/gtklog.c Mon Sep 05 02:42:47 2016 -0400
    +++ b/pidgin/gtklog.c Mon Sep 05 03:12:22 2016 -0400
    @@ -602,7 +602,8 @@
    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 @@
    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);
    --- a/pidgin/gtkmedia.c Mon Sep 05 02:42:47 2016 -0400
    +++ b/pidgin/gtkmedia.c Mon Sep 05 03:12:22 2016 -0400
    @@ -787,10 +787,8 @@
    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);
    --- a/pidgin/gtknotify.c Mon Sep 05 02:42:47 2016 -0400
    +++ b/pidgin/gtknotify.c Mon Sep 05 03:12:22 2016 -0400
    @@ -611,7 +611,8 @@
    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 @@
    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 @@
    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 @@
    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),
    --- a/pidgin/gtkplugin.c Mon Sep 05 02:42:47 2016 -0400
    +++ b/pidgin/gtkplugin.c Mon Sep 05 03:12:22 2016 -0400
    @@ -893,7 +893,8 @@
    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 @@
    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 @@
    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 @@
    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);
    plugin_filename = GTK_LABEL(gtk_label_new(NULL));
    gtk_label_set_line_wrap(plugin_filename, FALSE);
    - gtk_label_set_alignment(plugin_filename, 0, 0);
    + gtk_label_set_xalign(plugin_filename, 0);
    + gtk_label_set_yalign(plugin_filename, 0);
    gtk_label_set_selectable(plugin_filename, TRUE);
    pidgin_add_widget_to_vbox(vbox, "", sg,
    GTK_WIDGET(plugin_filename), TRUE, &label);
    gtk_label_set_markup(GTK_LABEL(label), _("<b>Filename:</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);
    g_object_unref(sg);
    --- a/pidgin/gtkpluginpref.c Mon Sep 05 02:42:47 2016 -0400
    +++ b/pidgin/gtkpluginpref.c Mon Sep 05 03:12:22 2016 -0400
    @@ -74,7 +74,7 @@
    gtk_label = pidgin_prefs_dropdown_from_list(parent, pref_label,
    PURPLE_PREF_STRING, pref_name,
    purple_plugin_pref_get_choices(pref));
    - gtk_label_set_alignment(GTK_LABEL(gtk_label), 0, 0.5);
    + gtk_label_set_xalign(GTK_LABEL(gtk_label), 0);
    if(sg)
    gtk_size_group_add_widget(sg, gtk_label);
    @@ -110,7 +110,7 @@
    gtk_box_pack_start(GTK_BOX(parent), box, FALSE, FALSE, 0);
    gtk_label = gtk_label_new_with_mnemonic(pref_label);
    - gtk_label_set_alignment(GTK_LABEL(gtk_label), 0, 0.5);
    + gtk_label_set_xalign(GTK_LABEL(gtk_label), 0);
    gtk_widget_show(gtk_label);
    gtk_box_pack_start(GTK_BOX(box), gtk_label, FALSE, FALSE, 0);
    @@ -166,7 +166,7 @@
    case PURPLE_PLUGIN_PREF_CHOICE:
    gtk_label = pidgin_prefs_dropdown_from_list(parent, pref_label,
    PURPLE_PREF_INT, pref_name, purple_plugin_pref_get_choices(pref));
    - gtk_label_set_alignment(GTK_LABEL(gtk_label), 0, 0.5);
    + gtk_label_set_xalign(GTK_LABEL(gtk_label), 0);
    if(sg)
    gtk_size_group_add_widget(sg, gtk_label);
    @@ -185,7 +185,8 @@
    static void
    make_info_pref(GtkWidget *parent, PurplePluginPref *pref) {
    GtkWidget *gtk_label = gtk_label_new(purple_plugin_pref_get_label(pref));
    - gtk_label_set_alignment(GTK_LABEL(gtk_label), 0, 0);
    + gtk_label_set_xalign(GTK_LABEL(gtk_label), 0);
    + gtk_label_set_yalign(GTK_LABEL(gtk_label), 0);
    gtk_label_set_line_wrap(GTK_LABEL(gtk_label), TRUE);
    gtk_box_pack_start(GTK_BOX(parent), gtk_label, FALSE, FALSE, 0);
    gtk_widget_show(gtk_label);
    --- a/pidgin/gtkpounce.c Mon Sep 05 02:42:47 2016 -0400
    +++ b/pidgin/gtkpounce.c Mon Sep 05 03:12:22 2016 -0400
    @@ -565,7 +565,7 @@
    gtk_widget_show(hbox);
    label = gtk_label_new_with_mnemonic(_("_Account:"));
    - gtk_label_set_alignment(GTK_LABEL(label), 0, 0.5);
    + gtk_label_set_xalign(GTK_LABEL(label), 0);
    gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    gtk_widget_show(label);
    gtk_size_group_add_widget(sg, label);
    @@ -585,7 +585,7 @@
    gtk_widget_show(hbox);
    label = gtk_label_new_with_mnemonic(_("_Buddy name:"));
    - gtk_label_set_alignment(GTK_LABEL(label), 0, 0.5);
    + gtk_label_set_xalign(GTK_LABEL(label), 0);
    gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    gtk_widget_show(label);
    gtk_size_group_add_widget(sg, label);
    --- a/pidgin/gtkprivacy.c Mon Sep 05 02:42:47 2016 -0400
    +++ b/pidgin/gtkprivacy.c Mon Sep 05 03:12:22 2016 -0400
    @@ -351,7 +351,7 @@
    _("Changes to privacy settings take effect immediately."));
    gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
    - gtk_label_set_alignment(GTK_LABEL(label), 0, 0.5);
    + gtk_label_set_xalign(GTK_LABEL(label), 0);
    gtk_widget_show(label);
    /* Accounts drop-down */
    --- a/pidgin/gtkrequest.c Mon Sep 05 02:42:47 2016 -0400
    +++ b/pidgin/gtkrequest.c Mon Sep 05 03:12:22 2016 -0400
    @@ -595,7 +595,8 @@
    gtk_label_set_markup(label, label_text);
    gtk_label_set_line_wrap(label, TRUE);
    - gtk_label_set_alignment(label, 0, 0);
    + gtk_label_set_xalign(label, 0);
    + gtk_label_set_yalign(label, 0);
    gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(label), FALSE, FALSE, 0);
    g_free(label_text);
    @@ -752,7 +753,8 @@
    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, TRUE, TRUE, 0);
    g_free(label_text);
    @@ -876,7 +878,8 @@
    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_label_set_selectable(GTK_LABEL(label), TRUE);
    gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0);
    @@ -991,7 +994,8 @@
    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_label_set_selectable(GTK_LABEL(label), FALSE);
    gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0);
    @@ -1559,7 +1563,8 @@
    cert_label = gtk_label_new(NULL);
    gtk_label_set_markup(GTK_LABEL(cert_label), escaped);
    gtk_label_set_line_wrap(GTK_LABEL(cert_label), TRUE);
    - gtk_label_set_alignment(GTK_LABEL(cert_label), 0, 0);
    + gtk_label_set_xalign(GTK_LABEL(cert_label), 0);
    + gtk_label_set_yalign(GTK_LABEL(cert_label), 0);
    g_free(str);
    g_free(escaped);
    @@ -2072,7 +2077,8 @@
    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);
    @@ -2153,7 +2159,8 @@
    gtk_label_set_markup(GTK_LABEL(label), secondary_esc);
    g_free(secondary_esc);
    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, (notebook == NULL),
    (notebook == NULL), 0);
    gtk_widget_show(label);
    @@ -2314,7 +2321,7 @@
    gtk_widget_set_hexpand(label, TRUE);
    gtk_widget_set_vexpand(label, TRUE);
    - gtk_label_set_alignment(GTK_LABEL(label), 0, 0.5);
    + gtk_label_set_xalign(GTK_LABEL(label), 0);
    gtk_size_group_add_widget(sg, label);
    --- a/pidgin/gtksavedstatuses.c Mon Sep 05 02:42:47 2016 -0400
    +++ b/pidgin/gtksavedstatuses.c Mon Sep 05 03:12:22 2016 -0400
    @@ -1418,7 +1418,7 @@
    gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
    label = gtk_label_new_with_mnemonic(_("_Status:"));
    - gtk_label_set_alignment(GTK_LABEL(label), 0, 0.5);
    + gtk_label_set_xalign(GTK_LABEL(label), 0);
    gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    gtk_size_group_add_widget(sg, label);
    @@ -1452,7 +1452,7 @@
    gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
    label = gtk_label_new_with_mnemonic(_("_Message:"));
    - gtk_label_set_alignment(GTK_LABEL(label), 0, 0.5);
    + gtk_label_set_xalign(GTK_LABEL(label), 0);
    gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    gtk_size_group_add_widget(sg, label);
    --- a/pidgin/gtkutils.c Mon Sep 05 02:42:47 2016 -0400
    +++ b/pidgin/gtkutils.c Mon Sep 05 03:12:22 2016 -0400
    @@ -533,7 +533,8 @@
    gtk_label_set_markup(label, labeltitle);
    g_free(labeltitle);
    - 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), GTK_WIDGET(label), FALSE, FALSE, 0);
    gtk_widget_show(GTK_WIDGET(label));
    pidgin_set_accessible_label(vbox, label);
    @@ -2890,7 +2891,7 @@
    label = gtk_label_new_with_mnemonic(widget_label);
    gtk_widget_show(label);
    if (sg) {
    - gtk_label_set_alignment(GTK_LABEL(label), 0, 0.5);
    + gtk_label_set_xalign(GTK_LABEL(label), 0);
    gtk_size_group_add_widget(sg, label);
    }
    gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    --- a/pidgin/gtkxfer.c Mon Sep 05 02:42:47 2016 -0400
    +++ b/pidgin/gtkxfer.c Mon Sep 05 03:12:22 2016 -0400
    @@ -679,14 +679,14 @@
    *labels[i].desc_label = label = gtk_label_new(NULL);
    gtk_label_set_markup(GTK_LABEL(label), buf);
    gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_RIGHT);
    - gtk_label_set_alignment(GTK_LABEL(label), 0, 0.5);
    + gtk_label_set_xalign(GTK_LABEL(label), 0);
    gtk_grid_attach(GTK_GRID(grid), label, 0, i, 1, 1);
    gtk_widget_set_valign(label, GTK_ALIGN_CENTER);
    gtk_widget_show(label);
    *labels[i].val_label = label = gtk_label_new(NULL);
    - gtk_label_set_alignment(GTK_LABEL(label), 0, 0.5);
    + gtk_label_set_xalign(GTK_LABEL(label), 0);
    gtk_grid_attach(GTK_GRID(grid), label, 1, i, 1, 1);
    gtk_widget_set_hexpand(label, TRUE);
    gtk_widget_set_valign(label, GTK_ALIGN_CENTER);
    --- a/pidgin/minidialog.c Mon Sep 05 02:42:47 2016 -0400
    +++ b/pidgin/minidialog.c Mon Sep 05 03:12:22 2016 -0400
    @@ -246,7 +246,6 @@
    g_signal_connect(G_OBJECT(button), "destroy",
    (GCallback) mini_dialog_button_destroy_cb, callback_data);
    - gtk_label_set_alignment(GTK_LABEL(label), 0.5, 0.5);
    gtk_container_add(GTK_CONTAINER(button), label);
    gtk_box_pack_end(GTK_BOX(priv->buttons), button, FALSE, FALSE,
    @@ -467,14 +466,16 @@
    priv->title = GTK_LABEL(gtk_label_new(NULL));
    gtk_label_set_line_wrap(priv->title, TRUE);
    gtk_label_set_selectable(priv->title, TRUE);
    - gtk_label_set_alignment(priv->title, 0, 0);
    + gtk_label_set_xalign(priv->title, 0);
    + gtk_label_set_yalign(priv->title, 0);
    gtk_box_pack_start(priv->title_box, GTK_WIDGET(priv->icon), FALSE, FALSE, 0);
    gtk_box_pack_start(priv->title_box, GTK_WIDGET(priv->title), TRUE, TRUE, 0);
    priv->desc = GTK_LABEL(gtk_label_new(NULL));
    gtk_label_set_line_wrap(priv->desc, TRUE);
    - gtk_label_set_alignment(priv->desc, 0, 0);
    + gtk_label_set_xalign(priv->desc, 0);
    + gtk_label_set_yalign(priv->desc, 0);
    gtk_label_set_selectable(priv->desc, TRUE);
    /* make calling show_all() on the minidialog not affect desc even though
    * it's packed inside it.
    --- a/pidgin/plugins/cap/cap.c Mon Sep 05 02:42:47 2016 -0400
    +++ b/pidgin/plugins/cap/cap.c Mon Sep 05 03:12:22 2016 -0400
    @@ -736,24 +736,24 @@
    /* msg_difference spinner */
    ui->msg_difference_label = gtk_label_new(_("Maximum response timeout:"));
    - gtk_label_set_alignment(GTK_LABEL(ui->msg_difference_label), 0, 0.5);
    + gtk_label_set_xalign(GTK_LABEL(ui->msg_difference_label), 0);
    ui->msg_difference_input = gtk_spin_button_new_with_range(1, 1440, 1);
    ui->msg_difference_minutes_label = gtk_label_new(_("minutes"));
    - gtk_label_set_alignment(GTK_LABEL(ui->msg_difference_minutes_label), 0, 0.5);
    + gtk_label_set_xalign(GTK_LABEL(ui->msg_difference_minutes_label), 0);
    /* last_seen spinner */
    ui->last_seen_label = gtk_label_new(_("Maximum last-seen difference:"));
    - gtk_label_set_alignment(GTK_LABEL(ui->last_seen_label), 0, 0.5);
    + gtk_label_set_xalign(GTK_LABEL(ui->last_seen_label), 0);
    ui->last_seen_input = gtk_spin_button_new_with_range(1, 1440, 1);
    ui->last_seen_minutes_label = gtk_label_new(_("minutes"));
    - gtk_label_set_alignment(GTK_LABEL(ui->last_seen_minutes_label), 0, 0.5);
    + gtk_label_set_xalign(GTK_LABEL(ui->last_seen_minutes_label), 0);
    /* threshold spinner */
    ui->threshold_label = gtk_label_new(_("Threshold:"));
    - gtk_label_set_alignment(GTK_LABEL(ui->threshold_label), 0, 0.5);
    + gtk_label_set_xalign(GTK_LABEL(ui->threshold_label), 0);
    ui->threshold_input = gtk_spin_button_new_with_range(1, 1440, 1);
    ui->threshold_minutes_label = gtk_label_new(_("minutes"));
    - gtk_label_set_alignment(GTK_LABEL(ui->threshold_minutes_label), 0, 0.5);
    + gtk_label_set_xalign(GTK_LABEL(ui->threshold_minutes_label), 0);
    /* Layout threshold/last-seen/response-timeout input items */
    ui->table_layout = gtk_grid_new();
    --- a/pidgin/plugins/contact_priority.c Mon Sep 05 02:42:47 2016 -0400
    +++ b/pidgin/plugins/contact_priority.c Mon Sep 05 03:12:22 2016 -0400
    @@ -104,7 +104,8 @@
    label = gtk_label_new_with_mnemonic(_(statuses[i].description));
    gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    gtk_size_group_add_widget(sg, label);
    - 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);
    adj = GTK_ADJUSTMENT(gtk_adjustment_new(purple_prefs_get_int(pref),
    -500, 500, 1, 1, 1));
    --- a/pidgin/plugins/gevolution/add_buddy_dialog.c Mon Sep 05 02:42:47 2016 -0400
    +++ b/pidgin/plugins/gevolution/add_buddy_dialog.c Mon Sep 05 03:12:22 2016 -0400
    @@ -463,7 +463,8 @@
    label = gtk_label_new(_("Select a person from your address book below, "
    "or add a new person."));
    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, TRUE, 0);
    gtk_widget_show(label);
    --- a/pidgin/plugins/gevolution/assoc-buddy.c Mon Sep 05 02:42:47 2016 -0400
    +++ b/pidgin/plugins/gevolution/assoc-buddy.c Mon Sep 05 03:12:22 2016 -0400
    @@ -343,7 +343,8 @@
    label = gtk_label_new(_("Select a person from your address book to "
    "add this buddy to, or create a new person."));
    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, TRUE, 0);
    gtk_widget_show(label);
    --- a/pidgin/plugins/gevolution/gevolution.c Mon Sep 05 02:42:47 2016 -0400
    +++ b/pidgin/plugins/gevolution/gevolution.c Mon Sep 05 03:12:22 2016 -0400
    @@ -384,7 +384,7 @@
    /* Label */
    label = gtk_label_new(_("Select all accounts that buddies should be "
    "auto-added to."));
    - gtk_label_set_alignment(GTK_LABEL(label), 0, 0.5);
    + gtk_label_set_xalign(GTK_LABEL(label), 0);
    gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
    gtk_widget_show(label);
    --- a/pidgin/plugins/gevolution/new_person_dialog.c Mon Sep 05 02:42:47 2016 -0400
    +++ b/pidgin/plugins/gevolution/new_person_dialog.c Mon Sep 05 03:12:22 2016 -0400
    @@ -41,7 +41,7 @@
    label = gtk_label_new_with_mnemonic(text);
    gtk_size_group_add_widget(sg, label);
    - gtk_label_set_alignment(GTK_LABEL(label), 0, 0.5);
    + gtk_label_set_xalign(GTK_LABEL(label), 0);
    gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    gtk_widget_show(label);
    @@ -268,7 +268,8 @@
    }
    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, TRUE, 0);
    gtk_widget_show(label);
    @@ -308,7 +309,8 @@
    /* Optional Information section */
    label = gtk_label_new(_("Optional information:"));
    - 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);
    }
    --- a/pidgin/plugins/xmppconsole.c Mon Sep 05 02:42:47 2016 -0400
    +++ b/pidgin/plugins/xmppconsole.c Mon Sep 05 03:12:22 2016 -0400
    @@ -318,7 +318,7 @@
    gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
    label = gtk_label_new("To:");
    - gtk_label_set_alignment(GTK_LABEL(label), 0, 0.5);
    + gtk_label_set_xalign(GTK_LABEL(label), 0);
    gtk_size_group_add_widget(sg, label);
    gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    @@ -329,7 +329,7 @@
    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3);
    gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
    label = gtk_label_new("Type:");
    - gtk_label_set_alignment(GTK_LABEL(label), 0, 0.5);
    + gtk_label_set_xalign(GTK_LABEL(label), 0);
    gtk_size_group_add_widget(sg, label);
    gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    @@ -402,7 +402,7 @@
    label = gtk_label_new("To:");
    gtk_size_group_add_widget(sg, label);
    - gtk_label_set_alignment(GTK_LABEL(label), 0, 0.5);
    + gtk_label_set_xalign(GTK_LABEL(label), 0);
    gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    to_entry = gtk_entry_new();
    @@ -412,7 +412,7 @@
    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3);
    gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
    label = gtk_label_new("Type:");
    - gtk_label_set_alignment(GTK_LABEL(label), 0, 0.5);
    + gtk_label_set_xalign(GTK_LABEL(label), 0);
    gtk_size_group_add_widget(sg, label);
    gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    type_combo = gtk_combo_box_text_new();
    @@ -430,7 +430,7 @@
    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3);
    gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
    label = gtk_label_new("Show:");
    - gtk_label_set_alignment(GTK_LABEL(label), 0, 0.5);
    + gtk_label_set_xalign(GTK_LABEL(label), 0);
    gtk_size_group_add_widget(sg, label);
    gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    show_combo = gtk_combo_box_text_new();
    @@ -447,7 +447,7 @@
    gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
    label = gtk_label_new("Status:");
    - gtk_label_set_alignment(GTK_LABEL(label), 0, 0.5);
    + gtk_label_set_xalign(GTK_LABEL(label), 0);
    gtk_size_group_add_widget(sg, label);
    gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    @@ -459,7 +459,7 @@
    gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
    label = gtk_label_new("Priority:");
    - gtk_label_set_alignment(GTK_LABEL(label), 0, 0.5);
    + gtk_label_set_xalign(GTK_LABEL(label), 0);
    gtk_size_group_add_widget(sg, label);
    gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    @@ -554,7 +554,7 @@
    gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
    label = gtk_label_new("To:");
    - gtk_label_set_alignment(GTK_LABEL(label), 0, 0.5);
    + gtk_label_set_xalign(GTK_LABEL(label), 0);
    gtk_size_group_add_widget(sg, label);
    gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    @@ -565,7 +565,7 @@
    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3);
    gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
    label = gtk_label_new("Type:");
    - gtk_label_set_alignment(GTK_LABEL(label), 0, 0.5);
    + gtk_label_set_xalign(GTK_LABEL(label), 0);
    gtk_size_group_add_widget(sg, label);
    gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    type_combo = gtk_combo_box_text_new();
    @@ -581,7 +581,7 @@
    gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
    label = gtk_label_new("Body:");
    - gtk_label_set_alignment(GTK_LABEL(label), 0, 0.5);
    + gtk_label_set_xalign(GTK_LABEL(label), 0);
    gtk_size_group_add_widget(sg, label);
    gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    @@ -593,7 +593,7 @@
    gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
    label = gtk_label_new("Subject:");
    - gtk_label_set_alignment(GTK_LABEL(label), 0, 0.5);
    + gtk_label_set_xalign(GTK_LABEL(label), 0);
    gtk_size_group_add_widget(sg, label);
    gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    @@ -605,7 +605,7 @@
    gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
    label = gtk_label_new("Thread:");
    - gtk_label_set_alignment(GTK_LABEL(label), 0, 0.5);
    + gtk_label_set_xalign(GTK_LABEL(label), 0);
    gtk_size_group_add_widget(sg, label);
    gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
    @@ -763,7 +763,7 @@
    console->hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3);
    gtk_box_pack_start(GTK_BOX(vbox), console->hbox, FALSE, FALSE, 0);
    label = gtk_label_new(_("Account: "));
    - 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(console->hbox), label, FALSE, FALSE, 0);
    console->dropdown = gtk_combo_box_text_new();
    for (connections = purple_connections_get_all(); connections; connections = connections->next) {