commit 27c4b31baedebf97f317fce1e30e5b5c86e62cb2 parent fc52e9bc7cd5e1ad09af88593ac2a34d34350351 Author: Ricardo Mones <ricardo@mones.org> Date: Tue, 20 Feb 2018 19:08:45 +0100 Replace deprecated gtk_misc_set_alignment() in core Diffstat:
59 files changed, 323 insertions(+), 358 deletions(-)
diff --git a/configure.ac b/configure.ac @@ -562,7 +562,7 @@ dnl ** GTK user interface ** dnl ************************ dnl Checks for GTK -PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.2 cairo) +PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.16 cairo) AC_ARG_ENABLE(deprecated, [ --disable-deprecated Disable deprecated GTK functions], [GTK_CFLAGS="$GTK_CFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"], []) diff --git a/src/addrcustomattr.c b/src/addrcustomattr.c @@ -1,6 +1,6 @@ /* * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2007-2013 The Claws Mail Team + * Copyright (C) 2007-2018 The Claws Mail Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,7 +14,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. - * */ #ifdef HAVE_CONFIG_H @@ -474,7 +473,7 @@ static void custom_attr_window_create(void) hbox1 = gtk_hbox_new(FALSE, 6); new_attr_label = gtk_label_new(_("New attribute name:")); - gtk_misc_set_alignment(GTK_MISC(new_attr_label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(new_attr_label), 0.0); gtk_box_pack_start(GTK_BOX(hbox1), new_attr_label, FALSE, FALSE, 0); new_attr_entry = gtk_entry_new(); @@ -514,7 +513,7 @@ static void custom_attr_window_create(void) "affect attributes already set for contacts.")); gtk_widget_set_size_request(GTK_WIDGET(label), 380, -1); gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_box_pack_start(GTK_BOX(vbox1), label, FALSE, TRUE, 0); scrolledwin = gtk_scrolled_window_new(NULL, NULL); diff --git a/src/addressadd.c b/src/addressadd.c @@ -1,6 +1,6 @@ /* - * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2001-2012 Match Grun and the Claws Mail team + * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client + * Copyright (C) 2001-2018 Match Grun and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,7 +14,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. - * */ /* @@ -214,7 +213,7 @@ static void addressadd_create( void ) { top = 0; label = gtk_label_new(_("Name")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); entry_name = gtk_entry_new(); gtk_widget_set_size_request(entry_name, 150, -1); @@ -226,18 +225,18 @@ static void addressadd_create( void ) { top = 1; label = gtk_label_new(_("Address")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); label_addr = gtk_label_new(""); gtk_widget_set_size_request(label_addr, 150, -1); gtk_table_attach(GTK_TABLE(table), label_addr, 1, 2, top, (top + 1), GTK_FILL | GTK_EXPAND, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_addr), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label_addr), 0.0); /* Third row */ top = 2; label = gtk_label_new(_("Remarks")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); entry_rems = gtk_entry_new(); gtk_widget_set_size_request(entry_rems, 150, -1); diff --git a/src/addrgather.c b/src/addrgather.c @@ -359,18 +359,18 @@ static void addrgather_page_fields(gint pageNum, gchar *pageLbl) top = 0; label = gtk_label_new(_("Current folder:")); gtk_table_attach( GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0 ); - gtk_misc_set_alignment( GTK_MISC(label), 1.0, 0.5 ); + gtk_label_set_xalign(GTK_LABEL(label), 1.0); labelFolder = gtk_label_new(""); gtk_table_attach( GTK_TABLE(table), labelFolder, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0 ); - gtk_misc_set_alignment( GTK_MISC(labelFolder), 0, 0.5 ); + gtk_label_set_xalign(GTK_LABEL(labelFolder), 0.0); /* Second row */ top = 1; label = gtk_label_new(_("Address book name:")); gtk_table_attach( GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0 ); - gtk_misc_set_alignment( GTK_MISC(label), 1.0, 0.5 ); + gtk_label_set_xalign(GTK_LABEL(label), 1.0); #ifndef USE_ALT_ADDRBOOK entryBook = gtk_entry_new(); @@ -397,7 +397,7 @@ static void addrgather_page_fields(gint pageNum, gchar *pageLbl) top = 2; label = gtk_label_new(_("Address book folder size:")); gtk_table_attach( GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0 ); - gtk_misc_set_alignment( GTK_MISC(label), 1.0, 0.5 ); + gtk_label_set_xalign(GTK_LABEL(label), 1.0); CLAWS_SET_TIP(label, _("Maximum amount of entries per folder within the newly created address book")); diff --git a/src/alertpanel.c b/src/alertpanel.c @@ -292,7 +292,8 @@ static void alertpanel_create(const gchar *title, (GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG); break; } - gtk_misc_set_alignment(GTK_MISC(image), 0.5, 0.0); + gtk_widget_set_halign(image, GTK_ALIGN_CENTER); + gtk_widget_set_valign(image, GTK_ALIGN_START); gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0); vbox = gtk_vbox_new (FALSE, 12); @@ -300,7 +301,7 @@ static void alertpanel_create(const gchar *title, gtk_widget_show (vbox); label = gtk_label_new(title_full); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT); gtk_label_set_use_markup(GTK_LABEL (label), TRUE); gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); @@ -321,7 +322,7 @@ static void alertpanel_create(const gchar *title, g_free(title_full); label = gtk_label_new(message); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT); gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); gtk_label_set_selectable(GTK_LABEL(label), TRUE); diff --git a/src/browseldap.c b/src/browseldap.c @@ -1,6 +1,6 @@ /* - * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2003-2012 Match Grun and the Claws Mail team + * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client + * Copyright (C) 2003-2018 Match Grun and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,7 +14,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. - * */ /* @@ -238,21 +237,21 @@ static void browse_create( void ) { top = 0; label = gtk_label_new(_("Server Name:")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 1.0); label_server = gtk_label_new(""); gtk_table_attach(GTK_TABLE(table), label_server, 1, 2, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_server), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label_server), 0.0); /* Second row */ top++; label = gtk_label_new(_("Distinguished Name (dn):")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 1.0); label_addr = gtk_label_new(""); gtk_table_attach(GTK_TABLE(table), label_addr, 1, 2, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_addr), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label_addr), 0.0); /* Address book/folder tree */ vlbox = gtk_vbox_new(FALSE, 8); diff --git a/src/compose.c b/src/compose.c @@ -9373,7 +9373,7 @@ static void compose_attach_property(GtkAction *action, gpointer data) label = gtk_label_new(str); \ gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), \ GTK_FILL, 0, 0, 0); \ - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); \ + gtk_label_set_xalign(GTK_LABEL(label), 0.0); \ \ entry = gtk_entry_new(); \ gtk_table_attach(GTK_TABLE(table), entry, 1, 2, top, (top + 1), \ @@ -9423,7 +9423,7 @@ static void compose_attach_property_create(gboolean *cancelled) label = gtk_label_new(_("MIME type")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, (0 + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); mimetype_entry = gtk_combo_box_text_new_with_entry(); gtk_table_attach(GTK_TABLE(table), mimetype_entry, 1, 2, 0, (0 + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0); @@ -9456,7 +9456,7 @@ static void compose_attach_property_create(gboolean *cancelled) label = gtk_label_new(_("Encoding")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); hbox = gtk_hbox_new(FALSE, 0); gtk_table_attach(GTK_TABLE(table), hbox, 1, 2, 1, 2, diff --git a/src/crash.c b/src/crash.c @@ -202,7 +202,7 @@ static GtkWidget *crash_dialog_show(const gchar *text, const gchar *debug_output (g_strdup_printf(_("%s.\nPlease file a bug report and include the information below."), text)); gtk_widget_show(label1); gtk_box_pack_start(GTK_BOX(hbox1), label1, TRUE, TRUE, 0); - gtk_misc_set_alignment(GTK_MISC(label1), 7.45058e-09, 0.5); + gtk_label_set_xalign(GTK_LABEL(label1), 0.0); frame1 = gtk_frame_new(_("Debug log")); gtk_widget_show(frame1); diff --git a/src/editaddress.c b/src/editaddress.c @@ -934,7 +934,7 @@ static void addressbook_edit_person_page_basic( gint pageNum, gchar *pageLbl ) { label = gtk_label_new(text); \ gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), \ GTK_FILL, 0, 0, 0); \ - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); \ + gtk_label_set_xalign(GTK_LABEL(label), 0.0); \ \ entry = gtk_entry_new(); \ gtk_table_attach(GTK_TABLE(table), entry, 1, 2, top, (top + 1), \ @@ -1113,7 +1113,7 @@ static void addressbook_edit_person_page_email( gint pageNum, gchar *pageLbl ) { top = 0; label = gtk_label_new(_("Email Address")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_table_attach(GTK_TABLE(table), entry_email, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0); @@ -1122,7 +1122,7 @@ static void addressbook_edit_person_page_email( gint pageNum, gchar *pageLbl ) { ++top; label = gtk_label_new(_("Alias")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_table_attach(GTK_TABLE(table), entry_alias, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0); @@ -1130,7 +1130,7 @@ static void addressbook_edit_person_page_email( gint pageNum, gchar *pageLbl ) { ++top; label = gtk_label_new(_("Remarks")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_table_attach(GTK_TABLE(table), entry_remarks, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0); #endif @@ -1320,7 +1320,7 @@ static void addressbook_edit_person_page_attrib( gint pageNum, gchar *pageLbl ) #ifndef GENERIC_UMPC label = gtk_label_new(_("Name")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); entry_name = gtk_combo_box_text_new_with_entry (); gtk_table_attach(GTK_TABLE(table), entry_name, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0); @@ -1329,14 +1329,14 @@ static void addressbook_edit_person_page_attrib( gint pageNum, gchar *pageLbl ) ++top; label = gtk_label_new(_("Value")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); entry_value = gtk_entry_new(); gtk_table_attach(GTK_TABLE(table), entry_value, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0); #else label = gtk_label_new(_("Name")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); entry_name = gtk_combo_box_text_new_with_entry (); gtk_table_attach(GTK_TABLE(table), entry_name, 1, 2, 0, 1, GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0); @@ -1345,7 +1345,7 @@ static void addressbook_edit_person_page_attrib( gint pageNum, gchar *pageLbl ) ++top; label = gtk_label_new(_("Value")); gtk_table_attach(GTK_TABLE(table), label, 2, 3, 0, 1, GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); entry_value = gtk_entry_new(); gtk_table_attach(GTK_TABLE(table), entry_value, 3, 4, 0, 1, GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0); diff --git a/src/editaddress_other_attributes_ldap.c b/src/editaddress_other_attributes_ldap.c @@ -1,6 +1,6 @@ /* - * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2012 Michael Rasmussen and the Claws Mail team + * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client + * Copyright (C) 1999-2018 Michael Rasmussen and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,7 +14,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. - * */ #ifdef HAVE_CONFIG_H @@ -349,7 +348,7 @@ void addressbook_edit_person_page_attrib_ldap(PersonEditDlg *dialog, gint pageNu top = 0; label = gtk_label_new(N_("Name")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gchar **attribute = (gchar **) ATTRIBUTE; @@ -370,7 +369,7 @@ void addressbook_edit_person_page_attrib_ldap(PersonEditDlg *dialog, gint pageNu ++top; label = gtk_label_new(N_("Value")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); entry_value = gtk_entry_new(); gtk_table_attach(GTK_TABLE(table), entry_value, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0); diff --git a/src/editbook.c b/src/editbook.c @@ -1,6 +1,6 @@ /* - * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2001-2012 Match Grun and the Claws Mail team + * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client + * Copyright (C) 2001-2018 Match Grun and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,7 +14,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. - * */ /* @@ -169,7 +168,7 @@ static void addressbook_edit_book_create( gboolean *cancelled ) { top = 0; label = gtk_label_new(_("Name")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); name_entry = gtk_entry_new(); gtk_table_attach(GTK_TABLE(table), name_entry, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0); @@ -181,15 +180,12 @@ static void addressbook_edit_book_create( gboolean *cancelled ) { top = 1; label = gtk_label_new(_("File")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); file_label = gtk_label_new( "" ); - gtk_misc_set_alignment(GTK_MISC(file_label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(file_label), 0.0); gtk_table_attach(GTK_TABLE(table), file_label, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0); - /* file_btn = gtk_button_new_with_label( _(" ... ")); */ - /* gtk_table_attach(GTK_TABLE(table), file_btn, 2, 3, top, (top + 1), GTK_FILL, 0, 3, 0); */ - /* Status line */ hsbox = gtk_hbox_new(FALSE, 0); gtk_box_pack_end(GTK_BOX(vbox), hsbox, FALSE, FALSE, BORDER_WIDTH); diff --git a/src/editgroup.c b/src/editgroup.c @@ -1,6 +1,6 @@ /* - * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team + * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client + * Copyright (C) 1999-2018 Hiroyuki Yamamoto and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,7 +14,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. - * */ #ifdef HAVE_CONFIG_H @@ -322,7 +321,7 @@ static void addressbook_edit_group_create( gboolean *cancelled ) { top = 0; label = gtk_label_new(_("Group Name")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); entry_name = gtk_entry_new(); gtk_table_attach(GTK_TABLE(table), entry_name, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0); diff --git a/src/editjpilot.c b/src/editjpilot.c @@ -1,6 +1,6 @@ /* - * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2001-2012 Match Grun and the Claws Mail team + * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client + * Copyright (C) 2001-2018 Match Grun and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,7 +14,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. - * */ /* @@ -256,7 +255,7 @@ static void addressbook_edit_jpilot_create( gboolean *cancelled ) { top = 0; label = gtk_label_new(_("Name")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); name_entry = gtk_entry_new(); gtk_table_attach(GTK_TABLE(table), name_entry, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0); @@ -268,7 +267,7 @@ static void addressbook_edit_jpilot_create( gboolean *cancelled ) { top = 1; label = gtk_label_new(_("File")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); file_entry = gtk_entry_new(); gtk_table_attach(GTK_TABLE(table), file_entry, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0); @@ -290,7 +289,7 @@ static void addressbook_edit_jpilot_create( gboolean *cancelled ) { gtk_box_pack_start( GTK_BOX(hlbox), custom_check[i], FALSE, FALSE, 0 ); gtk_box_pack_start( GTK_BOX(hlbox), custom_label[i], TRUE, TRUE, 0 ); gtk_box_pack_start( GTK_BOX(vbox_custom), hlbox, TRUE, TRUE, 0 ); - gtk_misc_set_alignment(GTK_MISC(custom_label[i]), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(custom_label[1]), 0.0); top++; } gtk_container_add (GTK_CONTAINER (frame_custom), vbox_custom); diff --git a/src/editldap.c b/src/editldap.c @@ -426,7 +426,7 @@ static void addressbook_edit_ldap_page_basic( gint pageNum, gchar *pageLbl ) { top = 0; label = gtk_label_new(_("Name")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); entry_name = gtk_entry_new(); gtk_table_attach(GTK_TABLE(table), entry_name, 1, 2, top, (top + 1), @@ -439,7 +439,7 @@ static void addressbook_edit_ldap_page_basic( gint pageNum, gchar *pageLbl ) { ++top; label = gtk_label_new(_("Hostname")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); entry_server = gtk_entry_new(); gtk_table_attach(GTK_TABLE(table), entry_server, 1, 2, top, (top + 1), @@ -456,7 +456,7 @@ static void addressbook_edit_ldap_page_basic( gint pageNum, gchar *pageLbl ) { ++top; label = gtk_label_new(_("Port")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); hbox_spin = gtk_hbox_new (FALSE, 8); spinbtn_port_adj = GTK_ADJUSTMENT(gtk_adjustment_new (389, 1, 65535, 1, 1000, 0)); @@ -500,7 +500,7 @@ static void addressbook_edit_ldap_page_basic( gint pageNum, gchar *pageLbl ) { ++top; label = gtk_label_new(_("Search Base")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); entry_baseDN = gtk_entry_new(); gtk_table_attach(GTK_TABLE(table), entry_baseDN, 1, 2, top, (top + 1), @@ -576,7 +576,7 @@ static void addressbook_edit_ldap_page_search( gint pageNum, gchar *pageLbl ) { top = 0; label = gtk_label_new(_("Search Attributes")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); entry_criteria = gtk_entry_new(); gtk_table_attach(GTK_TABLE(table), entry_criteria, 1, 2, top, (top + 1), @@ -598,7 +598,7 @@ static void addressbook_edit_ldap_page_search( gint pageNum, gchar *pageLbl ) { ++top; label = gtk_label_new(_("Max Query Age (secs)")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); hbox_spin = gtk_hbox_new (FALSE, 8); spinbtn_queryage_adj = GTK_ADJUSTMENT(gtk_adjustment_new( @@ -708,7 +708,7 @@ static void addressbook_edit_ldap_page_extended( gint pageNum, gchar *pageLbl ) top = 0; label = gtk_label_new(_("Bind DN")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); entry_bindDN = gtk_entry_new(); gtk_table_attach(GTK_TABLE(table), entry_bindDN, 1, 3, top, (top + 1), @@ -724,7 +724,7 @@ static void addressbook_edit_ldap_page_extended( gint pageNum, gchar *pageLbl ) ++top; label = gtk_label_new(_("Bind Password")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); entry_bindPW = gtk_entry_new(); gtk_table_attach(GTK_TABLE(table), entry_bindPW, 1, 2, top, (top + 1), @@ -746,7 +746,7 @@ static void addressbook_edit_ldap_page_extended( gint pageNum, gchar *pageLbl ) ++top; label = gtk_label_new(_("Timeout (secs)")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); hbox_spin = gtk_hbox_new (FALSE, 8); spinbtn_timeout_adj = GTK_ADJUSTMENT(gtk_adjustment_new (0, 0, 300, 1, 10, 0)); @@ -763,7 +763,7 @@ static void addressbook_edit_ldap_page_extended( gint pageNum, gchar *pageLbl ) ++top; label = gtk_label_new(_("Maximum Entries")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); hbox_spin = gtk_hbox_new (FALSE, 8); spinbtn_maxentry_adj = GTK_ADJUSTMENT(gtk_adjustment_new (0, 0, 500, 1, 10, 0)); diff --git a/src/editldap_basedn.c b/src/editldap_basedn.c @@ -154,27 +154,27 @@ static void edit_ldap_bdn_create(void) { top = 0; label = gtk_label_new(_("Hostname")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); host_label = gtk_label_new(""); gtk_table_attach(GTK_TABLE(table), host_label, 1, 2, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(host_label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(host_label), 0.0); /* Second row */ top = 1; label = gtk_label_new(_("Port")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); port_label = gtk_label_new(""); gtk_table_attach(GTK_TABLE(table), port_label, 1, 2, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(port_label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(port_label), 0.0); /* Third row */ top = 2; label = gtk_label_new(_("Search Base")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); basedn_entry = gtk_entry_new(); gtk_table_attach(GTK_TABLE(table), basedn_entry, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0); diff --git a/src/edittags.c b/src/edittags.c @@ -1,6 +1,6 @@ /* * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2007-2013 The Claws Mail Team + * Copyright (C) 2007-2018 Colin Leroy and The Claws Mail Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,7 +14,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. - * */ #ifdef HAVE_CONFIG_H @@ -544,7 +543,7 @@ static void apply_window_create(void) hbox1 = gtk_hbox_new(FALSE, 6); new_tag_label = gtk_label_new(_("New tag:")); - gtk_misc_set_alignment(GTK_MISC(new_tag_label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(new_tag_label), 0.0); gtk_box_pack_start(GTK_BOX(hbox1), new_tag_label, FALSE, FALSE, 0); new_tag_entry = gtk_entry_new(); @@ -577,7 +576,7 @@ static void apply_window_create(void) taglist = apply_window_list_view_create(); label = gtk_label_new(_("Please select tags to apply/remove. Changes are immediate.")); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_box_pack_start(GTK_BOX(vbox1), label, FALSE, TRUE, 0); scrolledwin = gtk_scrolled_window_new(NULL, NULL); diff --git a/src/editvcard.c b/src/editvcard.c @@ -1,6 +1,6 @@ /* - * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2001-2012 Match Grun and the Claws Mail team + * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client + * Copyright (C) 2001-2018 Match Grun and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,7 +14,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. - * */ /* @@ -172,7 +171,7 @@ static void addressbook_edit_vcard_create( gboolean *cancelled ) { top = 0; label = gtk_label_new(_("Name")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); name_entry = gtk_entry_new(); gtk_table_attach(GTK_TABLE(table), name_entry, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0); @@ -184,7 +183,7 @@ static void addressbook_edit_vcard_create( gboolean *cancelled ) { top = 1; label = gtk_label_new(_("File")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); file_entry = gtk_entry_new(); gtk_table_attach(GTK_TABLE(table), file_entry, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0); diff --git a/src/exphtmldlg.c b/src/exphtmldlg.c @@ -371,19 +371,19 @@ static void export_html_page_file( gint pageNum, gchar *pageLbl ) { label = gtk_label_new( _( "Address Book" ) ); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); labelBook = gtk_label_new( "Address book name goes here" ); gtk_table_attach(GTK_TABLE(table), labelBook, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(labelBook), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(labelBook), 0.0); /* Second row */ top++; label = gtk_label_new( _( "HTML Output File" ) ); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); entryHtml = gtk_entry_new(); gtk_table_attach(GTK_TABLE(table), entryHtml, 1, 2, top, (top + 1), @@ -445,7 +445,7 @@ static void export_html_page_format( gint pageNum, gchar *pageLbl ) { label = gtk_label_new( _( "Stylesheet" ) ); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); optmenuCSS = gtkut_sc_combobox_create(NULL, TRUE); menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(optmenuCSS))); @@ -466,7 +466,7 @@ static void export_html_page_format( gint pageNum, gchar *pageLbl ) { label = gtk_label_new( _( "Full Name Format" ) ); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); optmenuName = gtkut_sc_combobox_create(NULL, TRUE); menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(optmenuName))); @@ -538,21 +538,21 @@ static void export_html_page_finish( gint pageNum, gchar *pageLbl ) { top = 0; label = gtk_label_new( _( "Address Book:" ) ); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 1.0); labelBook = gtk_label_new("Full name of address book goes here"); gtk_table_attach(GTK_TABLE(table), labelBook, 1, 2, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(labelBook), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(labelBook), 0.0); /* Second row */ top++; label = gtk_label_new( _( "File Name:" ) ); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 1.0); labelFile = gtk_label_new("File name goes here"); gtk_table_attach(GTK_TABLE(table), labelFile, 1, 2, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(labelFile), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(labelFile), 0.0); /* Third row */ top++; diff --git a/src/expldifdlg.c b/src/expldifdlg.c @@ -388,19 +388,19 @@ static void export_ldif_page_file( gint pageNum, gchar *pageLbl ) { label = gtk_label_new( _( "Address Book" ) ); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); labelBook = gtk_label_new( "Address book name goes here" ); gtk_table_attach(GTK_TABLE(table), labelBook, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(labelBook), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(labelBook), 0.0); /* Second row */ top++; label = gtk_label_new( _( "LDIF Output File" ) ); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); entryLdif = gtk_entry_new(); gtk_table_attach(GTK_TABLE(table), entryLdif, 1, 2, top, (top + 1), @@ -489,7 +489,7 @@ static void export_ldif_page_dn( gint pageNum, gchar *pageLbl ) { label = gtk_label_new( _( "Suffix" ) ); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); entrySuffix = gtk_entry_new(); gtk_table_attach(GTK_TABLE(table), entrySuffix, 1, 2, top, (top + 1), @@ -507,7 +507,7 @@ static void export_ldif_page_dn( gint pageNum, gchar *pageLbl ) { label = gtk_label_new( _( "Relative DN" ) ); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); optmenuRDN = gtkut_sc_combobox_create(NULL, TRUE); store = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(optmenuRDN))); @@ -611,21 +611,21 @@ static void export_ldif_page_finish( gint pageNum, gchar *pageLbl ) { top = 0; label = gtk_label_new( _( "Address Book:" ) ); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 1.0); labelBook = gtk_label_new("Full name of address book goes here"); gtk_table_attach(GTK_TABLE(table), labelBook, 1, 2, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(labelBook), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(labelBook), 0.0); /* Second row */ top++; label = gtk_label_new( _( "File Name:" ) ); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 1.0); labelFile = gtk_label_new("File name goes here"); gtk_table_attach(GTK_TABLE(table), labelFile, 1, 2, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(labelFile), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(labelFile), 0.0); gtk_widget_show_all(vbox); diff --git a/src/export.c b/src/export.c @@ -1,6 +1,6 @@ /* - * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2017 Hiroyuki Yamamoto and the Claws Mail team + * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client + * Copyright (C) 1999-2018 Hiroyuki Yamamoto and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,7 +14,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. - * */ #ifdef HAVE_CONFIG_H @@ -143,13 +142,13 @@ static void export_create(void) gtk_table_attach(GTK_TABLE(table), src_label, 0, 1, 0, 1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_EXPAND|GTK_FILL), 0, 0); - gtk_misc_set_alignment(GTK_MISC(src_label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(src_label), 1.0); file_label = gtk_label_new(_("Mbox file:")); gtk_table_attach(GTK_TABLE(table), file_label, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_EXPAND|GTK_FILL), 0, 0); - gtk_misc_set_alignment(GTK_MISC(file_label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(file_label), 1.0); src_entry = gtk_entry_new(); gtk_table_attach(GTK_TABLE(table), src_entry, 1, 2, 0, 1, diff --git a/src/folderview.c b/src/folderview.c @@ -363,13 +363,13 @@ static void folderview_column_set_titles(FolderView *folderview) /* left justified */ gtk_box_pack_start(GTK_BOX(hbox_folder), label_folder, TRUE, TRUE, 0); - gtk_misc_set_alignment (GTK_MISC (label_folder), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label_folder), 0.0); gtk_box_pack_start(GTK_BOX(hbox_new), label_new, TRUE, TRUE, 0); - gtk_misc_set_alignment (GTK_MISC (label_new), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label_new), 1.0); gtk_box_pack_start(GTK_BOX(hbox_unread), label_unread, TRUE, TRUE, 0); - gtk_misc_set_alignment (GTK_MISC (label_unread), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label_unread), 1.0); gtk_box_pack_start(GTK_BOX(hbox_total), label_total, TRUE, TRUE, 0); - gtk_misc_set_alignment (GTK_MISC (label_total), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label_total), 1.0); gtk_widget_show_all(hbox_folder); gtk_widget_show_all(hbox_new); diff --git a/src/gtk/colorlabel.c b/src/gtk/colorlabel.c @@ -1,6 +1,6 @@ /* - * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2001-2012 Hiroyuki Yamamoto & The Claws Mail Team + * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client + * Copyright (C) 2001-2018 Hiroyuki Yamamoto & The Claws Mail Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,7 +14,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. - * */ /* (alfons) - based on a contribution by Satoshi Nagayasu; revised for colorful @@ -355,14 +354,14 @@ GtkWidget *colorlabel_create_check_color_menu_item(gint color_index, gboolean fo accel = gtk_accelerator_get_label(GDK_KEY_1+color_index, GDK_CONTROL_MASK); label = gtk_label_new(accel); gtk_widget_show(label); - gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 1.0); g_free(accel); gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 4); g_object_set_data(G_OBJECT(item), "accel_label", label); } else { label = gtk_label_new(""); gtk_widget_show(label); - gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 1.0); gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 4); g_object_set_data(G_OBJECT(item), "accel_label", label); } diff --git a/src/gtk/description_window.c b/src/gtk/description_window.c @@ -1,6 +1,6 @@ /* - * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team + * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client + * Copyright (C) 1999-2018 Hiroyuki Yamamoto and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,7 +14,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. - * */ #ifdef HAVE_CONFIG_H @@ -121,7 +120,8 @@ static void description_create(DescriptionWindow * dwindow) gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT); gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); gtk_label_set_use_markup(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment (GTK_MISC(label), 0, 0); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); + gtk_label_set_yalign(GTK_LABEL(label), 0.0); gtk_table_attach(GTK_TABLE(table), label, col, colend, line, line+1, (GtkAttachOptions) (GTK_FILL), diff --git a/src/gtk/gtkaspell.c b/src/gtk/gtkaspell.c @@ -1468,8 +1468,9 @@ static void replace_with_create_dialog_cb(GtkWidget *w, gpointer data) utf8buf); icon = gtk_image_new_from_stock(GTK_STOCK_DIALOG_QUESTION, - GTK_ICON_SIZE_DIALOG); - gtk_misc_set_alignment (GTK_MISC (icon), 0.5, 0.0); + GTK_ICON_SIZE_DIALOG); + gtk_widget_set_halign(icon, GTK_ALIGN_CENTER); + gtk_widget_set_valign(icon, GTK_ALIGN_START); gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0); vbox = gtk_vbox_new (FALSE, 12); @@ -1477,7 +1478,7 @@ static void replace_with_create_dialog_cb(GtkWidget *w, gpointer data) gtk_widget_show (vbox); label = gtk_label_new(thelabel); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT); gtk_label_set_use_markup (GTK_LABEL (label), TRUE); gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); @@ -1509,7 +1510,7 @@ static void replace_with_create_dialog_cb(GtkWidget *w, gpointer data) label = gtk_label_new(_("Holding down Control key while pressing " "Enter\nwill learn from mistake.\n")); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT); gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); gtk_widget_show(label); @@ -1873,7 +1874,6 @@ static GSList *make_sug_menu(GtkAspell *gtkaspell) g_free(utf8buf); gtk_widget_show(item); list = g_slist_append(list, item); - gtk_misc_set_alignment(GTK_MISC(gtk_bin_get_child(GTK_BIN((item)))), 0.5, 0.5); g_free(caption); item = gtk_menu_item_new(); @@ -2012,7 +2012,6 @@ static GSList *populate_submenu(GtkAspell *gtkaspell) dictname = g_strdup_printf(_("Dictionary: %s"), gtkaspeller->dictionary->dictname); item = gtk_menu_item_new_with_label(dictname); - gtk_misc_set_alignment(GTK_MISC(gtk_bin_get_child(GTK_BIN((item)))), 0.5, 0.5); g_free(dictname); submenu = make_dictionary_list_submenu(gtkaspell); gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu); diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c @@ -790,7 +790,6 @@ GtkWidget *label_window_create(const gchar *str) gtk_container_add(GTK_CONTAINER(window), vbox); gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment(GTK_MISC(label), 0.5, 0.5); gtk_widget_show_all(vbox); gtk_widget_show_now(window); diff --git a/src/gtk/icon_legend.c b/src/gtk/icon_legend.c @@ -1,6 +1,6 @@ /* - * This file Copyright (C) 2005-2012 Paul Mangan <paul@claws-mail.org> - * and the Claws Mail team + * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client + * Copyright (C) 2005-2018 Paul Mangan and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,7 +14,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. - * */ #ifdef HAVE_CONFIG_H @@ -156,12 +155,13 @@ static void legend_create(void) for (i = 0, j = 0, k = 0; i < ICONS; ++i, ++k) { icon_label = stock_pixmap_widget(legend_icons[i]); - gtk_misc_set_alignment (GTK_MISC (icon_label), 0.5, 0.5); + gtk_widget_set_halign(icon_label, GTK_ALIGN_CENTER); + gtk_widget_set_valign(icon_label, GTK_ALIGN_CENTER); gtk_table_attach(GTK_TABLE(table), icon_label, j, j + 1, k, k + 1, GTK_FILL, 0, 0, 0); desc_label = gtk_label_new(gettext(legend_icon_desc[i])); - gtk_misc_set_alignment (GTK_MISC (desc_label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(desc_label), 0.0); gtk_label_set_line_wrap(GTK_LABEL(desc_label), TRUE); gtk_table_attach(GTK_TABLE(table), desc_label, j + 1, j + 2, k, k + 1, GTK_FILL, 0, 0, 0); diff --git a/src/gtk/inputdialog.c b/src/gtk/inputdialog.c @@ -1,6 +1,6 @@ /* - * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team + * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client + * Copyright (C) 1999-2018 Hiroyuki Yamamoto and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,7 +14,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. - * */ #ifdef HAVE_CONFIG_H @@ -313,11 +312,13 @@ static void input_dialog_create(gboolean is_password) /* for title label */ icon_q = gtk_image_new_from_stock(GTK_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG); - gtk_misc_set_alignment (GTK_MISC (icon_q), 0.5, 0.0); + gtk_widget_set_halign(icon_q, GTK_ALIGN_CENTER); + gtk_widget_set_valign(icon_q, GTK_ALIGN_START); gtk_box_pack_start (GTK_BOX (hbox), icon_q, FALSE, FALSE, 0); icon_p = gtk_image_new_from_stock(GTK_STOCK_DIALOG_AUTHENTICATION, GTK_ICON_SIZE_DIALOG); - gtk_misc_set_alignment (GTK_MISC (icon_p), 0.5, 0.0); + gtk_widget_set_halign(icon_p, GTK_ALIGN_CENTER); + gtk_widget_set_valign(icon_p, GTK_ALIGN_START); gtk_box_pack_start (GTK_BOX (hbox), icon_p, FALSE, FALSE, 0); vbox = gtk_vbox_new (FALSE, 12); @@ -325,7 +326,7 @@ static void input_dialog_create(gboolean is_password) gtk_widget_show (vbox); msg_title = gtk_label_new(""); - gtk_misc_set_alignment(GTK_MISC(msg_title), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(msg_title), 0.0); gtk_label_set_justify(GTK_LABEL(msg_title), GTK_JUSTIFY_LEFT); gtk_label_set_use_markup (GTK_LABEL (msg_title), TRUE); gtk_box_pack_start(GTK_BOX(vbox), msg_title, FALSE, FALSE, 0); @@ -345,7 +346,7 @@ static void input_dialog_create(gboolean is_password) gtk_widget_modify_font(msg_title, font_desc); msg_label = gtk_label_new(""); - gtk_misc_set_alignment(GTK_MISC(msg_label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(msg_label), 0.0); gtk_label_set_justify(GTK_LABEL(msg_label), GTK_JUSTIFY_LEFT); gtk_box_pack_start(GTK_BOX(vbox), msg_label, FALSE, FALSE, 0); gtk_widget_show(msg_label); diff --git a/src/gtk/pluginwindow.c b/src/gtk/pluginwindow.c @@ -351,7 +351,7 @@ void pluginwindow_create() label13 = gtk_label_new(_("Description")); gtk_widget_show(label13); gtk_container_add(GTK_CONTAINER(frame2), label13); - gtk_misc_set_alignment(GTK_MISC(label13), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label13), 0.0); gtk_misc_set_padding(GTK_MISC(label13), 2, 2); scrolledwindow3 = gtk_scrolled_window_new(NULL, NULL); @@ -377,7 +377,7 @@ void pluginwindow_create() gtk_label_set_markup(GTK_LABEL(desc_lbl), markup); g_free(markup); g_free(span); - gtk_misc_set_alignment(GTK_MISC(desc_lbl), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(desc_lbl), 0.0); gtk_widget_show(desc_lbl); gtk_box_pack_start(GTK_BOX(hbox_info), desc_lbl, FALSE, FALSE, 0); diff --git a/src/gtk/prefswindow.c b/src/gtk/prefswindow.c @@ -1,6 +1,6 @@ /* - * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail Team + * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client + * Copyright (C) 1999-2018 Hiroyuki Yamamoto and the Claws Mail Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,7 +14,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. - * */ #ifdef HAVE_CONFIG_H @@ -474,7 +473,8 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages, prefswindow->pagelabel = gtk_label_new(""); gtk_widget_show(prefswindow->pagelabel); gtk_label_set_justify(GTK_LABEL(prefswindow->pagelabel), GTK_JUSTIFY_LEFT); - gtk_misc_set_alignment(GTK_MISC(prefswindow->pagelabel), 0, 0.0); + gtk_label_set_xalign(GTK_LABEL(prefswindow->pagelabel), 0.0); + gtk_label_set_yalign(GTK_LABEL(prefswindow->pagelabel), 0.0); gtk_container_add(GTK_CONTAINER(prefswindow->labelframe), prefswindow->pagelabel); prefswindow->notebook = gtk_notebook_new(); diff --git a/src/gtk/sslcertwindow.c b/src/gtk/sslcertwindow.c @@ -1,7 +1,6 @@ /* * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2016 Colin Leroy <colin@colino.net> - * and the Claws Mail team + * Copyright (C) 1999-2018 Colin Leroy and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,7 +14,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. - * */ #ifdef HAVE_CONFIG_H @@ -168,76 +166,76 @@ static GtkWidget *cert_presenter(SSLCertificate *cert) status_table = GTK_TABLE(gtk_table_new(3, 2, FALSE)); label = gtk_label_new(_("Name: ")); - gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 1.0); gtk_table_attach(owner_table, label, 0, 1, 0, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0); label = gtk_label_new(subject_commonname); gtk_label_set_selectable(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_table_attach(owner_table, label, 1, 2, 0, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0); label = gtk_label_new(_("Organization: ")); - gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 1.0); gtk_table_attach(owner_table, label, 0, 1, 1, 2, GTK_EXPAND|GTK_FILL, 0, 0, 0); label = gtk_label_new(subject_organization); gtk_label_set_selectable(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_table_attach(owner_table, label, 1, 2, 1, 2, GTK_EXPAND|GTK_FILL, 0, 0, 0); label = gtk_label_new(_("Location: ")); - gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 1.0); gtk_table_attach(owner_table, label, 0, 1, 2, 3, GTK_EXPAND|GTK_FILL, 0, 0, 0); label = gtk_label_new(subject_location); gtk_label_set_selectable(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_table_attach(owner_table, label, 1, 2, 2, 3, GTK_EXPAND|GTK_FILL, 0, 0, 0); label = gtk_label_new(_("Name: ")); - gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 1.0); gtk_table_attach(signer_table, label, 0, 1, 0, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0); label = gtk_label_new(issuer_commonname); gtk_label_set_selectable(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_table_attach(signer_table, label, 1, 2, 0, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0); label = gtk_label_new(_("Organization: ")); - gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 1.0); gtk_table_attach(signer_table, label, 0, 1, 1, 2, GTK_EXPAND|GTK_FILL, 0, 0, 0); label = gtk_label_new(issuer_organization); gtk_label_set_selectable(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_table_attach(signer_table, label, 1, 2, 1, 2, GTK_EXPAND|GTK_FILL, 0, 0, 0); label = gtk_label_new(_("Location: ")); - gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 1.0); gtk_table_attach(signer_table, label, 0, 1, 2, 3, GTK_EXPAND|GTK_FILL, 0, 0, 0); label = gtk_label_new(issuer_location); gtk_label_set_selectable(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_table_attach(signer_table, label, 1, 2, 2, 3, GTK_EXPAND|GTK_FILL, 0, 0, 0); label = gtk_label_new(_("Fingerprint: \n")); - gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 1.0); gtk_table_attach(status_table, label, 0, 1, 0, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0); fingerprint = g_strdup_printf("MD5: %s\nSHA1: %s", md5_fingerprint, sha1_fingerprint); label = gtk_label_new(fingerprint); g_free(fingerprint); gtk_label_set_selectable(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_table_attach(status_table, label, 1, 2, 0, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0); label = gtk_label_new(_("Signature status: ")); - gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 1.0); gtk_table_attach(status_table, label, 0, 1, 1, 2, GTK_EXPAND|GTK_FILL, 0, 0, 0); label = gtk_label_new(sig_status); gtk_label_set_selectable(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_table_attach(status_table, label, 1, 2, 1, 2, GTK_EXPAND|GTK_FILL, 0, 0, 0); label = gtk_label_new(_("Expires on: ")); - gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 1.0); gtk_table_attach(status_table, label, 0, 1, 2, 3, GTK_EXPAND|GTK_FILL, 0, 0, 0); label = gtk_label_new(exp_date); gtk_label_set_selectable(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_table_attach(status_table, label, 1, 2, 2, 3, GTK_EXPAND|GTK_FILL, 0, 0, 0); gtk_container_add(GTK_CONTAINER(frame_owner), GTK_WIDGET(owner_table)); @@ -339,7 +337,7 @@ static gboolean sslcertwindow_ask_new_cert(SSLCertificate *cert) g_free(invalid_str); label = gtk_label_new(buf); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0); g_free(buf); @@ -350,7 +348,7 @@ static gboolean sslcertwindow_ask_new_cert(SSLCertificate *cert) buf = g_strdup_printf(_("Signature status: %s"), sig_status); label = gtk_label_new(buf); gtk_label_set_selectable(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0); g_free(buf); g_free(sig_status); @@ -388,7 +386,7 @@ static gboolean sslcertwindow_ask_expired_cert(SSLCertificate *cert) g_free(invalid_str); label = gtk_label_new(buf); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0); g_free(buf); @@ -400,7 +398,7 @@ static gboolean sslcertwindow_ask_expired_cert(SSLCertificate *cert) buf = g_strdup_printf(_("Signature status: %s"), sig_status); label = gtk_label_new(buf); gtk_label_set_selectable(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0); g_free(buf); g_free(sig_status); @@ -437,12 +435,12 @@ static gboolean sslcertwindow_ask_changed_cert(SSLCertificate *old_cert, SSLCert vbox = gtk_vbox_new(FALSE, 5); label = gtk_label_new(_("New certificate:")); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_box_pack_end(GTK_BOX(vbox), new_cert_widget, TRUE, TRUE, 0); gtk_box_pack_end(GTK_BOX(vbox), label, TRUE, TRUE, 0); gtk_box_pack_end(GTK_BOX(vbox), gtk_separator_new(GTK_ORIENTATION_HORIZONTAL), TRUE, TRUE, 0); label = gtk_label_new(_("Known certificate:")); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_box_pack_end(GTK_BOX(vbox), old_cert_widget, TRUE, TRUE, 0); gtk_box_pack_end(GTK_BOX(vbox), label, TRUE, TRUE, 0); gtk_widget_show_all(vbox); @@ -452,7 +450,7 @@ static gboolean sslcertwindow_ask_changed_cert(SSLCertificate *old_cert, SSLCert g_free(invalid_str); label = gtk_label_new(buf); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_box_pack_start(GTK_BOX(vbox2), label, TRUE, TRUE, 0); g_free(buf); @@ -464,7 +462,7 @@ static gboolean sslcertwindow_ask_changed_cert(SSLCertificate *old_cert, SSLCert buf = g_strdup_printf(_("Signature status: %s"), sig_status); label = gtk_label_new(buf); gtk_label_set_selectable(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_box_pack_start(GTK_BOX(vbox2), label, TRUE, TRUE, 0); g_free(buf); g_free(sig_status); diff --git a/src/headerview.c b/src/headerview.c @@ -117,10 +117,10 @@ HeaderView *headerview_create(void) gtk_box_pack_start(GTK_BOX(hbox3), tags_header_label, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox3), tags_body_label, TRUE, TRUE, 0); - gtk_misc_set_alignment(GTK_MISC(to_body_label), 0, 0.5); - gtk_misc_set_alignment(GTK_MISC(ng_body_label), 0, 0.5); - gtk_misc_set_alignment(GTK_MISC(subject_body_label), 0, 0.5); - gtk_misc_set_alignment(GTK_MISC(tags_body_label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(to_body_label), 0.0); + gtk_label_set_xalign(GTK_LABEL(ng_body_label), 0.0); + gtk_label_set_xalign(GTK_LABEL(subject_body_label), 0.0); + gtk_label_set_xalign(GTK_LABEL(tags_body_label), 0.0); gtk_label_set_ellipsize(GTK_LABEL(to_body_label), PANGO_ELLIPSIZE_END); gtk_label_set_ellipsize(GTK_LABEL(ng_body_label), PANGO_ELLIPSIZE_END); gtk_label_set_ellipsize(GTK_LABEL(subject_body_label), PANGO_ELLIPSIZE_END); diff --git a/src/image_viewer.c b/src/image_viewer.c @@ -1,6 +1,6 @@ /* - * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team + * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client + * Copyright (C) 1999-2018 Hiroyuki Yamamoto and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,7 +14,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. - * */ #ifdef HAVE_CONFIG_H @@ -301,56 +300,56 @@ static MimeViewer *image_viewer_create(void) gtk_table_attach(GTK_TABLE(table1), label3, 0, 1, 0, 1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label3), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label3), 0.0); label4 = gtk_label_new(_("Filesize:")); gtk_widget_show(label4); gtk_table_attach(GTK_TABLE(table1), label4, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label4), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label4), 0.0); filename = gtk_label_new(""); gtk_widget_show(filename); gtk_table_attach(GTK_TABLE(table1), filename, 1, 3, 0, 1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(filename), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(filename), 0.0); filesize = gtk_label_new(""); gtk_widget_show(filesize); gtk_table_attach(GTK_TABLE(table1), filesize, 1, 3, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(filesize), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(filesize), 0.0); label5 = gtk_label_new(_("Content-Type:")); gtk_widget_show(label5); gtk_table_attach(GTK_TABLE(table1), label5, 0, 1, 2, 3, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label5), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label5), 0.0); content_type = gtk_label_new(""); gtk_widget_show(content_type); gtk_table_attach(GTK_TABLE(table1), content_type, 1, 3, 2, 3, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(content_type), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(content_type), 0.0); error_lbl = gtk_label_new(""); gtk_widget_show(error_lbl); gtk_table_attach(GTK_TABLE(table1), error_lbl, 0, 1, 3, 4, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(error_lbl), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(error_lbl), 0.0); error_msg = gtk_label_new(""); gtk_widget_show(error_msg); gtk_table_attach(GTK_TABLE(table1), error_msg, 1, 3, 3, 4, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(error_msg), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(error_msg), 0.0); load_button = gtk_button_new_with_label(_("Load Image")); gtk_widget_show(load_button); diff --git a/src/import.c b/src/import.c @@ -1,6 +1,6 @@ /* - * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team + * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client + * Copyright (C) 1999-2018 Hiroyuki Yamamoto and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,7 +14,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. - * */ #ifdef HAVE_CONFIG_H @@ -143,13 +142,13 @@ static void import_create(void) gtk_table_attach(GTK_TABLE(table), file_label, 0, 1, 0, 1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_EXPAND|GTK_FILL), 0, 0); - gtk_misc_set_alignment(GTK_MISC(file_label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(file_label), 1.0); dest_label = gtk_label_new(_("Destination folder:")); gtk_table_attach(GTK_TABLE(table), dest_label, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_EXPAND|GTK_FILL), 0, 0); - gtk_misc_set_alignment(GTK_MISC(dest_label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(dest_label), 1.0); file_entry = gtk_entry_new(); gtk_table_attach(GTK_TABLE(table), file_entry, 1, 2, 0, 1, diff --git a/src/importldif.c b/src/importldif.c @@ -543,7 +543,7 @@ static void imp_ldif_page_file( gint pageNum, gchar *pageLbl ) { label = gtk_label_new(_("Address Book")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); entryName = gtk_entry_new(); gtk_table_attach(GTK_TABLE(table), entryName, 1, 2, top, (top + 1), @@ -558,7 +558,7 @@ static void imp_ldif_page_file( gint pageNum, gchar *pageLbl ) { label = gtk_label_new(_("File Name")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); entryFile = gtk_entry_new(); gtk_table_attach(GTK_TABLE(table), entryFile, 1, 2, top, (top + 1), @@ -744,10 +744,10 @@ static void imp_ldif_page_fields( gint pageNum, gchar *pageLbl ) { label = gtk_label_new(_("LDIF Field")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); entryField = gtk_label_new( "" ); - gtk_misc_set_alignment(GTK_MISC(entryField), 0.01, 0.5); + gtk_label_set_xalign(GTK_LABEL(entryField), 0.0); gtk_table_attach(GTK_TABLE(table), entryField, 1, 3, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0); @@ -760,7 +760,7 @@ static void imp_ldif_page_fields( gint pageNum, gchar *pageLbl ) { */ eventBox = gtk_event_box_new(); gtk_container_add( GTK_CONTAINER(eventBox), label ); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_table_attach(GTK_TABLE(table), eventBox, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); @@ -853,31 +853,31 @@ static void imp_ldif_page_finish( gint pageNum, gchar *pageLbl ) { top = 0; label = gtk_label_new( _( "Address Book:" ) ); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 1.0); labelBook = gtk_label_new(""); gtk_table_attach(GTK_TABLE(table), labelBook, 1, 2, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(labelBook), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(labelBook), 0.0); /* Second row */ top++; label = gtk_label_new( _( "File Name:" ) ); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 1.0); labelFile = gtk_label_new(""); gtk_table_attach(GTK_TABLE(table), labelFile, 1, 2, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(labelFile), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(labelFile), 0.0); /* Third row */ top++; label = gtk_label_new( _("Records Imported:") ); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 1.0); labelRecs = gtk_label_new(""); gtk_table_attach(GTK_TABLE(table), labelRecs, 1, 2, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(labelRecs), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(labelRecs), 0.0); impldif_dlg.labelBook = labelBook; impldif_dlg.labelFile = labelFile; diff --git a/src/importmutt.c b/src/importmutt.c @@ -221,7 +221,7 @@ static void imp_mutt_create( gboolean *cancelled ) { top = 0; label = gtk_label_new(_("Name")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); name_entry = gtk_entry_new(); gtk_table_attach(GTK_TABLE(table), name_entry, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0); @@ -230,7 +230,7 @@ static void imp_mutt_create( gboolean *cancelled ) { top = 1; label = gtk_label_new(_("File")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); file_entry = gtk_entry_new(); gtk_table_attach(GTK_TABLE(table), file_entry, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0); diff --git a/src/importpine.c b/src/importpine.c @@ -220,7 +220,7 @@ static void imp_pine_create( gboolean *cancelled ) { top = 0; label = gtk_label_new(_("Name")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); name_entry = gtk_entry_new(); gtk_table_attach(GTK_TABLE(table), name_entry, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0); @@ -229,7 +229,7 @@ static void imp_pine_create( gboolean *cancelled ) { top = 1; label = gtk_label_new(_("File")); gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); file_entry = gtk_entry_new(); gtk_table_attach(GTK_TABLE(table), file_entry, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0); diff --git a/src/password_gtk.c b/src/password_gtk.c @@ -1,6 +1,6 @@ /* * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2016 The Claws Mail Team + * Copyright (C) 2016-2018 Andrej Kacian and The Claws Mail Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,7 +14,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. - * */ #ifdef HAVE_CONFIG_H @@ -134,7 +133,8 @@ void master_passphrase_change_dialog() icon = gtk_image_new_from_stock(GTK_STOCK_DIALOG_AUTHENTICATION, GTK_ICON_SIZE_DIALOG); - gtk_misc_set_alignment(GTK_MISC(icon), 0.5, 0.0); + gtk_widget_set_halign(icon, GTK_ALIGN_CENTER); + gtk_widget_set_valign(icon, GTK_ALIGN_START); gtk_box_pack_start(GTK_BOX(hbox), icon, FALSE, FALSE, 0); vbox = gtk_vbox_new(FALSE, 12); @@ -142,7 +142,7 @@ void master_passphrase_change_dialog() gtk_widget_show(vbox); msg_title = gtk_label_new(_("Changing master passphrase")); - gtk_misc_set_alignment(GTK_MISC(msg_title), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(msg_title), 0.0); gtk_label_set_justify(GTK_LABEL(msg_title), GTK_JUSTIFY_LEFT); gtk_label_set_use_markup (GTK_LABEL (msg_title), TRUE); gtk_box_pack_start(GTK_BOX(vbox), msg_title, FALSE, FALSE, 0); @@ -165,7 +165,7 @@ void master_passphrase_change_dialog() _("If a master passphrase is currently active, it\n" "needs to be entered.") ); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); gtk_widget_show(label); @@ -173,7 +173,7 @@ void master_passphrase_change_dialog() /* Old passphrase */ label = gtk_label_new(_("Old passphrase:")); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, 0, 0, 0); @@ -189,7 +189,7 @@ void master_passphrase_change_dialog() /* New passphrase */ label = gtk_label_new(_("New passphrase:")); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3, GTK_EXPAND | GTK_FILL, 0, 0, 0); @@ -200,7 +200,7 @@ void master_passphrase_change_dialog() /* New passphrase again */ label = gtk_label_new(_("Confirm passphrase:")); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 3, 4, GTK_EXPAND | GTK_FILL, 0, 0, 0); diff --git a/src/prefs_account.c b/src/prefs_account.c @@ -1067,19 +1067,19 @@ static void basic_create_widget_func(PrefsPage * _page, gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table1), label, 0, 1, 0, 1, GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL (label), 1.0); label = gtk_label_new (_("Mail address")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table1), label, 0, 1, 1, 2, GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL (label), 1.0); label = gtk_label_new (_("Organization")); gtk_widget_show (label); gtk_table_attach (GTK_TABLE (table1), label, 0, 1, 2, 3, GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL (label), 1.0); name_entry = gtk_entry_new (); gtk_widget_show (name_entry); @@ -1255,27 +1255,25 @@ static void basic_create_widget_func(PrefsPage * _page, gtk_widget_show (nntpserv_label); gtk_table_attach (GTK_TABLE (serv_table), nntpserv_label, 0, 1, 0, 1, GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment (GTK_MISC (nntpserv_label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL (nntpserv_label), 1.0); recvserv_label = gtk_label_new (_("Server for receiving")); gtk_widget_show (recvserv_label); gtk_table_attach (GTK_TABLE (serv_table), recvserv_label, 0, 1, 2, 3, GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment (GTK_MISC (recvserv_label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL (recvserv_label), 1.0); localmbox_label = gtk_label_new (_("Local mailbox")); gtk_widget_show (localmbox_label); gtk_table_attach (GTK_TABLE (serv_table), localmbox_label, 0, 1, 3, 4, GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment (GTK_MISC (localmbox_label), 1, 0.5); -/* gtk_table_set_row_spacing (GTK_TABLE (serv_table), 2, 0); */ + gtk_label_set_xalign(GTK_LABEL (localmbox_label), 1.0); smtpserv_label = gtk_label_new (_("SMTP server (send)")); gtk_widget_show (smtpserv_label); gtk_table_attach (GTK_TABLE (serv_table), smtpserv_label, 0, 1, 4, 5, GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment (GTK_MISC (smtpserv_label), 1, 0.5); -/* gtk_table_set_row_spacing (GTK_TABLE (serv_table), 2, 0); */ + gtk_label_set_xalign(GTK_LABEL (smtpserv_label), 1.0); mailcmd_checkbtn = gtk_check_button_new_with_label (_("Use mail command rather than SMTP server")); @@ -1291,14 +1289,13 @@ static void basic_create_widget_func(PrefsPage * _page, gtk_widget_show (mailcmd_label); gtk_table_attach (GTK_TABLE (serv_table), mailcmd_label, 0, 1, 6, 7, GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment (GTK_MISC (mailcmd_label), 1, 0.5); -/* gtk_table_set_row_spacing (GTK_TABLE (serv_table), 2, 0); */ + gtk_label_set_xalign(GTK_LABEL (mailcmd_label), 1.0); uid_label = gtk_label_new (_("User ID")); gtk_widget_show (uid_label); gtk_table_attach (GTK_TABLE (serv_table), uid_label, 0, 1, 7, 8, GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment (GTK_MISC (uid_label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL (uid_label), 1.0); pass_label = gtk_label_new (_("Password")); gtk_widget_show (pass_label); @@ -1306,7 +1303,7 @@ static void basic_create_widget_func(PrefsPage * _page, gtk_table_attach (GTK_TABLE (serv_table), pass_label, 2, 3, 7, 8, 0, 0, 0, 0); #else - gtk_misc_set_alignment (GTK_MISC (pass_label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL (pass_label), 1.0); gtk_table_attach (GTK_TABLE (serv_table), pass_label, 0, 1, 8, 9, GTK_FILL, 0, 0, 0); #endif @@ -2567,7 +2564,7 @@ static void ssl_create_widget_func(PrefsPage * _page, gtk_table_set_col_spacings(GTK_TABLE(cert_table), 8); label = gtk_label_new(_("Certificate for receiving")); - gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 1.0); entry_in_cert_file = gtk_entry_new(); in_ssl_cert_browse_button = gtkut_get_browse_file_btn(_("Browse")); CLAWS_SET_TIP(label, @@ -2581,7 +2578,7 @@ static void ssl_create_widget_func(PrefsPage * _page, GTK_FILL, 0, 0, 0); label = gtk_label_new(_("Password")); - gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 1.0); entry_in_cert_pass = gtk_entry_new(); gtk_entry_set_visibility(GTK_ENTRY(entry_in_cert_pass), FALSE); showpwd_checkbtn = gtk_check_button_new_with_label (_("Show password")); @@ -2595,7 +2592,7 @@ static void ssl_create_widget_func(PrefsPage * _page, GTK_FILL, 0, 0, 0); label = gtk_label_new(_("Certificate for sending")); - gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 1.0); entry_out_cert_file = gtk_entry_new(); out_ssl_cert_browse_button = gtkut_get_browse_file_btn(_("Browse")); CLAWS_SET_TIP(label, @@ -2609,7 +2606,7 @@ static void ssl_create_widget_func(PrefsPage * _page, GTK_FILL, 0, 0, 0); label = gtk_label_new(_("Password")); - gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 1.0); entry_out_cert_pass = gtk_entry_new(); gtk_entry_set_visibility(GTK_ENTRY(entry_out_cert_pass), FALSE); showpwd_checkbtn = gtk_check_button_new_with_label (_("Show password")); diff --git a/src/prefs_actions.c b/src/prefs_actions.c @@ -1,6 +1,6 @@ /* - * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2013 Hiroyuki Yamamoto & The Claws Mail Team + * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client + * Copyright (C) 1999-2018 Hiroyuki Yamamoto & The Claws Mail Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,7 +14,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. - * */ #ifdef HAVE_CONFIG_H @@ -249,7 +248,7 @@ static void prefs_actions_create(MainWindow *mainwin) name_label = gtk_label_new (_("Menu name")); gtk_widget_show (name_label); - gtk_misc_set_alignment (GTK_MISC (name_label), 1, 0.5); + gtk_label_set_xalign (GTK_LABEL (name_label), 1.0); gtk_table_attach (GTK_TABLE (table), name_label, 0, 1, 0, 1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); @@ -262,7 +261,7 @@ static void prefs_actions_create(MainWindow *mainwin) cmd_label = gtk_label_new (_("Command")); gtk_widget_show (cmd_label); - gtk_misc_set_alignment (GTK_MISC (cmd_label), 1, 0.5); + gtk_label_set_xalign (GTK_LABEL (cmd_label), 1.0); gtk_table_attach (GTK_TABLE (table), cmd_label, 0, 1, 2, 3, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); diff --git a/src/prefs_compose_writing.c b/src/prefs_compose_writing.c @@ -1,6 +1,6 @@ /* - * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2005-2012 Colin Leroy <colin@colino.net> & The Claws Mail Team + * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client + * Copyright (C) 2005-2018 Colin Leroy <colin@colino.net> & The Claws Mail Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,7 +14,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. - * */ #ifdef HAVE_CONFIG_H @@ -237,7 +236,7 @@ static void prefs_compose_writing_create_widget(PrefsPage *_page, GtkWindow *win /* dnd insert or attach */ label_dnd_insert_or_attach = gtk_label_new (_("When dropping files into the Compose window")); - gtk_misc_set_alignment(GTK_MISC(label_dnd_insert_or_attach), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label_dnd_insert_or_attach), 0.0); gtk_widget_show (label_dnd_insert_or_attach); optmenu_dnd_insert_or_attach = gtkut_sc_combobox_create(NULL, FALSE); diff --git a/src/prefs_customheader.c b/src/prefs_customheader.c @@ -1,6 +1,6 @@ /* - * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team + * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client + * Copyright (C) 1999-2018 Hiroyuki Yamamoto and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,7 +14,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. - * */ #ifdef HAVE_CONFIG_H @@ -210,8 +209,8 @@ static void prefs_custom_header_create(void) gtk_table_attach (GTK_TABLE (table1), hdr_label, 0, 1, 0, 1, GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment (GTK_MISC (hdr_label), 0, 0.5); - + gtk_label_set_xalign(GTK_LABEL (hdr_label), 0.0); + hdr_combo = combobox_text_new(TRUE, "User-Agent", "Face", "X-Face", "X-Operating-System", NULL); gtk_table_attach (GTK_TABLE (table1), hdr_combo, 0, 1, 1, 2, @@ -223,8 +222,8 @@ static void prefs_custom_header_create(void) gtk_table_attach (GTK_TABLE (table1), val_label, 1, 2, 0, 1, GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0); - gtk_misc_set_alignment (GTK_MISC (val_label), 0, 0.5); - + gtk_label_set_xalign(GTK_LABEL (val_label), 0.0); + val_entry = gtk_entry_new (); gtk_widget_show (val_entry); gtk_table_attach (GTK_TABLE (table1), val_entry, 1, 2, 1, 2, diff --git a/src/prefs_ext_prog.c b/src/prefs_ext_prog.c @@ -1,6 +1,6 @@ /* - * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2004-2013 Hiroyuki Yamamoto & the Claws Mail team + * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client + * Copyright (C) 2004-2018 Hiroyuki Yamamoto & the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,7 +14,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. - * */ #ifdef HAVE_CONFIG_H @@ -160,7 +159,7 @@ static void prefs_ext_prog_create_widget(PrefsPage *_page, GtkWindow *window, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 2); gtk_label_set_justify(GTK_LABEL (uri_label), GTK_JUSTIFY_RIGHT); - gtk_misc_set_alignment(GTK_MISC (uri_label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL (uri_label), 1.0); uri_combo = combobox_text_new(TRUE, DEFAULT_BROWSER_CMD, @@ -191,7 +190,7 @@ static void prefs_ext_prog_create_widget(PrefsPage *_page, GtkWindow *window, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 2); gtk_label_set_justify(GTK_LABEL (exteditor_label), GTK_JUSTIFY_RIGHT); - gtk_misc_set_alignment(GTK_MISC (exteditor_label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL (exteditor_label), 1.0); exteditor_combo = combobox_text_new(TRUE, "gedit %s", @@ -224,7 +223,7 @@ static void prefs_ext_prog_create_widget(PrefsPage *_page, GtkWindow *window, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 2); gtk_label_set_justify(GTK_LABEL (astextviewer_label), GTK_JUSTIFY_RIGHT); - gtk_misc_set_alignment(GTK_MISC (astextviewer_label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL (astextviewer_label), 1.0); astextviewer_entry = gtk_entry_new (); gtk_widget_show(astextviewer_entry); diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c @@ -1,6 +1,6 @@ /* - * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team + * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client + * Copyright (C) 1999-2018 Hiroyuki Yamamoto and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,7 +14,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. - * */ #ifdef HAVE_CONFIG_H @@ -383,7 +382,7 @@ static void prefs_filtering_create(void) name_label = gtk_label_new (_("Name")); gtk_widget_show (name_label); - gtk_misc_set_alignment (GTK_MISC (name_label), 1, 0.5); + gtk_label_set_xalign (GTK_LABEL (name_label), 1.0); gtk_table_attach (GTK_TABLE (table), name_label, 0, 1, 0, 1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); @@ -396,7 +395,7 @@ static void prefs_filtering_create(void) account_label = gtk_label_new (_("Account")); gtk_widget_show (account_label); - gtk_misc_set_alignment (GTK_MISC (account_label), 1, 0.5); + gtk_label_set_xalign (GTK_LABEL (account_label), 1.0); gtk_table_attach (GTK_TABLE (table), account_label, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); @@ -410,7 +409,7 @@ static void prefs_filtering_create(void) cond_label = gtk_label_new (_("Condition")); gtk_widget_show (cond_label); - gtk_misc_set_alignment (GTK_MISC (cond_label), 1, 0.5); + gtk_label_set_xalign (GTK_LABEL (cond_label), 1.0); gtk_table_attach (GTK_TABLE (table), cond_label, 0, 1, 2, 3, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); @@ -432,7 +431,7 @@ static void prefs_filtering_create(void) action_label = gtk_label_new (_("Action")); gtk_widget_show (action_label); - gtk_misc_set_alignment (GTK_MISC (action_label), 1, 0.5); + gtk_label_set_xalign (GTK_LABEL (action_label), 1.0); gtk_table_attach (GTK_TABLE (table), action_label, 0, 1, 3, 4, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); diff --git a/src/prefs_filtering_action.c b/src/prefs_filtering_action.c @@ -1,6 +1,6 @@ /* * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2003-2012 the Claws Mail team + * Copyright (C) 2003-2018 the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,7 +14,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. - * */ #ifdef HAVE_CONFIG_H @@ -440,19 +439,19 @@ static void prefs_filtering_action_create(void) label1 = gtk_label_new (_("Action")); gtk_widget_set_size_request(label1, LABELS_WIDTH, -1); gtk_size_group_add_widget(size_group, label1); - gtk_misc_set_alignment (GTK_MISC (label1), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label1), 1.0); gtk_table_attach(GTK_TABLE(table), label1, 0, 1, 0, 1, GTK_FILL, GTK_SHRINK, 0, 0); label2 = gtk_label_new (""); gtk_size_group_add_widget(size_group, label2); - gtk_misc_set_alignment (GTK_MISC (label2), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label2), 1.0); gtk_table_attach(GTK_TABLE(table), label2, 0, 1, 1, 2, GTK_FILL, GTK_SHRINK, 0, 0); label3 = gtk_label_new (""); gtk_size_group_add_widget(size_group, label3); - gtk_misc_set_alignment (GTK_MISC (label3), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label3), 1.0); gtk_table_attach(GTK_TABLE(table), label3, 0, 1, 2, 3, GTK_FILL, GTK_SHRINK, 0, 0); diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c @@ -212,7 +212,7 @@ static GtkWidget *prefs_folder_no_save_warning_create_widget() { "whole mailbox tree by using \"Apply to subfolders\"."), "</i>", NULL)); gtk_label_set_use_markup(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0); return hbox; @@ -287,7 +287,6 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_, /* Apply to subfolders */ label = gtk_label_new(_("Apply to\nsubfolders")); - gtk_misc_set_alignment(GTK_MISC(label), 0.5, 0.5); gtk_table_attach(GTK_TABLE(table), label, 2, 3, rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0); rowcount++; @@ -330,7 +329,7 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_, gtk_widget_set_sensitive(folder_type, FALSE); label = gtk_label_new(_("Folder type")); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_table_attach(GTK_TABLE(table), label, 0, 1, rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0); gtk_table_attach(GTK_TABLE(table), folder_type, 1, 2, @@ -368,7 +367,7 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_, /* Test string */ label_regexp_test = gtk_label_new(_("Test string")); - gtk_misc_set_alignment(GTK_MISC(label_regexp_test), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label_regexp_test), 1.0); gtk_table_attach(GTK_TABLE(table), label_regexp_test, 0, 1, rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0); SET_TOGGLE_SENSITIVITY(checkbtn_simplify_subject, label_regexp_test); @@ -385,7 +384,7 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_, /* Test result */ label_regexp_result = gtk_label_new(_("Result")); - gtk_misc_set_alignment(GTK_MISC(label_regexp_result), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label_regexp_result), 1.0); gtk_table_attach(GTK_TABLE(table), label_regexp_result, 0, 1, rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0); SET_TOGGLE_SENSITIVITY(checkbtn_simplify_subject, label_regexp_result); @@ -426,7 +425,7 @@ static void prefs_folder_item_general_create_widget_func(PrefsPage * page_, /* Folder color */ folder_color = gtk_label_new(_("Folder color")); - gtk_misc_set_alignment(GTK_MISC(folder_color), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(folder_color), 0.0); gtk_table_attach(GTK_TABLE(table), folder_color, 0, 1, rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0); @@ -883,7 +882,6 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_, /* Apply to subfolders */ label = gtk_label_new(_("Apply to\nsubfolders")); - gtk_misc_set_alignment(GTK_MISC(label), 0.5, 0.5); gtk_table_attach(GTK_TABLE(table), label, 2, 3, rowcount, rowcount + 1, GTK_SHRINK, GTK_SHRINK, 0, 0); rowcount++; diff --git a/src/prefs_fonts.c b/src/prefs_fonts.c @@ -1,6 +1,6 @@ /* - * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 2003-2012 Hiroyuki Yamamoto & The Claws Mail Team + * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client + * Copyright (C) 2003-2018 Hiroyuki Yamamoto & The Claws Mail Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,7 +14,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. - * */ #ifdef HAVE_CONFIG_H @@ -82,7 +81,7 @@ static void prefs_fonts_create_widget(PrefsPage *_page, GtkWindow *window, (GtkAttachOptions) GTK_FILL, (GtkAttachOptions) (0), 0, 0); gtk_label_set_justify(GTK_LABEL(tmplabel), GTK_JUSTIFY_RIGHT); - gtk_misc_set_alignment(GTK_MISC(tmplabel), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(tmplabel), 1.0); /* normal font button */ entry_folderview_normalfont = gtk_font_button_new_with_font (prefs_common.normalfont); @@ -102,7 +101,7 @@ static void prefs_fonts_create_widget(PrefsPage *_page, GtkWindow *window, (GtkAttachOptions) GTK_FILL, (GtkAttachOptions) (0), 0, 0); gtk_label_set_justify(GTK_LABEL(tmplabel), GTK_JUSTIFY_RIGHT); - gtk_misc_set_alignment(GTK_MISC(tmplabel), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(tmplabel), 1.0); /* message font button */ entry_messageviewfont = gtk_font_button_new_with_font (prefs_common.textfont); @@ -139,7 +138,7 @@ static void prefs_fonts_create_widget(PrefsPage *_page, GtkWindow *window, (GtkAttachOptions) GTK_FILL, (GtkAttachOptions) (0), 0, 0); gtk_label_set_justify(GTK_LABEL(tmplabel), GTK_JUSTIFY_RIGHT); - gtk_misc_set_alignment(GTK_MISC(tmplabel), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(tmplabel), 1.0); SET_TOGGLE_SENSITIVITY_REVERSE (derive_from_normalfont_checkbutton, tmplabel); /* small font button */ @@ -161,7 +160,7 @@ static void prefs_fonts_create_widget(PrefsPage *_page, GtkWindow *window, (GtkAttachOptions) GTK_FILL, (GtkAttachOptions) (0), 0, 0); gtk_label_set_justify(GTK_LABEL(tmplabel), GTK_JUSTIFY_RIGHT); - gtk_misc_set_alignment(GTK_MISC(tmplabel), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(tmplabel), 1.0); SET_TOGGLE_SENSITIVITY_REVERSE (derive_from_normalfont_checkbutton, tmplabel); /* bold font button */ @@ -193,7 +192,7 @@ static void prefs_fonts_create_widget(PrefsPage *_page, GtkWindow *window, (GtkAttachOptions) GTK_FILL, (GtkAttachOptions) (0), 0, 0); gtk_label_set_justify(GTK_LABEL(tmplabel), GTK_JUSTIFY_RIGHT); - gtk_misc_set_alignment(GTK_MISC(tmplabel), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(tmplabel), 1.0); SET_TOGGLE_SENSITIVITY (print_checkbutton, tmplabel); /* print font button */ diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c @@ -610,7 +610,7 @@ static void prefs_matcher_create(void) /* criteria combo box */ criteria_label = gtk_label_new(_("Match criteria")); - gtk_misc_set_alignment(GTK_MISC(criteria_label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(criteria_label), 1.0); gtk_widget_set_size_request(criteria_label, -1, -1); gtk_table_attach(GTK_TABLE(table), criteria_label, 0, 1, 0, 1, GTK_FILL, GTK_SHRINK, 2, 2); @@ -681,7 +681,7 @@ static void prefs_matcher_create(void) gtk_widget_set_sensitive(GTK_WIDGET(addressbook_select_btn), FALSE); #endif match_label = gtk_label_new(""); - gtk_misc_set_alignment(GTK_MISC(match_label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(match_label), 1.0); gtk_table_attach(GTK_TABLE(table), match_label, 0, 1, 1, 2, GTK_FILL, GTK_SHRINK, 2, 2); diff --git a/src/prefs_other.c b/src/prefs_other.c @@ -533,7 +533,8 @@ static void prefs_other_create_widget(PrefsPage *_page, GtkWindow *window, vbox_metadata = gtkut_get_options_frame(vbox1, &frame_metadata, _("Metadata handling")); metadata_label = gtk_label_new(_("Safer mode asks the OS to write metadata to disk directly;\n" "it avoids data loss after crashes but can take some time.")); - gtk_misc_set_alignment(GTK_MISC(metadata_label), 0, 0); + gtk_label_set_xalign(GTK_LABEL(metadata_label), 0.0); + gtk_label_set_yalign(GTK_LABEL(metadata_label), 0.0); gtk_box_pack_start (GTK_BOX (vbox_metadata), metadata_label, FALSE, FALSE, 0); flush_metadata_safer_radiobtn = gtk_radio_button_new_with_label(NULL, _("Safer")); flush_metadata_faster_radiobtn = gtk_radio_button_new_with_label_from_widget( diff --git a/src/prefs_receive.c b/src/prefs_receive.c @@ -216,7 +216,7 @@ static void prefs_receive_create_widget(PrefsPage *_page, GtkWindow *window, vbox2 = gtkut_get_options_frame(vbox1, &frame, _("Dialogs")); label_recvdialog = gtk_label_new (_("Show receive dialog")); - gtk_misc_set_alignment(GTK_MISC(label_recvdialog), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label_recvdialog), 0.0); gtk_widget_show (label_recvdialog); optmenu_recvdialog = gtkut_sc_combobox_create(NULL, FALSE); diff --git a/src/prefs_send.c b/src/prefs_send.c @@ -224,7 +224,7 @@ static void prefs_send_create_widget(PrefsPage *_page, GtkWindow *window, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_label_set_justify(GTK_LABEL(label_outcharset), GTK_JUSTIFY_RIGHT); - gtk_misc_set_alignment(GTK_MISC(label_outcharset), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label_outcharset), 1.0); optmenu = gtk_list_store_new(2, G_TYPE_STRING, /* Menu label */ @@ -315,7 +315,7 @@ static void prefs_send_create_widget(PrefsPage *_page, GtkWindow *window, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_label_set_justify(GTK_LABEL(label_encoding), GTK_JUSTIFY_RIGHT); - gtk_misc_set_alignment(GTK_MISC(label_encoding), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label_encoding), 1.0); combobox_encoding = gtkut_sc_combobox_create(NULL, FALSE); gtk_widget_show (combobox_encoding); diff --git a/src/prefs_spelling.c b/src/prefs_spelling.c @@ -165,7 +165,7 @@ static void prefs_spelling_create_widget(PrefsPage *_page, GtkWindow *window, gp (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 2); gtk_label_set_justify(GTK_LABEL(default_dict_label), GTK_JUSTIFY_RIGHT); - gtk_misc_set_alignment(GTK_MISC(default_dict_label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(default_dict_label), 1.0); default_dict_combo = gtkaspell_dictionary_combo_new(TRUE); gtk_table_attach (GTK_TABLE (table), default_dict_combo, 1, 2, 0, 1, @@ -177,7 +177,7 @@ static void prefs_spelling_create_widget(PrefsPage *_page, GtkWindow *window, gp (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 2); gtk_label_set_justify(GTK_LABEL(default_alt_dict_label), GTK_JUSTIFY_RIGHT); - gtk_misc_set_alignment(GTK_MISC(default_alt_dict_label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(default_alt_dict_label), 1.0); default_alt_dict_combo = gtkaspell_dictionary_combo_new(FALSE); gtk_table_attach (GTK_TABLE (table), default_alt_dict_combo, 1, 2, 1, 2, @@ -206,7 +206,7 @@ static void prefs_spelling_create_widget(PrefsPage *_page, GtkWindow *window, gp gtk_box_pack_start(GTK_BOX(misspelled_hbox), misspelled_label, FALSE, FALSE, 0); gtk_label_set_justify(GTK_LABEL(misspelled_label), GTK_JUSTIFY_RIGHT); - gtk_misc_set_alignment(GTK_MISC(misspelled_label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(misspelled_label), 1.0); misspelled_colorbtn = GTKUT_COLOR_BUTTON(); gtk_widget_show(misspelled_colorbtn); diff --git a/src/prefs_summaries.c b/src/prefs_summaries.c @@ -249,7 +249,7 @@ static GtkWidget *date_format_create(GtkButton *button, void *data) gtk_table_attach(GTK_TABLE(table), label1, 0, 1, 0, 1, GTK_FILL, 0, 0, 0); gtk_label_set_justify(GTK_LABEL(label1), GTK_JUSTIFY_LEFT); - gtk_misc_set_alignment(GTK_MISC(label1), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label1), 0.0); datefmt_entry = gtk_entry_new(); gtk_entry_set_max_length(GTK_ENTRY(datefmt_entry), 256); @@ -267,14 +267,14 @@ static GtkWidget *date_format_create(GtkButton *button, void *data) gtk_table_attach(GTK_TABLE(table), label2, 0, 1, 1, 2, GTK_FILL, 0, 0, 0); gtk_label_set_justify(GTK_LABEL(label2), GTK_JUSTIFY_LEFT); - gtk_misc_set_alignment(GTK_MISC(label2), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label2), 0.0); label3 = gtk_label_new(""); gtk_widget_show(label3); gtk_table_attach(GTK_TABLE(table), label3, 1, 2, 1, 2, (GTK_EXPAND | GTK_FILL), 0, 0, 0); gtk_label_set_justify(GTK_LABEL(label3), GTK_JUSTIFY_LEFT); - gtk_misc_set_alignment(GTK_MISC(label3), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label3), 0.0); gtkut_stock_button_set_create(&confirm_area, &cancel_btn, GTK_STOCK_CANCEL, &ok_btn, GTK_STOCK_OK, NULL, NULL); diff --git a/src/prefs_template.c b/src/prefs_template.c @@ -1,7 +1,7 @@ /* - * Claws Mail templates subsystem - * Copyright (C) 2001 Alexander Barinov - * Copyright (C) 2001-2013 Hiroyuki Yamamoto and the Claws Mail team + * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client + * Copyright (C) 2001-2018 Hiroyuki Yamamoto and the Claws Mail team + * Claws Mail templates subsystem Copyright (C) 2001 Alexander Barinov * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,7 +15,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. - * */ #include "defs.h" @@ -238,7 +237,7 @@ static void prefs_template_window_create(void) gtk_table_attach(GTK_TABLE(table), label, 0, 1, i, (i + 1), (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) 0, 0, 0); - gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 1.0); *(widgets_table[i].entry) = gtk_entry_new(); gtk_widget_show(*(widgets_table[i].entry)); diff --git a/src/prefs_themes.c b/src/prefs_themes.c @@ -977,7 +977,7 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin gtk_widget_show (label_global_status); gtk_box_pack_start (GTK_BOX (vbox2), label_global_status, FALSE, FALSE, 0); gtk_label_set_justify (GTK_LABEL (label_global_status), GTK_JUSTIFY_LEFT); - gtk_misc_set_alignment (GTK_MISC (label_global_status), 0, 0.5); + gtk_label_set_xalign (GTK_LABEL (label_global_status), 0.0); gtk_misc_set_padding (GTK_MISC (label_global_status), 1, 0); PACK_FRAME(vbox1, frame_info, _("Information")); @@ -993,7 +993,7 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 5, 4); gtk_label_set_justify (GTK_LABEL (label1), GTK_JUSTIFY_LEFT); - gtk_misc_set_alignment (GTK_MISC (label1), 1, 0.5); + gtk_label_set_xalign (GTK_LABEL (label1), 1.0); label2 = gtk_label_new (_("Author")); gtk_widget_show (label2); @@ -1001,49 +1001,49 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 5, 4); gtk_label_set_justify (GTK_LABEL (label2), GTK_JUSTIFY_LEFT); - gtk_misc_set_alignment (GTK_MISC (label2), 1, 0.5); + gtk_label_set_xalign (GTK_LABEL (label2), 1.0); label3 = gtk_label_new (_("URL")); gtk_widget_show (label3); gtk_table_attach (GTK_TABLE (table1), label3, 0, 1, 2, 3, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 5, 4); - gtk_misc_set_alignment (GTK_MISC (label3), 1, 0.5); + gtk_label_set_xalign (GTK_LABEL (label3), 1.0); label_name = gtk_label_new (""); gtk_widget_show (label_name); gtk_table_attach (GTK_TABLE (table1), label_name, 1, 2, 0, 1, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0), 5, 0); - gtk_misc_set_alignment (GTK_MISC (label_name), 0, 0.5); + gtk_label_set_xalign (GTK_LABEL (label_name), 0.0); label_author = gtk_label_new (""); gtk_widget_show (label_author); gtk_table_attach (GTK_TABLE (table1), label_author, 1, 2, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 5, 0); - gtk_misc_set_alignment (GTK_MISC (label_author), 0, 0.5); + gtk_label_set_xalign (GTK_LABEL (label_author), 0.0); label_url = gtk_label_new (""); gtk_widget_show (label_url); gtk_table_attach (GTK_TABLE (table1), label_url, 1, 2, 2, 3, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 5, 0); - gtk_misc_set_alignment (GTK_MISC (label_url), 0, 0.5); + gtk_label_set_xalign (GTK_LABEL (label_url), 0.0); label4 = gtk_label_new (_("Status")); gtk_widget_show (label4); gtk_table_attach (GTK_TABLE (table1), label4, 0, 1, 3, 4, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 5, 4); - gtk_misc_set_alignment (GTK_MISC (label4), 1, 0.5); + gtk_label_set_xalign (GTK_LABEL (label4), 1.0); label_status = gtk_label_new (""); gtk_widget_show (label_status); gtk_table_attach (GTK_TABLE (table1), label_status, 1, 2, 3, 4, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 5, 0); - gtk_misc_set_alignment (GTK_MISC (label_status), 0, 0.5); + gtk_label_set_xalign (GTK_LABEL (label_status), 0.0); PACK_FRAME(vbox1, frame_preview, _("Preview")); diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c @@ -909,7 +909,7 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar) /* toolbar item type */ label = gtk_label_new(_("Item type")); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_widget_show(label); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, (GtkAttachOptions) (GTK_FILL), @@ -929,7 +929,7 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar) /* available actions */ label = gtk_label_new(_("Event executed on click")); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); @@ -956,7 +956,7 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar) /* toolbar item description */ label_icon_text = gtk_label_new(_("Toolbar text")); - gtk_misc_set_alignment(GTK_MISC(label_icon_text), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label_icon_text), 0.0); gtk_widget_show (label_icon_text); gtk_table_attach (GTK_TABLE (table), label_icon_text, 0, 1, 2, 3, (GtkAttachOptions) (GTK_FILL), diff --git a/src/quote_fmt.c b/src/quote_fmt.c @@ -1,6 +1,6 @@ /* - * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team + * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client + * Copyright (C) 1999-2018 Hiroyuki Yamamoto and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,7 +14,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. - * */ #ifdef HAVE_CONFIG_H @@ -184,7 +183,7 @@ void quotefmt_create_new_msg_fmt_widgets(GtkWindow *parent_window, gtk_box_pack_start (GTK_BOX (vbox_format), hbox2_format, FALSE, FALSE, 0); label_from = gtk_label_new (prefs_common_translated_header_name("From")); - gtk_misc_set_alignment(GTK_MISC(label_from), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label_from), 1.0); gtk_widget_show (label_from); gtk_box_pack_start (GTK_BOX (hbox2_format), label_from, FALSE, FALSE, 0); gtk_size_group_add_widget(size_group, label_from); @@ -202,7 +201,7 @@ void quotefmt_create_new_msg_fmt_widgets(GtkWindow *parent_window, gtk_box_pack_start (GTK_BOX (vbox_format), hbox_format, FALSE, FALSE, 0); label_subject = gtk_label_new (prefs_common_translated_header_name("Subject")); - gtk_misc_set_alignment(GTK_MISC(label_subject), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label_subject), 1.0); gtk_widget_show (label_subject); gtk_box_pack_start (GTK_BOX (hbox_format), label_subject, FALSE, FALSE, 0); gtk_size_group_add_widget(size_group, label_subject); @@ -307,7 +306,7 @@ void quotefmt_create_reply_fmt_widgets(GtkWindow *parent_window, gtk_box_pack_start (GTK_BOX (vbox_quote), hbox3, FALSE, FALSE, 0); label_from = gtk_label_new (prefs_common_translated_header_name("From:")); - gtk_misc_set_alignment(GTK_MISC(label_from), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label_from), 1.0); gtk_widget_show (label_from); gtk_box_pack_start (GTK_BOX (hbox3), label_from, FALSE, FALSE, 0); gtk_size_group_add_widget(size_group, label_from); @@ -329,7 +328,7 @@ void quotefmt_create_reply_fmt_widgets(GtkWindow *parent_window, gtk_box_pack_start (GTK_BOX (hbox1), hbox2, FALSE, FALSE, 0); label_quotemark = gtk_label_new (_("Quotation mark")); - gtk_misc_set_alignment(GTK_MISC(label_quotemark), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label_quotemark), 1.0); gtk_widget_show (label_quotemark); gtk_box_pack_start (GTK_BOX (hbox2), label_quotemark, FALSE, FALSE, 0); gtk_size_group_add_widget(size_group, label_quotemark); @@ -435,7 +434,7 @@ void quotefmt_create_forward_fmt_widgets(GtkWindow *parent_window, gtk_box_pack_start (GTK_BOX (vbox_quote), hbox3, FALSE, FALSE, 0); label_from = gtk_label_new (prefs_common_translated_header_name("From:")); - gtk_misc_set_alignment(GTK_MISC(label_from), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label_from), 1.0); gtk_widget_show (label_from); gtk_box_pack_start (GTK_BOX (hbox3), label_from, FALSE, FALSE, 0); gtk_size_group_add_widget(size_group, label_from); @@ -457,7 +456,7 @@ void quotefmt_create_forward_fmt_widgets(GtkWindow *parent_window, gtk_box_pack_start (GTK_BOX (hbox1), hbox2, FALSE, FALSE, 0); label_quotemark = gtk_label_new (_("Quotation mark")); - gtk_misc_set_alignment(GTK_MISC(label_quotemark), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label_quotemark), 1.0); gtk_widget_show (label_quotemark); gtk_box_pack_start (GTK_BOX (hbox2), label_quotemark, FALSE, FALSE, 0); gtk_size_group_add_widget(size_group, label_quotemark); diff --git a/src/summary_search.c b/src/summary_search.c @@ -1,6 +1,6 @@ /* - * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team + * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client + * Copyright (C) 1999-2018 Hiroyuki Yamamoto and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,7 +14,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. - * */ #ifdef HAVE_CONFIG_H @@ -419,35 +418,35 @@ static void summary_search_create(void) gtk_table_attach (GTK_TABLE (table1), from_label, 0, 1, 0, 1, GTK_FILL, 0, 0, 0); gtk_label_set_justify (GTK_LABEL (from_label), GTK_JUSTIFY_RIGHT); - gtk_misc_set_alignment (GTK_MISC (from_label), 1, 0.5); + gtk_label_set_xalign (GTK_LABEL (from_label), 1.0); to_label = gtk_label_new (_("To:")); gtk_widget_show (to_label); gtk_table_attach (GTK_TABLE (table1), to_label, 0, 1, 1, 2, GTK_FILL, 0, 0, 0); gtk_label_set_justify (GTK_LABEL (to_label), GTK_JUSTIFY_RIGHT); - gtk_misc_set_alignment (GTK_MISC (to_label), 1, 0.5); + gtk_label_set_xalign (GTK_LABEL (to_label), 1.0); subject_label = gtk_label_new (_("Subject:")); gtk_widget_show (subject_label); gtk_table_attach (GTK_TABLE (table1), subject_label, 0, 1, 2, 3, GTK_FILL, 0, 0, 0); gtk_label_set_justify (GTK_LABEL (subject_label), GTK_JUSTIFY_RIGHT); - gtk_misc_set_alignment (GTK_MISC (subject_label), 1, 0.5); + gtk_label_set_xalign (GTK_LABEL (subject_label), 1.0); body_label = gtk_label_new (_("Body:")); gtk_widget_show (body_label); gtk_table_attach (GTK_TABLE (table1), body_label, 0, 1, 3, 4, GTK_FILL, 0, 0, 0); gtk_label_set_justify (GTK_LABEL (body_label), GTK_JUSTIFY_RIGHT); - gtk_misc_set_alignment (GTK_MISC (body_label), 1, 0.5); + gtk_label_set_xalign (GTK_LABEL (body_label), 1.0); adv_condition_label = gtk_label_new (_("Condition:")); gtk_widget_show (adv_condition_label); gtk_table_attach (GTK_TABLE (table1), adv_condition_label, 0, 1, 4, 5, GTK_FILL, 0, 0, 0); gtk_label_set_justify (GTK_LABEL (adv_condition_label), GTK_JUSTIFY_RIGHT); - gtk_misc_set_alignment (GTK_MISC (adv_condition_label), 1, 0.5); + gtk_label_set_xalign (GTK_LABEL (adv_condition_label), 1.0); checkbtn_hbox = gtk_hbox_new (FALSE, 8); gtk_widget_show (checkbtn_hbox); diff --git a/src/uri_opener.c b/src/uri_opener.c @@ -1,7 +1,6 @@ /* * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client - * Copyright (C) 1999-2012 Colin Leroy <colin@colino.net> and - * the Claws Mail team + * Copyright (C) 1999-2018 Colin Leroy and the Claws Mail team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,7 +14,6 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. - * */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -204,7 +202,7 @@ static void uri_opener_create(void) urilist = uri_opener_list_view_create(); label = gtk_label_new(_("Please select the URL to open.")); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_box_pack_start(GTK_BOX(vbox1), label, FALSE, TRUE, 0); scrolledwin = uri_opener_scrolled_win_create(); diff --git a/src/wizard.c b/src/wizard.c @@ -873,8 +873,7 @@ static GtkWidget* create_page (WizardWindow *wizard, const char * title) #define PACK_BOX(hbox,text,entry) { \ GtkWidget *label = gtk_label_new(text); \ gtk_label_set_use_markup(GTK_LABEL(label), TRUE); \ - if (GTK_IS_MISC(label)) \ - gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5); \ + gtk_label_set_xalign(GTK_LABEL(label), 1.0); \ gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); \ gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0); \ } @@ -975,7 +974,7 @@ static GtkWidget* user_page (WizardWindow * wizard) label = gtk_label_new(g_strconcat("<span weight=\"bold\">", _("Your name:"), "</span>", NULL)); gtk_label_set_use_markup(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 1.0); gtk_table_attach(GTK_TABLE(user_table), label, 0,1,0,1, GTK_FILL, 0, VSPACING_NARROW, 0); wizard->full_name = gtk_entry_new(); @@ -986,7 +985,7 @@ static GtkWidget* user_page (WizardWindow * wizard) label = gtk_label_new(g_strconcat("<span weight=\"bold\">", _("Your email address:"), "</span>", NULL)); gtk_label_set_use_markup(GTK_LABEL(label), TRUE); - gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 1.0); gtk_table_attach(GTK_TABLE(user_table), label, 0,1,1,2, GTK_FILL, 0, VSPACING_NARROW, 0); wizard->email = gtk_entry_new(); @@ -995,7 +994,7 @@ static GtkWidget* user_page (WizardWindow * wizard) GTK_EXPAND|GTK_FILL, 0, 0, 0); label = gtk_label_new(_("Your organization:")); - gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 1.0); gtk_table_attach(GTK_TABLE(user_table), label, 0,1,2,3, GTK_FILL, 0, VSPACING_NARROW, 0); wizard->organization = gtk_entry_new(); @@ -1030,10 +1029,9 @@ static GtkWidget* mailbox_page (WizardWindow * wizard) wizard->mailbox_label = gtk_label_new(g_strconcat("<span weight=\"bold\">", _("Mailbox name:"), "</span>", NULL)); gtk_label_set_use_markup(GTK_LABEL(wizard->mailbox_label), TRUE); - if (GTK_IS_MISC(wizard->mailbox_label)) - gtk_misc_set_alignment(GTK_MISC(wizard->mailbox_label), 1, 0.5); - wizard->mailbox_name = gtk_entry_new(); + gtk_label_set_xalign(GTK_LABEL(wizard->mailbox_label), 1.0); + wizard->mailbox_name = gtk_entry_new(); gtk_entry_set_text(GTK_ENTRY(wizard->mailbox_name), tmpl.mailbox?tmpl.mailbox:""); CLAWS_SET_TIP(wizard->mailbox_name, _("You can also specify an absolute path, for example: " @@ -1140,7 +1138,7 @@ static GtkWidget* smtp_page (WizardWindow * wizard) gtk_box_pack_start(GTK_BOX(hbox), smtp_auth_table, TRUE, TRUE, 0); wizard->smtp_username_label = gtk_label_new(_("SMTP username:")); - gtk_misc_set_alignment(GTK_MISC(wizard->smtp_username_label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(wizard->smtp_username_label), 1.0); gtk_table_attach(GTK_TABLE(smtp_auth_table), wizard->smtp_username_label, 0,1,0,1, GTK_FILL, 0, VSPACING_NARROW, 0); text = get_default_smtp_account(wizard); @@ -1151,7 +1149,7 @@ static GtkWidget* smtp_page (WizardWindow * wizard) GTK_EXPAND|GTK_FILL, 0, 0, 0); wizard->smtp_password_label = gtk_label_new(_("SMTP password:")); - gtk_misc_set_alignment(GTK_MISC(wizard->smtp_password_label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(wizard->smtp_password_label), 1.0); gtk_table_attach(GTK_TABLE(smtp_auth_table), wizard->smtp_password_label, 0,1,1,2, GTK_FILL, 0, VSPACING_NARROW, 0); wizard->smtp_password = gtk_entry_new(); @@ -1187,7 +1185,7 @@ static GtkWidget* smtp_page (WizardWindow * wizard) gtk_widget_set_size_request (hbox_spc, 12, -1); gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0); label = gtk_label_new(_("Client SSL/TLS certificate (optional)")); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); gtk_table_attach(GTK_TABLE(smtp_cert_table), hbox, 0, 3, 0, 1, GTK_FILL, 0, 0, 0); hbox = gtk_hbox_new(FALSE, VSPACING_NARROW); @@ -1195,7 +1193,7 @@ static GtkWidget* smtp_page (WizardWindow * wizard) gtk_widget_set_size_request (hbox_spc, 12, -1); gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0); label = gtk_label_new(_("File")); - gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 1.0); gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); gtk_table_attach(GTK_TABLE(smtp_cert_table), hbox, 0, 1, 1, 2, GTK_FILL, 0, VSPACING_NARROW, 0); @@ -1213,7 +1211,7 @@ static GtkWidget* smtp_page (WizardWindow * wizard) gtk_widget_set_size_request (hbox_spc, 12, -1); gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0); label = gtk_label_new(_("Password")); - gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 1.0); gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); gtk_table_attach(GTK_TABLE(smtp_cert_table), hbox, 0, 1, 2, 3, GTK_FILL, 0, VSPACING_NARROW, 0); @@ -1488,7 +1486,7 @@ static GtkWidget* recv_page (WizardWindow * wizard) gtk_box_pack_start(GTK_BOX(vbox), recv_table, FALSE, FALSE, 0); label = gtk_label_new(g_strconcat("<span weight=\"bold\">", _("Server type:"), "</span>", NULL)); - gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 1.0); gtk_label_set_use_markup(GTK_LABEL(label), TRUE); gtk_table_attach(GTK_TABLE(recv_table), label, 0,1,0,1, GTK_FILL, 0, VSPACING_NARROW, 0); @@ -1526,7 +1524,7 @@ static GtkWidget* recv_page (WizardWindow * wizard) gtk_table_attach(GTK_TABLE(recv_table), auto_configure_btn, 0,1,1,2, GTK_FILL, 0, VSPACING_NARROW, 0); auto_configure_lbl = gtk_label_new(""); - gtk_misc_set_alignment(GTK_MISC(auto_configure_lbl), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(auto_configure_lbl), 0.0); gtk_table_attach(GTK_TABLE(recv_table), auto_configure_lbl, 1,2,1,2, GTK_FILL, 0, VSPACING_NARROW, 0); gtk_widget_show(auto_configure_btn); @@ -1542,7 +1540,7 @@ static GtkWidget* recv_page (WizardWindow * wizard) wizard->recv_label = gtk_label_new(g_strconcat("<span weight=\"bold\">", _("Server address:"), "</span>", NULL)); - gtk_misc_set_alignment(GTK_MISC(wizard->recv_label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(wizard->recv_label), 1.0); gtk_label_set_use_markup(GTK_LABEL(wizard->recv_label), TRUE); gtk_table_attach(GTK_TABLE(recv_table), wizard->recv_label, 0,1,2,3, GTK_FILL, 0, VSPACING_NARROW, 0); @@ -1559,7 +1557,7 @@ static GtkWidget* recv_page (WizardWindow * wizard) wizard->recv_username_label = gtk_label_new(g_strconcat("<span weight=\"bold\">", _("Username:"),"</span>", NULL)); - gtk_misc_set_alignment(GTK_MISC(wizard->recv_username_label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(wizard->recv_username_label), 1.0); gtk_label_set_use_markup(GTK_LABEL(wizard->recv_username_label), TRUE); gtk_table_attach(GTK_TABLE(recv_table), wizard->recv_username_label, 0,1,3,4, GTK_FILL, 0, VSPACING_NARROW, 0); @@ -1571,7 +1569,7 @@ static GtkWidget* recv_page (WizardWindow * wizard) GTK_EXPAND|GTK_FILL, 0, 0, 0); wizard->recv_password_label = gtk_label_new(_("Password:")); - gtk_misc_set_alignment(GTK_MISC(wizard->recv_password_label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(wizard->recv_password_label), 1.0); gtk_table_attach(GTK_TABLE(recv_table), wizard->recv_password_label, 0,1,4,5, GTK_FILL, 0, VSPACING_NARROW, 0); wizard->recv_password = gtk_entry_new(); @@ -1607,7 +1605,7 @@ static GtkWidget* recv_page (WizardWindow * wizard) gtk_widget_set_size_request (hbox_spc, 12, -1); gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0); label = gtk_label_new(_("Client SSL/TLS certificate (optional)")); - gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 0.0); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); gtk_table_attach(GTK_TABLE(recv_cert_table), hbox, 0, 3, 0, 1, GTK_FILL, 0, 0, 0); hbox = gtk_hbox_new(FALSE, VSPACING_NARROW); @@ -1615,7 +1613,7 @@ static GtkWidget* recv_page (WizardWindow * wizard) gtk_widget_set_size_request (hbox_spc, 12, -1); gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0); label = gtk_label_new(_("File")); - gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 1.0); gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); gtk_table_attach(GTK_TABLE(recv_cert_table), hbox, 0, 1, 1, 2, GTK_FILL, 0, VSPACING_NARROW, 0); @@ -1633,7 +1631,7 @@ static GtkWidget* recv_page (WizardWindow * wizard) gtk_widget_set_size_request (hbox_spc, 12, -1); gtk_box_pack_start (GTK_BOX (hbox), hbox_spc, FALSE, FALSE, 0); label = gtk_label_new(_("Password")); - gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(label), 1.0); gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); gtk_table_attach(GTK_TABLE(recv_cert_table), hbox, 0, 1, 2, 3, GTK_FILL, 0, VSPACING_NARROW, 0); @@ -1649,7 +1647,7 @@ static GtkWidget* recv_page (WizardWindow * wizard) wizard->recv_imap_subdir = gtk_entry_new(); gtk_entry_set_text(GTK_ENTRY(wizard->recv_imap_subdir), tmpl.imapdir?tmpl.imapdir:""); wizard->recv_imap_label = gtk_label_new(_("IMAP server directory:")); - gtk_misc_set_alignment(GTK_MISC(wizard->recv_imap_label), 1, 0.5); + gtk_label_set_xalign(GTK_LABEL(wizard->recv_imap_label), 1.0); gtk_box_pack_start(GTK_BOX(hbox), wizard->recv_imap_label, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox), wizard->recv_imap_subdir, TRUE, TRUE, 0); @@ -1764,7 +1762,8 @@ static gint wizard_close_cb(GtkWidget *widget, GdkEventAny *event, #define PACK_WARNING(text) { \ label = gtk_label_new(text); \ - gtk_misc_set_alignment(GTK_MISC(label), 0, 0); \ + gtk_label_set_xalign(GTK_LABEL(label), 0.0); \ + gtk_label_set_yalign(GTK_LABEL(label), 0.0); \ gtk_box_pack_end(GTK_BOX(widget), label, FALSE, FALSE, 0); \ }