Updating branch refs/heads/master to 4888631fb62a4dcaa3e666348e5726acd830acce (commit) from db591222fa05cb6504bec29a2ca0e55a352bcaa2 (commit)
commit 4888631fb62a4dcaa3e666348e5726acd830acce Author: Ján Sučan <su...@runbox.com> Date: Thu Dec 19 16:56:52 2013 +0100 Remove needless function call libmailwatch-core/mailwatch-mailbox-imap.c | 8 ++++---- libmailwatch-core/mailwatch-mailbox-pop3.c | 4 ++-- libmailwatch-core/mailwatch-utils.c | 6 ------ libmailwatch-core/mailwatch-utils.h | 2 -- libmailwatch-core/mailwatch.c | 2 +- panel-plugin/mailwatch-plugin.c | 4 ++-- 6 files changed, 9 insertions(+), 17 deletions(-) diff --git a/libmailwatch-core/mailwatch-mailbox-imap.c b/libmailwatch-core/mailwatch-mailbox-imap.c index 47b2229..78cc7c1 100644 --- a/libmailwatch-core/mailwatch-mailbox-imap.c +++ b/libmailwatch-core/mailwatch-mailbox-imap.c @@ -1415,7 +1415,7 @@ imap_config_newmailfolders_btn_clicked_cb(GtkWidget *w, gpointer user_data) G_CALLBACK(imap_config_newmailfolders_destroy_cb), imailbox); - frame = xfce_mailwatch_create_framebox(_("New Mail Folders"), &frame_bin); + frame = xfce_gtk_frame_box_new(_("New Mail Folders"), &frame_bin); gtk_widget_show(frame); gtk_box_pack_start(GTK_BOX(topvbox), frame, TRUE, TRUE, 0); @@ -1592,7 +1592,7 @@ imap_config_advanced_btn_clicked_cb(GtkWidget *w, gpointer user_data) gtk_widget_show(topvbox); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->vbox), topvbox, TRUE, TRUE, 0); - frame = xfce_mailwatch_create_framebox(_("Connection"), &frame_bin); + frame = xfce_gtk_frame_box_new(_("Connection"), &frame_bin); gtk_widget_show(frame); gtk_box_pack_start(GTK_BOX(topvbox), frame, FALSE, FALSE, 0); @@ -1649,7 +1649,7 @@ imap_config_advanced_btn_clicked_cb(GtkWidget *w, gpointer user_data) g_object_set_data(G_OBJECT(chk), "xfmw-entry", entry); g_object_set_data(G_OBJECT(combo), "xfmw-entry", entry); - frame = xfce_mailwatch_create_framebox(_("Folders"), &frame_bin); + frame = xfce_gtk_frame_box_new(_("Folders"), &frame_bin); gtk_widget_show(frame); gtk_box_pack_start(GTK_BOX(topvbox), frame, FALSE, FALSE, 0); @@ -1687,7 +1687,7 @@ imap_get_setup_page(XfceMailwatchMailbox *mailbox) topvbox = gtk_vbox_new(FALSE, BORDER/2); gtk_widget_show(topvbox); - frame = xfce_mailwatch_create_framebox(_("IMAP Server"), &frame_bin); + frame = xfce_gtk_frame_box_new(_("IMAP Server"), &frame_bin); gtk_widget_show(frame); gtk_box_pack_start(GTK_BOX(topvbox), frame, FALSE, FALSE, 0); diff --git a/libmailwatch-core/mailwatch-mailbox-pop3.c b/libmailwatch-core/mailwatch-mailbox-pop3.c index 352eced..291d0cc 100644 --- a/libmailwatch-core/mailwatch-mailbox-pop3.c +++ b/libmailwatch-core/mailwatch-mailbox-pop3.c @@ -755,7 +755,7 @@ pop3_config_advanced_btn_clicked_cb(GtkWidget *w, gpointer user_data) gtk_widget_show(topvbox); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->vbox), topvbox, TRUE, TRUE, 0); - frame = xfce_mailwatch_create_framebox(_("Connection"), &frame_bin); + frame = xfce_gtk_frame_box_new(_("Connection"), &frame_bin); gtk_widget_show(frame); gtk_box_pack_start(GTK_BOX(topvbox), frame, FALSE, FALSE, 0); @@ -827,7 +827,7 @@ pop3_get_setup_page(XfceMailwatchMailbox *mailbox) topvbox = gtk_vbox_new(FALSE, BORDER/2); gtk_widget_show(topvbox); - frame = xfce_mailwatch_create_framebox(_("POP3 Server"), &frame_bin); + frame = xfce_gtk_frame_box_new(_("POP3 Server"), &frame_bin); gtk_widget_show(frame); gtk_box_pack_start(GTK_BOX(topvbox), frame, FALSE, FALSE, 0); diff --git a/libmailwatch-core/mailwatch-utils.c b/libmailwatch-core/mailwatch-utils.c index 1771b7d..3feeb22 100644 --- a/libmailwatch-core/mailwatch-utils.c +++ b/libmailwatch-core/mailwatch-utils.c @@ -105,12 +105,6 @@ xfce_mailwatch_custom_button_new(const gchar *text, const gchar *icon) return btn; } -GtkWidget * -xfce_mailwatch_create_framebox(const gchar *title, GtkWidget **frame_bin) -{ - return xfce_gtk_frame_box_new(title, frame_bin); -} - #ifdef HAVE_SSL_SUPPORT /* assumes |dest| is allocated 2x |src_len| */ static void diff --git a/libmailwatch-core/mailwatch-utils.h b/libmailwatch-core/mailwatch-utils.h index 0c9a917..da395eb 100644 --- a/libmailwatch-core/mailwatch-utils.h +++ b/libmailwatch-core/mailwatch-utils.h @@ -32,8 +32,6 @@ typedef enum GtkWidget *xfce_mailwatch_custom_button_new(const gchar *text, const gchar *icon); -GtkWidget *xfce_mailwatch_create_framebox(const gchar *title, - GtkWidget **frame_bin); gchar *xfce_mailwatch_cram_md5(const gchar *username, const gchar *password, diff --git a/libmailwatch-core/mailwatch.c b/libmailwatch-core/mailwatch.c index 54a8e30..8e64b65 100644 --- a/libmailwatch-core/mailwatch.c +++ b/libmailwatch-core/mailwatch.c @@ -960,7 +960,7 @@ xfce_mailwatch_get_configuration_page(XfceMailwatch *mailwatch) GtkCellRenderer *render; GtkTreeSelection *sel; - frame = xfce_mailwatch_create_framebox(_("Mailboxes"), &frame_bin); + frame = xfce_gtk_frame_box_new(_("Mailboxes"), &frame_bin); gtk_widget_show(frame); hbox = gtk_hbox_new(FALSE, BORDER/2); diff --git a/panel-plugin/mailwatch-plugin.c b/panel-plugin/mailwatch-plugin.c index 1d18fe3..6dca785 100644 --- a/panel-plugin/mailwatch-plugin.c +++ b/panel-plugin/mailwatch-plugin.c @@ -1026,7 +1026,7 @@ mailwatch_create_options(XfcePanelPlugin *plugin, GtkWidget *lbl_onnewmessages; GtkWidget *halign; - frame = xfce_mailwatch_create_framebox(_("External Programs"), &frame_bin); + frame = xfce_gtk_frame_box_new(_("External Programs"), &frame_bin); gtk_box_pack_start(GTK_BOX(topvbox), frame, FALSE, FALSE, 0); table = gtk_table_new(2, 2, FALSE); @@ -1062,7 +1062,7 @@ mailwatch_create_options(XfcePanelPlugin *plugin, gtk_table_attach(GTK_TABLE(table), entry, 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL, BORDER / 4, BORDER / 4); /* Icons. */ - frame = xfce_mailwatch_create_framebox(_("Icons"), &frame_bin); + frame = xfce_gtk_frame_box_new(_("Icons"), &frame_bin); gtk_box_pack_start(GTK_BOX(topvbox), frame, FALSE, FALSE, 0); sg = gtk_size_group_new(GTK_SIZE_GROUP_BOTH); _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits