aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog11
-rw-r--r--mail/Makefile.am1
-rw-r--r--mail/mail-callbacks.c13
-rw-r--r--mail/mail-display.c7
-rw-r--r--mail/mail-search.c9
-rw-r--r--mail/message-tag-followup.c10
6 files changed, 32 insertions, 19 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 18f0db9242..3cfdb7c0f8 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,14 @@
+2003-01-03 Jeffrey Stedfast <fejj@ximian.com>
+
+ * mail-display.c: Fixed some build issues.
+
+ * mail-search.c: Same.
+
+ * mail-callbacks.c (save_draft_done): Use
+ g_signal_handlers_disconnect_by_func().
+ (manage_subscriptions): Use a weak_ref instead of connecting to
+ the destroy event.
+
2002-12-17 Jeffrey Stedfast <fejj@ximian.com>
...And a whole bunch more build fixes.
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 196e6396cf..357ce0f5fa 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -31,6 +31,7 @@ INCLUDES = \
-DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \
-DMAIL_IMPORTERSDIR=\""$(importerdir)"\" \
-DG_DISABLE_DEPRECATED \
+ -DGTK_DISABLE_DEPRECATED \
-DG_LOG_DOMAIN=\"evolution-mail\"
EVOLUTION_MAIL_CORBA_GENERATED = \
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index 4617f70bfe..4b32f5cae5 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -599,10 +599,8 @@ save_draft_done (CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *i
ccd = ccd_new ();
/* disconnect the previous signal handlers */
- gtk_signal_disconnect_by_func (GTK_OBJECT (sdi->composer),
- G_CALLBACK (composer_send_cb), NULL);
- gtk_signal_disconnect_by_func (GTK_OBJECT (sdi->composer),
- G_CALLBACK (composer_save_draft_cb), NULL);
+ g_signal_handlers_disconnect_by_func (sdi->composer, G_CALLBACK (composer_send_cb), NULL);
+ g_signal_handlers_disconnect_by_func (sdi->composer, G_CALLBACK (composer_save_draft_cb), NULL);
/* reconnect to the signals using a non-NULL ccd for the callback data */
g_signal_connect (sdi->composer, "send", G_CALLBACK (composer_send_cb), ccd);
@@ -3093,7 +3091,7 @@ print_preview_msg (GtkWidget *button, gpointer user_data)
static GtkObject *subscribe_dialog = NULL;
static void
-subscribe_dialog_destroy (GtkWidget *widget, gpointer user_data)
+subscribe_dialog_destroy (GtkObject *dialog, GObject *deadbeef)
{
if (subscribe_dialog) {
g_object_unref (subscribe_dialog);
@@ -3106,8 +3104,9 @@ manage_subscriptions (BonoboUIComponent *uih, void *user_data, const char *path)
{
if (!subscribe_dialog) {
subscribe_dialog = subscribe_dialog_new ();
- g_signal_connect (SUBSCRIBE_DIALOG (subscribe_dialog)->app, "destroy",
- G_CALLBACK (subscribe_dialog_destroy), NULL);
+
+ g_object_weak_ref ((GObject *) SUBSCRIBE_DIALOG (subscribe_dialog)->app,
+ (GWeakNotify) subscribe_dialog_destroy, subscribe_dialog);
subscribe_dialog_show (subscribe_dialog);
} else {
diff --git a/mail/mail-display.c b/mail/mail-display.c
index 3769b83586..164372ae5c 100644
--- a/mail/mail-display.c
+++ b/mail/mail-display.c
@@ -325,11 +325,8 @@ save_part (CamelMimePart *part)
g_signal_connect (file_select->ok_button, "clicked",
G_CALLBACK (save_data_cb), part);
- /* FIXME: deprecated */
-#warning "gtk_signal_connect_object"
- gtk_signal_connect_object (GTK_OBJECT (file_select->cancel_button),
- "clicked", G_CALLBACK (gtk_widget_destroy),
- GTK_OBJECT (file_select));
+ g_signal_connect_swapped (file_select->cancel_button, "clicked",
+ G_CALLBACK (gtk_widget_destroy), file_select);
g_object_weak_ref ((GObject *) file_select, (GWeakNotify) save_destroy_cb, part);
diff --git a/mail/mail-search.c b/mail/mail-search.c
index c1d42e6f4c..3e5b8260b8 100644
--- a/mail/mail-search.c
+++ b/mail/mail-search.c
@@ -362,13 +362,8 @@ mail_search_construct (MailSearch *ms, MailDisplay *mail)
#endif
g_signal_connect (ms, "clicked", G_CALLBACK (dialog_clicked_cb), ms);
- gtk_signal_connect_object (GTK_OBJECT (ms), "destroy",
- G_CALLBACK (dialog_destroy_cb),
- GTK_OBJECT (ms));
-
- gtk_signal_connect_object (GTK_OBJECT (ms->mail), "destroy",
- G_CALLBACK (gtk_widget_destroy),
- GTK_OBJECT (ms));
+ g_object_weak_ref ((GObject *) ms, (GWeakNotify) dialog_destroy_cb, ms);
+ g_object_weak_ref ((GObject *) ms->mail, (GWeakNotify) gtk_widget_destroy, ms);
}
GtkWidget *
diff --git a/mail/message-tag-followup.c b/mail/message-tag-followup.c
index 99de43a7c7..e333cc0408 100644
--- a/mail/message-tag-followup.c
+++ b/mail/message-tag-followup.c
@@ -28,6 +28,16 @@
#include <stdlib.h>
#include <string.h>
+#ifdef GTK_DISABLE_DEPRECATED
+/* Gtk2's GtkCombo widget uses the deprecated GtkList widget, so
+ there's no way to use GtkCombo and still build if
+ GTK_DISABLE_DEPRECATED is defined. Yay Gtk! */
+#undef GTK_DISABLE_DEPRECATED
+#include <gtk/gtkcombo.h>
+#include <gtk/gtklist.h>
+#define GTK_ENABLE_DEPRECATED
+#endif /* GTK_DISABLE_DEPRECATED */
+
#include <glade/glade.h>
#include <libgnomeui/gnome-window-icon.h>