commit d7fef8966492824c635b98bce6848edb48cb7327
parent b423102b353f8cb97fd748c4d155022c29d64842
Author: Ricardo Mones <ricardo@mones.org>
Date: Mon, 26 Feb 2018 00:18:01 +0100
Replace deprecated gtk_misc_set_alignment() in plugins
Diffstat:
15 files changed, 72 insertions(+), 62 deletions(-)
diff --git a/src/plugins/attachwarner/attachwarner_prefs.c b/src/plugins/attachwarner/attachwarner_prefs.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2006-2015 Ricardo Mones and the Claws Mail Team
+ * Copyright (C) 2006-2018 Ricardo Mones 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
@@ -81,7 +81,7 @@ static void attwarner_prefs_create_widget_func(PrefsPage * _page,
vbox2 = gtk_vbox_new(FALSE, 6);
label = gtk_label_new(_("One of the following regular expressions is matched (one per line)"));
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+ gtk_label_set_xalign(GTK_LABEL(label), 0.0);
gtk_misc_set_padding(GTK_MISC(label), 2, 0);
case_sensitive_checkbox = gtk_check_button_new_with_label(_("Expressions are case sensitive"));
diff --git a/src/plugins/dillo/dillo_prefs.c b/src/plugins/dillo/dillo_prefs.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 the Claws Mail Team
+ * Copyright (C) 1999-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/>.
- *
*/
/*
@@ -175,15 +174,14 @@ static void create_dillo_prefs_page(PrefsPage *page,
gtk_widget_show(local_checkbox);
CLAWS_SET_TIP(local_checkbox,
_("Equivalent to Dillo's '--local' option"));
-
+
label = gtk_label_new(_("You can still load remote links "
"by reloading the page"));
- gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+ gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+ gtk_label_set_xalign(GTK_LABEL(label), 0.0);
gtkut_widget_set_small_font_size (label);
- gtk_widget_show(label);
+ gtk_widget_show(label);
-
hbox_whitelist = gtk_hbox_new(FALSE, 8);
gtk_widget_show(hbox_whitelist);
gtk_box_pack_start (GTK_BOX (vbox), hbox_whitelist, FALSE, FALSE, 0);
diff --git a/src/plugins/fancy/fancy_prefs.c b/src/plugins/fancy/fancy_prefs.c
@@ -1,20 +1,20 @@
/*
- * Claws Mail -- A GTK+ based, lightweight, and fast e-mail client
- * Copyright(C) 1999-2015 the Claws Mail Team
* == Fancy Plugin ==
- * This file Copyright (C) 2009-2015 Salvatore De Paolis
- * <iwkse@claws-mail.org> and the Claws Mail Team
+ * Claws Mail -- A GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2018 Salvatore De Paolis 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
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
+ *
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write tothe Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program; see <http://www.gnu.org/licenses/>.
*/
#ifdef HAVE_CONFIG_H
@@ -240,7 +240,8 @@ static void create_fancy_prefs_page(PrefsPage *page, GtkWindow *window,
"from the network. Rendering of images, scripts, plugin objects or\n"
"Java applets can still be enabled for content that is attached\n"
"in the email."));
- gtk_misc_set_alignment(GTK_MISC(remote_label), 0, 0);
+ gtk_label_set_xalign(GTK_LABEL(remote_label), 0.0);
+ gtk_label_set_yalign(GTK_LABEL(remote_label), 0.0);
enable_remote_content = gtk_check_button_new_with_label(_("Enable loading of remote content"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(enable_remote_content),
fancy_prefs.enable_remote_content);
diff --git a/src/plugins/gdata/cm_gdata_prefs.c b/src/plugins/gdata/cm_gdata_prefs.c
@@ -1,5 +1,7 @@
-/* GData plugin for Claws-Mail
- * Copyright (C) 2011 Holger Berndt
+/*
+ * GData plugin for Claws-Mail
+ * Claws Mail -- A GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 2011-2018 Holger Berndt 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
@@ -82,7 +84,7 @@ static void gdata_create_prefs_page(PrefsPage *page, GtkWindow *window, gpointer
/* username */
table = gtk_table_new(2, 2, FALSE);
label = gtk_label_new(_("Username:"));
- 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_FILL, GTK_FILL, 4, 4);
entry = gtk_entry_new();
gtk_widget_set_size_request(entry, 250, -1);
@@ -94,14 +96,14 @@ static void gdata_create_prefs_page(PrefsPage *page, GtkWindow *window, gpointer
gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0);
label = gtk_label_new(_("Polling interval (seconds):"));
gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 4, 4);
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+ gtk_label_set_xalign(GTK_LABEL(label), 0.0);
spinner = gtk_spin_button_new_with_range(10, 10000, 10);
gtk_table_attach(GTK_TABLE(table), spinner, 1, 2, 0, 1, GTK_FILL, GTK_FILL, 4, 4);
gdata_page.spin_max_cache_age = spinner;
label = gtk_label_new(_("Maximum number of results:"));
gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 4, 4);
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+ gtk_label_set_xalign(GTK_LABEL(label), 0.0);
spinner = gtk_spin_button_new_with_range(0, G_MAXINT, 50);
gtk_table_attach(GTK_TABLE(table), spinner, 1, 2, 1, 2, GTK_FILL, GTK_FILL, 4, 4);
gdata_page.spin_max_num_results = spinner;
diff --git a/src/plugins/libravatar/libravatar_prefs.c b/src/plugins/libravatar/libravatar_prefs.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2014-2016 Ricardo Mones and the Claws Mail Team
+ * Copyright (C) 2014-2018 Ricardo Mones 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
@@ -238,7 +238,7 @@ static GtkWidget *p_create_frame_cache(struct LibravatarPrefsPage *page)
markup = avatar_stats_label_markup(stats);
gtk_label_set_markup(GTK_LABEL(label), markup);
g_free(markup);
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+ gtk_label_set_xalign(GTK_LABEL(label), 0.0);
button = gtk_button_new_from_stock(GTK_STOCK_CLEAR);
gtk_widget_show(button);
diff --git a/src/plugins/notification/notification_banner.c b/src/plugins/notification/notification_banner.c
@@ -1,5 +1,7 @@
-/* Notification plugin for Claws Mail
- * Copyright (C) 2005-2008 Holger Berndt
+/*
+ * Notification plugin for Claws Mail
+ * Claws Mail -- A GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 2005-2018 Holger Berndt 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
@@ -347,28 +349,28 @@ static GtkWidget* create_entrybox(GSList *msg_list)
cmsg);
label1 = gtk_label_new(prefs_common_translated_header_name("From:"));
- gtk_misc_set_alignment(GTK_MISC(label1), 0, 0.5);
+ gtk_label_set_xalign(GTK_LABEL(label1), 0.0);
gtk_table_attach_defaults(GTK_TABLE(banner.entries[ii].table),
label1, 0, 1, 0, 1);
label2 = gtk_label_new(prefs_common_translated_header_name("Subject:"));
- gtk_misc_set_alignment(GTK_MISC(label2), 0, 0.5);
+ gtk_label_set_xalign(GTK_LABEL(label2), 0.0);
gtk_table_attach_defaults(GTK_TABLE(banner.entries[ii].table),
label2, 0, 1, 1, 2);
label3 = gtk_label_new(_("Folder:"));
- gtk_misc_set_alignment(GTK_MISC(label3), 0, 0.5);
+ gtk_label_set_xalign(GTK_LABEL(label3), 0.0);
gtk_table_attach_defaults(GTK_TABLE(banner.entries[ii].table),
label3, 0, 1, 2, 3);
label4 = gtk_label_new(cmsg->from);
- gtk_misc_set_alignment(GTK_MISC(label4), 0, 0.5);
+ gtk_label_set_xalign(GTK_LABEL(label4), 0.0);
gtk_table_attach_defaults(GTK_TABLE(banner.entries[ii].table),
label4, 1, 2, 0, 1);
label5 = gtk_label_new(cmsg->subject);
- gtk_misc_set_alignment(GTK_MISC(label5), 0, 0.5);
+ gtk_label_set_xalign(GTK_LABEL(label5), 0.0);
gtk_table_attach_defaults(GTK_TABLE(banner.entries[ii].table),
label5, 1, 2, 1, 2);
label6 = gtk_label_new(cmsg->folderitem_name);
- gtk_misc_set_alignment(GTK_MISC(label6), 0, 0.5);
+ gtk_label_set_xalign(GTK_LABEL(label6), 0.0);
gtk_table_attach_defaults(GTK_TABLE(banner.entries[ii].table),
label6, 1, 2, 2, 3);
gtk_table_set_col_spacings(GTK_TABLE(banner.entries[ii].table), 5);
diff --git a/src/plugins/notification/notification_prefs.c b/src/plugins/notification/notification_prefs.c
@@ -1,6 +1,7 @@
-/* Notification plugin for Claws-Mail
- * Copyright (C) 2005-2015 Hiroyuki Yamamoto and the Claws Mail team
- * Copyright (C) 2005-2015 Holger Berndt
+/*
+ * Notification plugin for Claws-Mail
+ * Claws Mail -- A GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 2005-2018 Holger Berndt 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
@@ -647,7 +648,7 @@ static void notify_create_prefs_page(PrefsPage *page, GtkWindow *window,
/* Warning-Label */
label = gtk_label_new(_("These settings override folder-specific "
"selections."));
- 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);
@@ -1881,7 +1882,8 @@ static void notify_create_hotkeys_page(PrefsPage *page, GtkWindow *window, gpoin
label = gtk_label_new("");
markup = g_markup_printf_escaped(_("Examples for hotkeys include <b>%s</b> and <b>%s</b>"), _("<control><shift>F11"), _("<alt>N"));
gtk_label_set_markup(GTK_LABEL(label), markup);
- 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);
g_free(markup);
gtk_box_pack_start(GTK_BOX(hotkeys_page.hotkeys_cont_enable), label, FALSE, FALSE, 0);
diff --git a/src/plugins/pdf_viewer/poppler_viewer.c b/src/plugins/pdf_viewer/poppler_viewer.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2016 Salvatore De Paolis & the Claws Mail Team
+ * Copyright (C) 1999-2018 Salvatore De Paolis & 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
@@ -650,12 +650,12 @@ static char * pdf_viewer_get_document_format_data(GTime utime)
#define ADD_TO_TABLE(LABEL, VALUE) \
label = gtk_label_new(LABEL); \
- gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5); \
+ gtk_label_set_xalign(GTK_LABEL(label), 1.0); \
gtk_misc_set_padding(GTK_MISC(label), 4, 0); \
gtk_table_attach(viewer->table_doc_info, label, 0, 1, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0); \
\
label = gtk_label_new(VALUE); \
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); \
+ gtk_label_set_xalign(GTK_LABEL(label), 0.0); \
gtk_misc_set_padding(GTK_MISC(label), 4, 0); \
gtk_table_attach(viewer->table_doc_info, label, 1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0); \
row++;
diff --git a/src/plugins/pgpcore/prefs_gpg.c b/src/plugins/pgpcore/prefs_gpg.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2004-2015 the Claws Mail team
+ * Copyright (C) 2004-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
@@ -182,7 +182,7 @@ static void prefs_gpg_create_widget_func(PrefsPage *_page,
label_expire2 = gtk_label_new(_("minutes"));
gtk_widget_show(label_expire2);
gtk_box_pack_start(GTK_BOX(hbox1), label_expire2, FALSE, FALSE, 0);
- gtk_misc_set_alignment(GTK_MISC(label_expire2), 0.0, 0.5);
+ gtk_label_set_xalign(GTK_LABEL(label_expire2), 0.0);
SET_TOGGLE_SENSITIVITY (checkbtn_store_passphrase, label_expire1);
SET_TOGGLE_SENSITIVITY (checkbtn_store_passphrase, spinbtn_store_passphrase);
diff --git a/src/plugins/rssyl/rssyl_feed_props.c b/src/plugins/rssyl/rssyl_feed_props.c
@@ -392,7 +392,7 @@ void rssyl_gtk_prop(RFolderItem *ritem)
hbox = gtk_hbox_new(FALSE, 7);
/* Fetch comments max age - label */
label = gtk_label_new(_("Fetch comments on posts aged less than"));
- 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);
/* Fetch comments max age - spinbutton */
gtk_widget_set_sensitive(feedprop->fetch_comments_max_age,
@@ -402,7 +402,7 @@ void rssyl_gtk_prop(RFolderItem *ritem)
label = gtk_label_new(g_strconcat(_("days"), "<small> ",
_("Set to -1 to fetch all comments"), "</small>", NULL));
gtk_label_set_use_markup(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(hbox), label, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(inner_vbox), hbox, FALSE, FALSE, 0);
diff --git a/src/plugins/spamassassin/spamassassin_gtk.c b/src/plugins/spamassassin/spamassassin_gtk.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2015 the Claws Mail Team
+ * Copyright (C) 1999-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
@@ -284,7 +284,7 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_label_set_justify(GTK_LABEL(transport_label), GTK_JUSTIFY_RIGHT);
- gtk_misc_set_alignment(GTK_MISC(transport_label), 1, 0.5);
+ gtk_label_set_xalign(GTK_LABEL(transport_label), 1.0);
store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_POINTER);
transport_optmenu = gtk_combo_box_new_with_model(GTK_TREE_MODEL(store));
@@ -305,7 +305,7 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_label_set_justify(GTK_LABEL(user_label), GTK_JUSTIFY_RIGHT);
- gtk_misc_set_alignment(GTK_MISC(user_label), 1, 0.5);
+ gtk_label_set_xalign(GTK_LABEL(user_label), 1.0);
user_entry = gtk_entry_new();
gtk_widget_show(user_entry);
@@ -320,7 +320,7 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_label_set_justify(GTK_LABEL(spamd_label), GTK_JUSTIFY_RIGHT);
- gtk_misc_set_alignment(GTK_MISC(spamd_label), 1, 0.5);
+ gtk_label_set_xalign(GTK_LABEL(spamd_label), 1.0);
hbox_spamd = gtk_hbox_new(FALSE, 8);
gtk_widget_show(hbox_spamd);
diff --git a/src/plugins/vcalendar/day-view.c b/src/plugins/vcalendar/day-view.c
@@ -403,7 +403,7 @@ static void add_row(day_win *dw, VCalEvent *event, gint days)
text = g_strdup(event->summary?event->summary : _("Unknown"));
ev = gtk_event_box_new();
lab = gtk_label_new(text);
- gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.5);
+ gtk_label_set_xalign(GTK_LABEL(lab), 0.0);
gtk_label_set_ellipsize(GTK_LABEL(lab), PANGO_ELLIPSIZE_END);
gtk_container_add(GTK_CONTAINER(ev), lab);
diff --git a/src/plugins/vcalendar/month-view.c b/src/plugins/vcalendar/month-view.c
@@ -450,7 +450,8 @@ static void add_row(month_win *mw, VCalEvent *event, gint days)
if (pack || !update_tip) {
ev = gtk_event_box_new();
lab = gtk_label_new(text);
- gtk_misc_set_alignment(GTK_MISC(lab), 0.0, 0.0);
+ gtk_label_set_xalign(GTK_LABEL(lab), 0.0);
+ gtk_label_set_yalign(GTK_LABEL(lab), 0.0);
gtk_label_set_ellipsize(GTK_LABEL(lab), PANGO_ELLIPSIZE_END);
if ((row % 2) == 1)
gtk_widget_modify_bg(ev, GTK_STATE_NORMAL, &mw->bg1);
@@ -650,7 +651,8 @@ static void fill_days(month_win *mw, gint days, FolderItem *item)
g_signal_connect((gpointer)ev, "button-press-event"
, G_CALLBACK(header_button_clicked_cb), mw);
name = gtk_label_new(label);
- gtk_misc_set_alignment(GTK_MISC(name), 0.0, 0.0);
+ gtk_label_set_xalign(GTK_LABEL(name), 0.0);
+ gtk_label_set_yalign(GTK_LABEL(name), 0.0);
CLAWS_SET_TIP(ev, tmp);
gtk_container_add(GTK_CONTAINER(ev), name);
@@ -787,7 +789,7 @@ static void fill_hour(month_win *mw, gint col, gint row, char *text)
ev = gtk_event_box_new();
name = gtk_label_new(text);
- gtk_misc_set_alignment(GTK_MISC(name), 0, 0.5);
+ gtk_label_set_xalign(GTK_LABEL(name), 0.0);
CLAWS_SET_TIP(ev, _("Week number"));
gtk_container_add(GTK_CONTAINER(ev), name);
gtk_widget_set_size_request(ev, mw->hour_req.width
diff --git a/src/plugins/vcalendar/vcal_meeting_gtk.c b/src/plugins/vcalendar/vcal_meeting_gtk.c
@@ -126,7 +126,7 @@ VCalAttendee *attendee_add(VCalMeeting *meet, gchar *address, gchar *name, gchar
label = gtk_label_new(tmpstr); \
g_free(tmpstr); \
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 (meet->table), \
label, 0, 1, i, i+1, \
GTK_FILL, GTK_FILL, 6, 6); \
@@ -135,7 +135,8 @@ VCalAttendee *attendee_add(VCalMeeting *meet, gchar *address, gchar *name, gchar
GTK_FILL|GTK_EXPAND, GTK_FILL, 6, 6); \
if (GTK_IS_LABEL(widget)) { \
gtk_label_set_use_markup(GTK_LABEL (widget), TRUE); \
- gtk_misc_set_alignment (GTK_MISC(widget),0, 0); \
+ gtk_label_set_xalign(GTK_LABEL(widget), 0.0); \
+ gtk_label_set_yalign(GTK_LABEL(widget), 0.0); \
gtk_label_set_line_wrap(GTK_LABEL(widget), TRUE); \
} \
} else { \
@@ -164,7 +165,7 @@ VCalAttendee *attendee_add(VCalMeeting *meet, gchar *address, gchar *name, gchar
label = gtk_label_new(tmpstr); \
g_free(tmpstr); \
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); \
if(intable1) { \
gtk_table_attach (GTK_TABLE (meet->table1), \
label, 0, 1, i, i+1, \
@@ -187,7 +188,8 @@ VCalAttendee *attendee_add(VCalMeeting *meet, gchar *address, gchar *name, gchar
} \
if (GTK_IS_LABEL(widget)) { \
gtk_label_set_use_markup(GTK_LABEL (widget), TRUE); \
- gtk_misc_set_alignment (GTK_MISC(widget),0, 0); \
+ gtk_label_set_xalign(GTK_LABEL(widget), 0.0); \
+ gtk_label_set_yalign(GTK_LABEL(widget), 0.0); \
gtk_label_set_line_wrap(GTK_LABEL(widget), TRUE); \
} \
} else { \
@@ -1584,13 +1586,13 @@ static VCalMeeting *vcal_meeting_create_real(VCalEvent *event, gboolean visible)
date_vbox = gtk_vbox_new(FALSE, 6);
hbox = gtk_hbox_new(FALSE, 6);
label = gtk_label_new(g_strconcat("<b>",_("Starts at:"),"</b> ",NULL));
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+ gtk_label_set_xalign(GTK_LABEL(label), 0.0);
gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox), meet->start_time, FALSE, FALSE, 0);
label = gtk_label_new(g_strconcat("<b> ",_("on:"),"</b>",NULL));
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+ gtk_label_set_xalign(GTK_LABEL(label), 0.0);
gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(date_vbox), hbox, FALSE, FALSE, 0);
@@ -1602,19 +1604,19 @@ static VCalMeeting *vcal_meeting_create_real(VCalEvent *event, gboolean visible)
#else
label = gtk_label_new("");
#endif
- 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(date_hbox), label, TRUE, TRUE, 0);
date_vbox = gtk_vbox_new(FALSE, 6);
hbox = gtk_hbox_new(FALSE, 6);
label = gtk_label_new(g_strconcat("<b>",_("Ends at:"),"</b> ", NULL));
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+ gtk_label_set_xalign(GTK_LABEL(label), 0.0);
gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox), meet->end_time, FALSE, FALSE, 0);
label = gtk_label_new(g_strconcat("<b> ",_("on:"),"</b>",NULL));
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+ gtk_label_set_xalign(GTK_LABEL(label), 0.0);
gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(date_vbox), hbox, FALSE, FALSE, 0);
diff --git a/src/plugins/vcalendar/vcalendar.c b/src/plugins/vcalendar/vcalendar.c
@@ -1122,7 +1122,7 @@ static gboolean vcalviewer_action_cb(GtkButton *widget, gpointer data)
GtkWidget *label = gtk_label_new(tmpstr); \
g_free(tmpstr); \
gtk_label_set_use_markup (GTK_LABEL (label), TRUE); \
- gtk_misc_set_alignment (GTK_MISC(label), 1, 0); \
+ gtk_label_set_xalign (GTK_LABEL(label), 1.0); \
gtk_table_attach (GTK_TABLE (vcalviewer->table), \
label, 0, 1, i, i+1, \
GTK_FILL, GTK_FILL, 6, 6); \
@@ -1131,7 +1131,8 @@ static gboolean vcalviewer_action_cb(GtkButton *widget, gpointer data)
GTK_FILL, GTK_FILL, 6, 6); \
if (GTK_IS_LABEL(widget)) { \
gtk_label_set_use_markup(GTK_LABEL (widget), TRUE); \
- gtk_misc_set_alignment (GTK_MISC(widget),0, 0); \
+ gtk_label_set_xalign(GTK_LABEL(widget), 0.0); \
+ gtk_label_set_yalign(GTK_LABEL(widget), 0.0); \
gtk_label_set_line_wrap(GTK_LABEL(widget), TRUE); \
} \
i++; \
