2004-08-21 [paul] 0.9.12cvs66.4

	* src/mainwindow.c
	* src/messageview.c
	* src/gtk/menu.c
	* src/plugins/spamassassin/spamassassin_gtk.c
		remove some deprecated gtk1 functions

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 17d4318e7e27bddd261ca3544b03688b41c45539..3dde2d289f3d679ccb4de065ac2493696f19c01e 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,12 @@
+2004-08-21 [paul]      0.9.12cvs66.4
+
+       * src/mainwindow.c
+       * src/messageview.c
+       * src/gtk/menu.c
+       * src/plugins/spamassassin/spamassassin_gtk.c
+               remove some deprecated gtk1 functions
+
+
 2004-08-21 [colin]     0.9.12cvs66.3
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 0287d5eed7029c8485293c251ee67bcc7f948f75..6a6f5549ec6be27fb7b26825e41425e835f00685 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -124,3 +124,4 @@
 ( cvs diff -u -r 1.65.2.10 -r 1.65.2.11 src/codeconv.c; ) > 0.9.12cvs66.1.patchset
 ( cvs diff -u -r 1.105.2.7 -r 1.105.2.8 src/prefs_account.c; ) > 0.9.12cvs66.2.patchset
 ( cvs diff -u -r 1.382.2.40 -r 1.382.2.41 src/compose.c; cvs diff -u -r 1.65.2.11 -r 1.65.2.12 src/codeconv.c; ) > 0.9.12cvs66.3.patchset
+( cvs diff -u -r 1.274.2.17 -r 1.274.2.18 src/mainwindow.c; cvs diff -u -r 1.94.2.29 -r 1.94.2.30 src/messageview.c; cvs diff -u -r 1.5.2.9 -r 1.5.2.10 src/gtk/menu.c; cvs diff -u -r 1.23.2.4 -r 1.23.2.5 src/plugins/spamassassin/spamassassin_gtk.c; ) > 0.9.12cvs66.4.patchset

diff --git a/configure.ac b/configure.ac
index 068c115f08e4994221c3575c2fe797c9707ea818..ce432a414807f44c1992b3cee0b886ec1f5d6854 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=66
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.3
+EXTRA_GTK2_VERSION=.4
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}

diff --git a/src/gtk/menu.c b/src/gtk/menu.c
index 19b13d5774dc71d57299c657171916ba8318d358..d5314bf43c770b1e1c0f31469bb40ee9e272e159 100644 (file)
--- a/src/gtk/menu.c
+++ b/src/gtk/menu.c
@@ -314,12 +314,12 @@ void menu_select_by_data(GtkMenu *menu, gpointer data)
        
        g_return_if_fail(menu != NULL);
 
-       children = gtk_container_children(GTK_CONTAINER(menu));
+       children = gtk_container_get_children(GTK_CONTAINER(menu));
 
        for (cur = children; cur != NULL; cur = g_list_next(cur)) {
-               GtkObject *child = G_OBJECT(cur->data);
+               GObject *child = G_OBJECT(cur->data);
 
-               if (gtk_object_get_user_data(child) == data) {
+               if (g_object_get_data(child, MENU_VAL_ID) == data) {
                        select_item = GTK_WIDGET(child);
                }
        }

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 3d100b552ae9a6fcffcf79bb7c9196b765b27029..bae439f14b38a966eba40bf2dbf7bcf425b218a4 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -2632,7 +2632,7 @@ static void hide_read_messages (MainWindow *mainwin, guint action,
                                GtkWidget *widget)
 {
        if (!mainwin->summaryview->folder_item
-           || gtk_object_get_data(GTK_OBJECT(widget), "dont_toggle"))
+           || g_object_get_data(G_OBJECT(widget), "dont_toggle"))
                return;
        summary_toggle_show_read_messages(mainwin->summaryview);
 }

diff --git a/src/messageview.c b/src/messageview.c
index a27c1a78413a8dd6103e792df0581a0e6fc5c60e..5ff5894942a0c9e2f86d0e79ea9a102ed0a33774 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -1152,7 +1152,7 @@ static void partial_recv_unmark_clicked(NoticeView *noticeview,
 
 static void select_account_cb(GtkWidget *w, gpointer data)
 {
-       *(gint*)data = GPOINTER_TO_INT(gtk_object_get_user_data(GTK_OBJECT(w)));
+       *(gint*)data = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(w), MENU_VAL_ID));
 }
        
 static PrefsAccount *select_account_from_list(GList *ac_list)

diff --git a/src/plugins/spamassassin/spamassassin_gtk.c b/src/plugins/spamassassin/spamassassin_gtk.c
index cfd0293470fa734f35fb2210f424a570e1d89e3e..9416003ba7379c45b5d789a13af849003c98da48 100644 (file)
--- a/src/plugins/spamassassin/spamassassin_gtk.c
+++ b/src/plugins/spamassassin/spamassassin_gtk.c
@@ -36,6 +36,7 @@
 #include "prefs_gtk.h"
 #include "foldersel.h"
 #include "spamassassin.h"
+#include "menu.h"
 
 struct SpamAssassinPage
 {
@@ -119,7 +120,7 @@ static void transport_sel_cb(GtkMenuItem *menuitem, gpointer data)
        struct SpamAssassinPage *page = (struct SpamAssassinPage *) data;
        struct Transport *transport;
 
-       transport = (struct Transport *) gtk_object_get_user_data(GTK_OBJECT(menuitem));
+       transport = (struct Transport *) g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID);
        show_transport(page, transport);
 }
 
@@ -376,9 +377,9 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
                GtkWidget *menuitem;
 
                menuitem = gtk_menu_item_new_with_label(gettext(transports[i].name));
-               gtk_object_set_user_data(GTK_OBJECT(menuitem), &transports[i]);
-               gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
-                                  GTK_SIGNAL_FUNC(transport_sel_cb), page);
+               g_object_set_data(G_OBJECT(menuitem), MENU_VAL_ID, &transports[i]);
+               g_signal_connect(G_OBJECT(menuitem), "activate",
+                                G_CALLBACK(transport_sel_cb), page);
                gtk_widget_show(menuitem);
                gtk_menu_append(GTK_MENU(transport_menu), menuitem);