+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
( 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
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}
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);
}
}
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);
}
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)
#include "prefs_gtk.h"
#include "foldersel.h"
#include "spamassassin.h"
+#include "menu.h"
struct SpamAssassinPage
{
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);
}
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);