balsa r7968 - in trunk: . libbalsa libinit_balsa src
- From: PeterB svn gnome org
- To: svn-commits-list gnome org
- Subject: balsa r7968 - in trunk: . libbalsa libinit_balsa src
- Date: Tue, 9 Sep 2008 23:20:32 +0000 (UTC)
Author: PeterB
Date: Tue Sep 9 23:20:32 2008
New Revision: 7968
URL: http://svn.gnome.org/viewvc/balsa?rev=7968&view=rev
Log:
Gtk 2.14 deprecation cleanup
Modified:
trunk/ChangeLog
trunk/libbalsa/mailbox.c
trunk/libbalsa/source-viewer.c
trunk/libinit_balsa/assistant_page_user.c
trunk/libinit_balsa/balsa-druid-page-user.c
trunk/src/ab-window.c
trunk/src/ab-window.h
trunk/src/balsa-cite-bar.c
trunk/src/balsa-index.c
trunk/src/balsa-index.h
trunk/src/balsa-mblist.c
trunk/src/balsa-mblist.h
trunk/src/balsa-message.c
trunk/src/balsa-message.h
trunk/src/balsa-mime-widget.h
trunk/src/filter-edit-callbacks.c
trunk/src/mailbox-conf.c
trunk/src/mailbox-conf.h
trunk/src/mailbox-node.c
trunk/src/main-window.c
trunk/src/main-window.h
trunk/src/sendmsg-window.c
trunk/src/spell-check.c
trunk/src/spell-check.h
Modified: trunk/libbalsa/mailbox.c
==============================================================================
--- trunk/libbalsa/mailbox.c (original)
+++ trunk/libbalsa/mailbox.c Tue Sep 9 23:20:32 2008
@@ -3185,11 +3185,11 @@
static void mbox_set_sort_func(GtkTreeSortable * sortable,
gint sort_column_id,
GtkTreeIterCompareFunc func, gpointer data,
- GtkDestroyNotify destroy);
+ GDestroyNotify destroy);
static void mbox_set_default_sort_func(GtkTreeSortable * sortable,
GtkTreeIterCompareFunc func,
gpointer data,
- GtkDestroyNotify destroy);
+ GDestroyNotify destroy);
static gboolean mbox_has_default_sort_func(GtkTreeSortable * sortable);
static void
@@ -3504,7 +3504,7 @@
mbox_set_sort_func(GtkTreeSortable * sortable,
gint sort_column_id,
GtkTreeIterCompareFunc func,
- gpointer data, GtkDestroyNotify destroy)
+ gpointer data, GDestroyNotify destroy)
{
g_warning("%s called but not implemented.\n", __func__);
}
@@ -3512,7 +3512,7 @@
static void
mbox_set_default_sort_func(GtkTreeSortable * sortable,
GtkTreeIterCompareFunc func,
- gpointer data, GtkDestroyNotify destroy)
+ gpointer data, GDestroyNotify destroy)
{
g_warning("%s called but not implemented.\n", __func__);
}
Modified: trunk/libbalsa/source-viewer.c
==============================================================================
--- trunk/libbalsa/source-viewer.c (original)
+++ trunk/libbalsa/source-viewer.c Tue Sep 9 23:20:32 2008
@@ -281,7 +281,7 @@
gtk_box_pack_start(GTK_BOX(vbox),
lbsv_app_set_menus(GTK_WINDOW(window),
&escape_action), FALSE, TRUE, 1);
- gtk_box_pack_start_defaults(GTK_BOX(vbox), interior);
+ gtk_box_pack_start(GTK_BOX(vbox), interior, TRUE, TRUE, 0);
gtk_container_add(GTK_CONTAINER(window), vbox);
lsvi = g_new(LibBalsaSourceViewerInfo, 1);
Modified: trunk/libinit_balsa/assistant_page_user.c
==============================================================================
--- trunk/libinit_balsa/assistant_page_user.c (original)
+++ trunk/libinit_balsa/assistant_page_user.c Tue Sep 9 23:20:32 2008
@@ -86,7 +86,7 @@
#endif
label = GTK_LABEL(gtk_label_new(_(header2)));
gtk_label_set_line_wrap(label, TRUE);
- gtk_box_pack_start_defaults(GTK_BOX(page), GTK_WIDGET(label));
+ gtk_box_pack_start(GTK_BOX(page), GTK_WIDGET(label), TRUE, TRUE, 0);
table = GTK_TABLE(gtk_table_new(10, 2, FALSE));
Modified: trunk/libinit_balsa/balsa-druid-page-user.c
==============================================================================
--- trunk/libinit_balsa/balsa-druid-page-user.c (original)
+++ trunk/libinit_balsa/balsa-druid-page-user.c Tue Sep 9 23:20:32 2008
@@ -84,7 +84,8 @@
#endif
label = GTK_LABEL(gtk_label_new(_(header2)));
gtk_label_set_line_wrap(label, TRUE);
- gtk_box_pack_start_defaults(GTK_BOX(page->vbox), GTK_WIDGET(label));
+ gtk_box_pack_start(GTK_BOX(page->vbox), GTK_WIDGET(label),
+ TRUE, TRUE, 0);
table = GTK_TABLE(gtk_table_new(10, 2, FALSE));
Modified: trunk/src/ab-window.c
==============================================================================
--- trunk/src/ab-window.c (original)
+++ trunk/src/ab-window.c Tue Sep 9 23:20:32 2008
@@ -86,10 +86,10 @@
GtkDialogClass parent_class;
};
-GtkType
+GType
balsa_ab_window_get_type(void)
{
- static GtkType ab_type = 0;
+ static GType ab_type = 0;
if ( !ab_type ) {
static const GTypeInfo ab_info = {
Modified: trunk/src/ab-window.h
==============================================================================
--- trunk/src/ab-window.h (original)
+++ trunk/src/ab-window.h Tue Sep 9 23:20:32 2008
@@ -23,10 +23,10 @@
#define __AB_WINDOW_H__
#define BALSA_TYPE_AB_WINDOW (balsa_ab_window_get_type ())
-#define BALSA_AB_WINDOW(obj) (GTK_CHECK_CAST ((obj), BALSA_TYPE_AB_WINDOW, BalsaAbWindow))
-#define BALSA_AB_WINDOW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), BALSA_TYPE_AB_WINDOW, BalsaAbWindowClass))
-#define BALSA_IS_AB_WINDOW(obj) (GTK_CHECK_TYPE ((obj), BALSA_TYPE_AB_WINDOW))
-#define BALSA_IS_AB_WINDOW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), BALSA_TYPE_AB_WINDOW))
+#define BALSA_AB_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), BALSA_TYPE_AB_WINDOW, BalsaAbWindow))
+#define BALSA_AB_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), BALSA_TYPE_AB_WINDOW, BalsaAbWindowClass))
+#define BALSA_IS_AB_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), BALSA_TYPE_AB_WINDOW))
+#define BALSA_IS_AB_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), BALSA_TYPE_AB_WINDOW))
typedef struct _BalsaAbWindow BalsaAbWindow;
@@ -65,7 +65,7 @@
GtkWidget *combo_box;
};
-GtkType balsa_ab_window_get_type(void);
+GType balsa_ab_window_get_type(void);
GtkWidget *balsa_ab_window_new(gboolean composing, GtkWindow* parent);
gchar *balsa_ab_window_get_recipients(BalsaAbWindow *ab);
Modified: trunk/src/balsa-cite-bar.c
==============================================================================
--- trunk/src/balsa-cite-bar.c (original)
+++ trunk/src/balsa-cite-bar.c Tue Sep 9 23:20:32 2008
@@ -72,7 +72,7 @@
object_class = (GtkObjectClass*) class;
widget_class = (GtkWidgetClass*) class;
- parent_class = gtk_type_class(gtk_widget_get_type());
+ parent_class = g_type_class_peek_parent(class);
object_class->destroy = balsa_cite_bar_destroy;
Modified: trunk/src/balsa-index.c
==============================================================================
--- trunk/src/balsa-index.c (original)
+++ trunk/src/balsa-index.c Tue Sep 9 23:20:32 2008
@@ -119,7 +119,7 @@
static GtkWidget *create_stock_menu_item(GtkWidget * menu,
const gchar * type,
const gchar * label,
- GtkSignalFunc cb, gpointer data);
+ GCallback cb, gpointer data);
static void sendmsg_window_destroy_cb(GtkWidget * widget, gpointer data);
@@ -143,10 +143,10 @@
static GtkTreeViewClass *parent_class = NULL;
/* Class type. */
-GtkType
+GType
balsa_index_get_type(void)
{
- static GtkType balsa_index_type = 0;
+ static GType balsa_index_type = 0;
if (!balsa_index_type) {
static const GTypeInfo balsa_index_info = {
@@ -179,7 +179,7 @@
object_class = (GtkObjectClass *) klass;
widget_class = (GtkWidgetClass *) klass;
- parent_class = gtk_type_class(GTK_TYPE_TREE_VIEW);
+ parent_class = g_type_class_peek_parent(klass);
balsa_index_signals[INDEX_CHANGED] =
g_signal_new("index-changed",
@@ -1779,23 +1779,23 @@
{
const static struct { /* this is a invariable part of */
const char *icon, *label; /* the context message menu. */
- GtkSignalFunc func;
+ GCallback func;
} entries[] = {
{
BALSA_PIXMAP_REPLY, N_("_Reply..."),
- GTK_SIGNAL_FUNC(balsa_message_reply)}, {
+ G_CALLBACK(balsa_message_reply)}, {
BALSA_PIXMAP_REPLY_ALL, N_("Reply To _All..."),
- GTK_SIGNAL_FUNC(balsa_message_replytoall)}, {
+ G_CALLBACK(balsa_message_replytoall)}, {
BALSA_PIXMAP_REPLY_GROUP, N_("Reply To _Group..."),
- GTK_SIGNAL_FUNC(balsa_message_replytogroup)}, {
+ G_CALLBACK(balsa_message_replytogroup)}, {
BALSA_PIXMAP_FORWARD, N_("_Forward Attached..."),
- GTK_SIGNAL_FUNC(balsa_message_forward_attached)}, {
+ G_CALLBACK(balsa_message_forward_attached)}, {
BALSA_PIXMAP_FORWARD, N_("Forward _Inline..."),
- GTK_SIGNAL_FUNC(balsa_message_forward_inline)}, {
+ G_CALLBACK(balsa_message_forward_inline)}, {
NULL, N_("_Pipe through..."),
- GTK_SIGNAL_FUNC(balsa_index_pipe)}, {
+ G_CALLBACK(balsa_index_pipe)}, {
BALSA_PIXMAP_BOOK_RED, N_("_Store Address..."),
- GTK_SIGNAL_FUNC(bndx_store_address)}};
+ G_CALLBACK(bndx_store_address)}};
GtkWidget *menu, *menuitem, *submenu;
unsigned i;
@@ -1810,17 +1810,17 @@
index->delete_item =
create_stock_menu_item(menu, GTK_STOCK_DELETE,
_("_Delete"),
- GTK_SIGNAL_FUNC(bi_toggle_deleted_cb),
+ G_CALLBACK(bi_toggle_deleted_cb),
index);
index->undelete_item =
create_stock_menu_item(menu, GTK_STOCK_UNDELETE,
_("_Undelete"),
- GTK_SIGNAL_FUNC(bi_toggle_deleted_cb),
+ G_CALLBACK(bi_toggle_deleted_cb),
index);
index->move_to_trash_item =
create_stock_menu_item(menu, GTK_STOCK_DELETE,
_("Move To _Trash"),
- GTK_SIGNAL_FUNC
+ G_CALLBACK
(balsa_message_move_to_trash), index);
menuitem = gtk_menu_item_new_with_mnemonic(_("T_oggle"));
@@ -1828,10 +1828,10 @@
submenu = gtk_menu_new();
create_stock_menu_item(submenu, BALSA_PIXMAP_INFO_FLAGGED,
_("_Flagged"),
- GTK_SIGNAL_FUNC(bi_toggle_flagged_cb),
+ G_CALLBACK(bi_toggle_flagged_cb),
index);
create_stock_menu_item(submenu, BALSA_PIXMAP_INFO_NEW, _("_Unread"),
- GTK_SIGNAL_FUNC(bi_toggle_new_cb),
+ G_CALLBACK(bi_toggle_new_cb),
index);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), submenu);
@@ -1847,7 +1847,7 @@
gtk_separator_menu_item_new());
create_stock_menu_item(menu, BALSA_PIXMAP_BOOK_OPEN,
_("_View Source"),
- GTK_SIGNAL_FUNC(bndx_view_source),
+ G_CALLBACK(bndx_view_source),
index);
return menu;
@@ -1959,7 +1959,7 @@
static GtkWidget *
create_stock_menu_item(GtkWidget * menu, const gchar * type,
- const gchar * label, GtkSignalFunc cb,
+ const gchar * label, GCallback cb,
gpointer data)
{
GtkWidget *menuitem = gtk_image_menu_item_new_with_mnemonic(label);
Modified: trunk/src/balsa-index.h
==============================================================================
--- trunk/src/balsa-index.h (original)
+++ trunk/src/balsa-index.h Tue Sep 9 23:20:32 2008
@@ -31,13 +31,13 @@
extern "C" {
#endif /* __cplusplus */
- GtkType balsa_index_get_type(void);
+ GType balsa_index_get_type(void);
#define BALSA_TYPE_INDEX (balsa_index_get_type ())
-#define BALSA_INDEX(obj) (GTK_CHECK_CAST (obj, BALSA_TYPE_INDEX, BalsaIndex))
-#define BALSA_INDEX_CLASS(klass) (GTK_CHECK_CLASS_CAST (klass, BALSA_TYPE_INDEX, BalsaIndexClass))
-#define BALSA_IS_INDEX(obj) (GTK_CHECK_TYPE (obj, BALSA_TYPE_INDEX))
-#define BALSA_IS_INDEX_CLASS(klass) (GTK_CHECK_CLASS_TYPE (klass, BALSA_TYPE_INDEX))
+#define BALSA_INDEX(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, BALSA_TYPE_INDEX, BalsaIndex))
+#define BALSA_INDEX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, BALSA_TYPE_INDEX, BalsaIndexClass))
+#define BALSA_IS_INDEX(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, BALSA_TYPE_INDEX))
+#define BALSA_IS_INDEX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE (klass, BALSA_TYPE_INDEX))
typedef struct _BalsaIndex BalsaIndex;
Modified: trunk/src/balsa-mblist.c
==============================================================================
--- trunk/src/balsa-mblist.c (original)
+++ trunk/src/balsa-mblist.c Tue Sep 9 23:20:32 2008
@@ -139,10 +139,10 @@
/* class methods */
-GtkType
+GType
balsa_mblist_get_type(void)
{
- static GtkType mblist_type = 0;
+ static GType mblist_type = 0;
if (!mblist_type) {
static const GTypeInfo mblist_info = {
Modified: trunk/src/balsa-mblist.h
==============================================================================
--- trunk/src/balsa-mblist.h (original)
+++ trunk/src/balsa-mblist.h Tue Sep 9 23:20:32 2008
@@ -26,9 +26,9 @@
#include "mailbox-node.h"
#define BALSA_TYPE_MBLIST (balsa_mblist_get_type ())
-#define BALSA_MBLIST(obj) GTK_CHECK_CAST (obj, BALSA_TYPE_MBLIST, BalsaMBList)
-#define BALSA_MBLIST_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, BALSA_TYPE_MBLIST, BalsaMBListClass)
-#define BALSA_IS_MBLIST(obj) GTK_CHECK_TYPE (obj, BALSA_TYPE_MBLIST)
+#define BALSA_MBLIST(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, BALSA_TYPE_MBLIST, BalsaMBList)
+#define BALSA_MBLIST_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, BALSA_TYPE_MBLIST, BalsaMBListClass)
+#define BALSA_IS_MBLIST(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, BALSA_TYPE_MBLIST)
typedef struct _BalsaMBList BalsaMBList;
typedef struct _BalsaMBListClass BalsaMBListClass;
@@ -53,7 +53,7 @@
gboolean has_unread_mailbox);
};
-GtkType balsa_mblist_get_type(void);
+GType balsa_mblist_get_type(void);
GtkWidget *balsa_mblist_new(void);
Modified: trunk/src/balsa-message.c
==============================================================================
--- trunk/src/balsa-message.c (original)
+++ trunk/src/balsa-message.c Tue Sep 9 23:20:32 2008
@@ -204,10 +204,10 @@
return balsa_part_info_type;
}
-GtkType
+GType
balsa_message_get_type()
{
- static GtkType balsa_message_type = 0;
+ static GType balsa_message_type = 0;
if (!balsa_message_type) {
static const GTypeInfo balsa_message_info = {
@@ -926,14 +926,14 @@
gtk_menu_item_new_with_label (_("Save selected as..."));
gtk_widget_show(menu_item);
g_signal_connect (G_OBJECT (menu_item), "activate",
- GTK_SIGNAL_FUNC (part_context_save_all_cb),
+ G_CALLBACK (part_context_save_all_cb),
(gpointer) bm->save_all_list);
gtk_menu_shell_append (GTK_MENU_SHELL (bm->save_all_popup), menu_item);
menu_item =
gtk_menu_item_new_with_label (_("Save selected to folder..."));
gtk_widget_show(menu_item);
g_signal_connect (G_OBJECT (menu_item), "activate",
- GTK_SIGNAL_FUNC (part_context_dump_all_cb),
+ G_CALLBACK (part_context_dump_all_cb),
(gpointer) bm->save_all_list);
gtk_menu_shell_append (GTK_MENU_SHELL (bm->save_all_popup), menu_item);
if (event)
@@ -1293,7 +1293,7 @@
g_object_set_data(G_OBJECT(menuitem), "balsa-message", bm);
g_signal_connect(G_OBJECT (menuitem), "activate",
- GTK_SIGNAL_FUNC (atattchments_menu_cb),
+ G_CALLBACK (atattchments_menu_cb),
(gpointer) info);
gtk_menu_shell_append(menu, menuitem);
}
@@ -1321,7 +1321,7 @@
g_object_set_data(G_OBJECT(menuitem), "balsa-message", bm);
g_signal_connect(G_OBJECT (menuitem), "activate",
- GTK_SIGNAL_FUNC (toggle_all_inline_cb),
+ G_CALLBACK (toggle_all_inline_cb),
(gpointer) info);
gtk_menu_shell_append(menu, menuitem);
Modified: trunk/src/balsa-message.h
==============================================================================
--- trunk/src/balsa-message.h (original)
+++ trunk/src/balsa-message.h Tue Sep 9 23:20:32 2008
@@ -31,9 +31,9 @@
#define BALSA_TYPE_MESSAGE (balsa_message_get_type ())
-#define BALSA_MESSAGE(obj) GTK_CHECK_CAST (obj, BALSA_TYPE_MESSAGE, BalsaMessage)
-#define BALSA_MESSAGE_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, BALSA_TYPE_MESSAGE, BalsaMessageClass)
-#define BALSA_IS_MESSAGE(obj) GTK_CHECK_TYPE (obj, BALSA_TYPE_MESSAGE)
+#define BALSA_MESSAGE(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, BALSA_TYPE_MESSAGE, BalsaMessage)
+#define BALSA_MESSAGE_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, BALSA_TYPE_MESSAGE, BalsaMessageClass)
+#define BALSA_IS_MESSAGE(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, BALSA_TYPE_MESSAGE)
typedef struct _BalsaMessage BalsaMessage;
@@ -97,7 +97,7 @@
void (*select_part) (BalsaMessage * message);
};
-GtkType balsa_message_get_type(void);
+GType balsa_message_get_type(void);
GtkWidget *balsa_message_new(void);
void balsa_message_set_close(BalsaMessage * bmessage,
gboolean close_with_msg);
Modified: trunk/src/balsa-mime-widget.h
==============================================================================
--- trunk/src/balsa-mime-widget.h (original)
+++ trunk/src/balsa-mime-widget.h Tue Sep 9 23:20:32 2008
@@ -42,9 +42,9 @@
#define BALSA_TYPE_MIME_WIDGET (balsa_mime_widget_get_type ())
-#define BALSA_MIME_WIDGET(obj) GTK_CHECK_CAST (obj, BALSA_TYPE_MIME_WIDGET, BalsaMimeWidget)
-#define BALSA_MIME_WIDGET_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, BALSA_TYPE_MIME_WIDGET, BalsaMimeWidgetClass)
-#define BALSA_IS_MIME_WIDGET(obj) GTK_CHECK_TYPE (obj, BALSA_TYPE_MIME_WIDGET)
+#define BALSA_MIME_WIDGET(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, BALSA_TYPE_MIME_WIDGET, BalsaMimeWidget)
+#define BALSA_MIME_WIDGET_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, BALSA_TYPE_MIME_WIDGET, BalsaMimeWidgetClass)
+#define BALSA_IS_MIME_WIDGET(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, BALSA_TYPE_MIME_WIDGET)
typedef struct _BalsaMimeWidgetClass BalsaMimeWidgetClass;
Modified: trunk/src/filter-edit-callbacks.c
==============================================================================
--- trunk/src/filter-edit-callbacks.c (original)
+++ trunk/src/filter-edit-callbacks.c Tue Sep 9 23:20:32 2008
@@ -982,7 +982,7 @@
box = gtk_vbox_new(FALSE, 5);
table = gtk_table_new(7, 2, FALSE);
- gtk_box_pack_start_defaults(GTK_BOX(box), table);
+ gtk_box_pack_start(GTK_BOX(box), table, TRUE, TRUE, 0);
fe_type_simple_label =
gtk_label_new_with_mnemonic(_("One of the specified f_ields contains"));
@@ -1017,7 +1017,7 @@
#if REGULAR_EXPRESSION_FILTERING_IS_IMPLEMENTED
page = gtk_table_new(5, 6, FALSE);
- gtk_box_pack_start_defaults(GTK_BOX(box), page);
+ gtk_box_pack_start(GTK_BOX(box), page, TRUE, TRUE, 0);
fe_type_regex_label =
gtk_label_new_with_mnemonic(_("_One of the regular expressions matches"));
@@ -1067,7 +1067,7 @@
GTK_FILL | GTK_SHRINK | GTK_EXPAND, GTK_SHRINK, 2, 2);
#else /* REGULAR_EXPRESSION_FILTERING_IS_IMPLEMENTED */
msg = _("Filtering using regular expressions is not yet implemented.");
- gtk_box_pack_start_defaults(GTK_BOX(box), gtk_label_new(msg));
+ gtk_box_pack_start(GTK_BOX(box), gtk_label_new(msg), TRUE, TRUE, 0);
#endif /* REGULAR_EXPRESSION_FILTERING_IS_IMPLEMENTED */
/* The date page of the notebook */
Modified: trunk/src/mailbox-conf.c
==============================================================================
--- trunk/src/mailbox-conf.c (original)
+++ trunk/src/mailbox-conf.c Tue Sep 9 23:20:32 2008
@@ -75,7 +75,7 @@
void (*ok_handler)(MailboxConfWindow*);
const gchar *ok_button_name;
GtkWidget *mailbox_name;
- GtkType mailbox_type;
+ GType mailbox_type;
BalsaMailboxConfView *view_info;
gboolean ok_sensitive;
@@ -532,7 +532,7 @@
}
static GtkWidget *
-run_mailbox_conf(BalsaMailboxNode* mbnode, GtkType mailbox_type,
+run_mailbox_conf(BalsaMailboxNode* mbnode, GType mailbox_type,
gboolean update)
{
MailboxConfWindow* mcw;
@@ -575,7 +575,7 @@
* If the used clicks save add the new mailbox to the tree.
*/
void
-mailbox_conf_new(GtkType mailbox_type)
+mailbox_conf_new(GType mailbox_type)
{
static GtkWidget *dialog;
@@ -1092,7 +1092,7 @@
label = libbalsa_create_label(_("_Mailbox Name:"), table, ++row);
mcw->mailbox_name =
libbalsa_create_entry(table,
- GTK_SIGNAL_FUNC(check_for_blank_fields),
+ G_CALLBACK(check_for_blank_fields),
mcw, row, NULL, label);
} else mcw->mailbox_name = NULL;
@@ -1157,12 +1157,12 @@
/* mailbox name */
label = libbalsa_create_label(_("Mailbox _Name:"), table, 0);
mcw->mailbox_name = libbalsa_create_entry(table,
- GTK_SIGNAL_FUNC(check_for_blank_fields),
+ G_CALLBACK(check_for_blank_fields),
mcw, 0, NULL, label);
/* pop server */
label = libbalsa_create_label(_("_Server:"), table, 1);
mcw->mb_data.pop3.bsc.server = libbalsa_create_entry(table,
- GTK_SIGNAL_FUNC(check_for_blank_fields),
+ G_CALLBACK(check_for_blank_fields),
mcw, 1, "localhost", label);
mcw->mb_data.pop3.bsc.default_ports = POP3_DEFAULT_PORTS;
@@ -1170,7 +1170,7 @@
/* username */
label= libbalsa_create_label(_("Use_r name:"), table, 2);
mcw->mb_data.pop3.username = libbalsa_create_entry(table,
- GTK_SIGNAL_FUNC(check_for_blank_fields),
+ G_CALLBACK(check_for_blank_fields),
mcw, 2, g_get_user_name(), label);
/* password field */
@@ -1199,7 +1199,7 @@
label = libbalsa_create_label(_("Fi_lter Command:"), table, 7);
mcw->mb_data.pop3.filter_cmd =
libbalsa_create_entry(table,
- GTK_SIGNAL_FUNC(check_for_blank_fields),
+ G_CALLBACK(check_for_blank_fields),
mcw, 7, "procmail -f -", label);
advanced =
@@ -1259,14 +1259,14 @@
/* mailbox name */
label = libbalsa_create_label(_("Mailbox _Name:"), table, ++row);
mcw->mailbox_name = libbalsa_create_entry(table,
- GTK_SIGNAL_FUNC(check_for_blank_fields),
+ G_CALLBACK(check_for_blank_fields),
mcw, row, NULL, label);
/* imap server */
label = libbalsa_create_label(_("_Server:"), table, ++row);
mcw->mb_data.imap.bsc.server =
libbalsa_create_entry(table,
- GTK_SIGNAL_FUNC(check_for_blank_fields),
+ G_CALLBACK(check_for_blank_fields),
mcw, row, "localhost", label);
mcw->mb_data.imap.bsc.default_ports = IMAP_DEFAULT_PORTS;
@@ -1274,7 +1274,7 @@
label = libbalsa_create_label(_("_Username:"), table, ++row);
mcw->mb_data.imap.username =
libbalsa_create_entry(table,
- GTK_SIGNAL_FUNC(check_for_blank_fields),
+ G_CALLBACK(check_for_blank_fields),
mcw, row, g_get_user_name(), label);
/* toggle for anonymous password */
Modified: trunk/src/mailbox-conf.h
==============================================================================
--- trunk/src/mailbox-conf.h (original)
+++ trunk/src/mailbox-conf.h Tue Sep 9 23:20:32 2008
@@ -28,7 +28,7 @@
typedef struct _BalsaMailboxConfView BalsaMailboxConfView;
-void mailbox_conf_new(GtkType mailbox_type);
+void mailbox_conf_new(GType mailbox_type);
void mailbox_conf_edit(BalsaMailboxNode * mbnode);
void mailbox_conf_delete(BalsaMailboxNode * mbnode);
Modified: trunk/src/mailbox-node.c
==============================================================================
--- trunk/src/mailbox-node.c (original)
+++ trunk/src/mailbox-node.c Tue Sep 9 23:20:32 2008
@@ -897,7 +897,7 @@
* Context menu, helpers, and callbacks.
* --------------------------------------------------------------------- */
static void
-add_menu_entry(GtkWidget * menu, const gchar * label, GtkSignalFunc cb,
+add_menu_entry(GtkWidget * menu, const gchar * label, GCallback cb,
BalsaMailboxNode * mbnode)
{
GtkWidget *menuitem;
@@ -1028,18 +1028,18 @@
submenu = gtk_menu_new();
add_menu_entry(submenu, _("Local _mbox mailbox..."),
- GTK_SIGNAL_FUNC(mailbox_conf_add_mbox_cb), NULL);
+ G_CALLBACK(mailbox_conf_add_mbox_cb), NULL);
add_menu_entry(submenu, _("Local Mail_dir mailbox..."),
- GTK_SIGNAL_FUNC(mailbox_conf_add_maildir_cb), NULL);
+ G_CALLBACK(mailbox_conf_add_maildir_cb), NULL);
add_menu_entry(submenu, _("Local M_H mailbox..."),
- GTK_SIGNAL_FUNC(mailbox_conf_add_mh_cb), NULL);
+ G_CALLBACK(mailbox_conf_add_mh_cb), NULL);
add_menu_entry(submenu, _("Remote _IMAP mailbox..."),
- GTK_SIGNAL_FUNC(mailbox_conf_add_imap_cb), NULL);
+ G_CALLBACK(mailbox_conf_add_imap_cb), NULL);
add_menu_entry(submenu, NULL, NULL, mbnode);
add_menu_entry(submenu, _("Remote IMAP _folder..."),
- GTK_SIGNAL_FUNC(folder_conf_add_imap_cb), NULL);
+ G_CALLBACK(folder_conf_add_imap_cb), NULL);
add_menu_entry(submenu, _("Remote IMAP _subfolder..."),
- GTK_SIGNAL_FUNC(folder_conf_add_imap_sub_cb), NULL);
+ G_CALLBACK(folder_conf_add_imap_sub_cb), NULL);
gtk_widget_show(submenu);
menuitem = gtk_menu_item_new_with_mnemonic(_("_New"));
@@ -1049,7 +1049,7 @@
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
if(mbnode == NULL) {/* clicked on the empty space */
- add_menu_entry(menu, _("_Rescan"), GTK_SIGNAL_FUNC(mb_rescan_cb),
+ add_menu_entry(menu, _("_Rescan"), G_CALLBACK(mb_rescan_cb),
NULL);
return menu;
}
@@ -1066,7 +1066,7 @@
balsa_mailbox_node_signals
[APPEND_SUBTREE], 0, FALSE))
add_menu_entry(menu, _("_Rescan"),
- GTK_SIGNAL_FUNC(mb_rescan_cb), mbnode);
+ G_CALLBACK(mb_rescan_cb), mbnode);
if (mbnode->config_prefix)
add_menu_entry(menu, _("_Delete"), G_CALLBACK(mb_del_cb), mbnode);
@@ -1090,29 +1090,29 @@
if(LIBBALSA_IS_MAILBOX_IMAP(mailbox)) {
add_menu_entry(menu, NULL, NULL, NULL);
add_menu_entry(menu, _("_Subscribe"),
- GTK_SIGNAL_FUNC(mb_subscribe_cb), mbnode);
+ G_CALLBACK(mb_subscribe_cb), mbnode);
add_menu_entry(menu, _("_Unsubscribe"),
- GTK_SIGNAL_FUNC(mb_unsubscribe_cb), mbnode);
+ G_CALLBACK(mb_unsubscribe_cb), mbnode);
}
if (!special) {
add_menu_entry(menu, NULL, NULL, NULL);
add_menu_entry(menu, _("Mark as _Inbox"),
- GTK_SIGNAL_FUNC(mb_inbox_cb), mbnode);
+ G_CALLBACK(mb_inbox_cb), mbnode);
add_menu_entry(menu, _("_Mark as Sentbox"),
- GTK_SIGNAL_FUNC(mb_sentbox_cb), mbnode);
+ G_CALLBACK(mb_sentbox_cb), mbnode);
add_menu_entry(menu, _("Mark as _Trash"),
- GTK_SIGNAL_FUNC(mb_trash_cb), mbnode);
+ G_CALLBACK(mb_trash_cb), mbnode);
add_menu_entry(menu, _("Mark as D_raftbox"),
- GTK_SIGNAL_FUNC(mb_draftbox_cb), mbnode);
+ G_CALLBACK(mb_draftbox_cb), mbnode);
} else if (mailbox == balsa_app.trash)
add_menu_entry(menu, _("_Empty trash"),
- GTK_SIGNAL_FUNC(mb_empty_trash_cb), mbnode);
+ G_CALLBACK(mb_empty_trash_cb), mbnode);
/* FIXME : No test on mailbox type is made yet, should we ? */
add_menu_entry(menu, NULL, NULL, NULL);
add_menu_entry(menu, _("_Edit/Apply filters"),
- GTK_SIGNAL_FUNC(mb_filter_cb), mbnode);
+ G_CALLBACK(mb_filter_cb), mbnode);
return menu;
}
Modified: trunk/src/main-window.c
==============================================================================
--- trunk/src/main-window.c (original)
+++ trunk/src/main-window.c Tue Sep 9 23:20:32 2008
@@ -4051,12 +4051,12 @@
gtk_container_set_border_width(GTK_CONTAINER(w), 6);
reverse_button =
gtk_check_button_new_with_mnemonic(_("_Reverse search"));
- gtk_box_pack_start_defaults(GTK_BOX(w), reverse_button);
+ gtk_box_pack_start(GTK_BOX(w), reverse_button, TRUE, TRUE, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(reverse_button),
reverse);
wrap_button =
gtk_check_button_new_with_mnemonic(_("_Wrap around"));
- gtk_box_pack_start_defaults(GTK_BOX(w), wrap_button);
+ gtk_box_pack_start(GTK_BOX(w), wrap_button, TRUE, TRUE, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(wrap_button),
wrap);
gtk_box_pack_start(GTK_BOX(box), w, TRUE, TRUE, 0);
Modified: trunk/src/main-window.h
==============================================================================
--- trunk/src/main-window.h (original)
+++ trunk/src/main-window.h Tue Sep 9 23:20:32 2008
@@ -25,10 +25,10 @@
#include "toolbar-factory.h"
#define BALSA_TYPE_WINDOW (balsa_window_get_type ())
-#define BALSA_WINDOW(obj) (GTK_CHECK_CAST (obj, BALSA_TYPE_WINDOW, BalsaWindow))
-#define BALSA_WINDOW_CLASS(klass) (GTK_CHECK_CLASS_CAST (klass, BALSA_TYPE_WINDOW, BalsaWindowClass))
-#define BALSA_IS_WINDOW(obj) (GTK_CHECK_TYPE (obj, BALSA_TYPE_WINDOW))
-#define BALSA_IS_WINDOW_CLASS(klass) (GTK_CHECK_CLASS_TYPE (klass, BALSA_TYPE_WINDOW))
+#define BALSA_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, BALSA_TYPE_WINDOW, BalsaWindow))
+#define BALSA_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST (klass, BALSA_TYPE_WINDOW, BalsaWindowClass))
+#define BALSA_IS_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, BALSA_TYPE_WINDOW))
+#define BALSA_IS_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE (klass, BALSA_TYPE_WINDOW))
/* Type values for mailbox checking */
enum MailboxCheckType {
@@ -98,7 +98,7 @@
FILTER_RECIPIENT = 1
};
-GtkType balsa_window_get_type(void);
+GType balsa_window_get_type(void);
GtkWidget *balsa_window_new(void);
GtkWidget *balsa_window_find_current_index(BalsaWindow * window);
void balsa_window_update_book_menus(BalsaWindow *window);
Modified: trunk/src/sendmsg-window.c
==============================================================================
--- trunk/src/sendmsg-window.c (original)
+++ trunk/src/sendmsg-window.c Tue Sep 9 23:20:32 2008
@@ -2115,7 +2115,7 @@
g_object_set_data(G_OBJECT(menu_item), "new-mode",
GINT_TO_POINTER(LIBBALSA_ATTACH_AS_INLINE));
g_signal_connect(G_OBJECT(menu_item), "activate",
- GTK_SIGNAL_FUNC(change_attach_mode),
+ G_CALLBACK(change_attach_mode),
(gpointer)attach_data);
gtk_menu_shell_append(GTK_MENU_SHELL(attach_data->popup_menu),
menu_item);
@@ -2130,7 +2130,7 @@
g_object_set_data(G_OBJECT(menu_item), "new-mode",
GINT_TO_POINTER(LIBBALSA_ATTACH_AS_ATTACHMENT));
g_signal_connect(G_OBJECT(menu_item), "activate",
- GTK_SIGNAL_FUNC(change_attach_mode),
+ G_CALLBACK(change_attach_mode),
(gpointer)attach_data);
gtk_menu_shell_append(GTK_MENU_SHELL(attach_data->popup_menu),
menu_item);
@@ -2144,7 +2144,7 @@
g_object_set_data(G_OBJECT(menu_item), "new-mode",
GINT_TO_POINTER(LIBBALSA_ATTACH_AS_EXTBODY));
g_signal_connect(G_OBJECT(menu_item), "activate",
- GTK_SIGNAL_FUNC(change_attach_mode),
+ G_CALLBACK(change_attach_mode),
(gpointer)attach_data);
gtk_menu_shell_append(GTK_MENU_SHELL(attach_data->popup_menu),
menu_item);
@@ -2154,7 +2154,7 @@
menu_item =
gtk_menu_item_new_with_label(_("Remove"));
g_signal_connect(G_OBJECT (menu_item), "activate",
- GTK_SIGNAL_FUNC(remove_attachment),
+ G_CALLBACK(remove_attachment),
(gpointer)attach_data);
gtk_menu_shell_append(GTK_MENU_SHELL(attach_data->popup_menu),
menu_item);
@@ -2164,7 +2164,7 @@
if (!is_fwd_message)
libbalsa_fill_vfs_menu_by_content_type(GTK_MENU(attach_data->popup_menu),
content_type,
- GTK_SIGNAL_FUNC(attachment_menu_vfs_cb),
+ G_CALLBACK(attachment_menu_vfs_cb),
(gpointer)attach_data);
gtk_widget_show_all(attach_data->popup_menu);
@@ -2225,7 +2225,7 @@
menu_item =
gtk_menu_item_new_with_label(_("Remove"));
g_signal_connect(G_OBJECT (menu_item), "activate",
- GTK_SIGNAL_FUNC(remove_attachment),
+ G_CALLBACK(remove_attachment),
(gpointer)attach_data);
gtk_menu_shell_append(GTK_MENU_SHELL(attach_data->popup_menu),
menu_item);
@@ -2237,7 +2237,7 @@
menu_item =
gtk_menu_item_new_with_label(_("Open..."));
g_signal_connect(G_OBJECT (menu_item), "activate",
- GTK_SIGNAL_FUNC(on_open_url_cb),
+ G_CALLBACK(on_open_url_cb),
(gpointer)attach_data);
gtk_menu_shell_append(GTK_MENU_SHELL(attach_data->popup_menu),
menu_item);
@@ -7028,13 +7028,13 @@
compatibility_table[i].other_program,
compatibility_table[i].other_extension);
gtk_box_set_spacing(GTK_BOX(dialog->vbox), 10);
- gtk_box_pack_start_defaults(GTK_BOX(dialog->vbox),
- label = gtk_label_new(str));
+ gtk_box_pack_start(GTK_BOX(dialog->vbox), label = gtk_label_new(str),
+ TRUE, TRUE, 0);
gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
g_free(str);
checkbox = gtk_check_button_new_with_mnemonic
("_Do not show this dialog any more.");
- gtk_box_pack_start_defaults(GTK_BOX(dialog->vbox), checkbox);
+ gtk_box_pack_start(GTK_BOX(dialog->vbox), checkbox, TRUE, TRUE, 0);
gtk_widget_show(checkbox);
gtk_widget_show(label);
response = gtk_dialog_run(dialog);
Modified: trunk/src/spell-check.c
==============================================================================
--- trunk/src/spell-check.c (original)
+++ trunk/src/spell-check.c Tue Sep 9 23:20:32 2008
@@ -159,10 +159,10 @@
/* begin actual code */
-GtkType
+GType
balsa_spell_check_get_type()
{
- static GtkType balsa_spell_check_type = 0;
+ static GType balsa_spell_check_type = 0;
if (!balsa_spell_check_type) {
static const GTypeInfo balsa_spell_check_info = {
@@ -199,7 +199,7 @@
widget_class = (GtkWidgetClass *) klass;
container_class = (GtkContainerClass *) klass;
- parent_class = gtk_type_class(GTK_TYPE_FRAME);
+ parent_class = g_type_class_peek_parent(klass);
/* GObject signals */
o_class->set_property = spch_set_property;
Modified: trunk/src/spell-check.h
==============================================================================
--- trunk/src/spell-check.h (original)
+++ trunk/src/spell-check.h Tue Sep 9 23:20:32 2008
@@ -36,21 +36,21 @@
#define BALSA_TYPE_SPELL_CHECK \
(balsa_spell_check_get_type ())
#define BALSA_SPELL_CHECK(obj) \
- GTK_CHECK_CAST (obj, BALSA_TYPE_SPELL_CHECK, BalsaSpellCheck)
+ G_TYPE_CHECK_INSTANCE_CAST (obj, BALSA_TYPE_SPELL_CHECK, BalsaSpellCheck)
#define BALSA_SPELL_CHECK_CLASS(klass) \
- GTK_CHECK_CLASS_CAST (klass, BALSA_TYPE_SPELL_CHECK, \
+ G_TYPE_CHECK_CLASS_CAST (klass, BALSA_TYPE_SPELL_CHECK, \
BalsaSpellCheckClass)
#define BALSA_IS_SPELL_CHECK(obj) \
- GTK_CHECK_TYPE (obj, BALSA_TYPE_SPELL_CHECK)
+ G_TYPE_CHECK_INSTANCE_TYPE (obj, BALSA_TYPE_SPELL_CHECK)
#define BALSA_IS_SPELL_CHECK_CLASS(klass) \
- (GTK_CHECK_CLASS_TYPE ((klass), BALSA_TYPE_SPELL_CHECK))
+ (G_TYPE_CHECK_CLASS_TYPE ((klass), BALSA_TYPE_SPELL_CHECK))
/* opaque structures, declared in spell-check.c */
typedef struct _BalsaSpellCheck BalsaSpellCheck;
typedef struct _BalsaSpellCheckClass BalsaSpellCheckClass;
- GtkType balsa_spell_check_get_type(void);
+ GType balsa_spell_check_get_type(void);
/* argument setters */
void balsa_spell_check_set_module(BalsaSpellCheck *, const gchar *);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
