From 0701addc195c6315474346c9bd062dc7dc84f80c Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Mon, 10 Feb 2003 19:50:55 +0000 Subject: Use g_signal_emit() rather than gtk_signal_emit(). (build_flat): Same 2003-02-10 Jeffrey Stedfast * message-list.c (build_tree): Use g_signal_emit() rather than gtk_signal_emit(). (build_flat): Same here. * mail-signature-editor.c: #include * mail-vfolder.c: #include * mail-session.c: #include * mail-search.c: #include * mail-mt.c: #include * mail-ops.c (save_part_save): Use strcasecmp() instead of g_strcasecmp(). * mail-local.c: #include (reconfigure_folder_reconfigured): Use a GtkDialog instead of gnome_error_dialog(). * mail-format.c (find_preferred_alternative): Use g_ascii_strdown since g_strdown is deprecated. (fake_mime_part_from_data): Removed, no longer used it seems. (destroy_part): Also removed. * mail-display.c (make_popup_window): Replace call to gtk_window_set_polociy() with gtk_window_set_resizable() instead. (popup_size_allocate_cb): Use gtk_window_set_position() with GTK_WIN_POS_MOUSE instead of calculating the position to put it in. svn path=/trunk/; revision=19878 --- mail/ChangeLog | 34 ++++++++++++++++++++++++++++++++++ mail/mail-display.c | 15 ++------------- mail/mail-format.c | 35 +---------------------------------- mail/mail-identify.c | 1 - mail/mail-local.c | 9 +++++++-- mail/mail-mt.c | 1 + mail/mail-ops.c | 2 +- mail/mail-search.c | 2 ++ mail/mail-session.c | 1 + mail/mail-signature-editor.c | 1 + mail/mail-vfolder.c | 1 + mail/message-list.c | 24 ++++++++++++------------ 12 files changed, 63 insertions(+), 63 deletions(-) diff --git a/mail/ChangeLog b/mail/ChangeLog index 4177c6b5e8..fe013dc0b0 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,37 @@ +2003-02-10 Jeffrey Stedfast + + * message-list.c (build_tree): Use g_signal_emit() rather than + gtk_signal_emit(). + (build_flat): Same here. + + * mail-signature-editor.c: #include + + * mail-vfolder.c: #include + + * mail-session.c: #include + + * mail-search.c: #include + + * mail-mt.c: #include + + * mail-ops.c (save_part_save): Use strcasecmp() instead of + g_strcasecmp(). + + * mail-local.c: #include + (reconfigure_folder_reconfigured): Use a GtkDialog instead of + gnome_error_dialog(). + + * mail-format.c (find_preferred_alternative): Use g_ascii_strdown + since g_strdown is deprecated. + (fake_mime_part_from_data): Removed, no longer used it seems. + (destroy_part): Also removed. + + * mail-display.c (make_popup_window): Replace call to + gtk_window_set_polociy() with gtk_window_set_resizable() instead. + (popup_size_allocate_cb): Use gtk_window_set_position() with + GTK_WIN_POS_MOUSE instead of calculating the position to put it + in. + 2003-02-10 Ettore Perazzoli * importers/Makefile.am: Split the ORBit IDL compilation rules to diff --git a/mail/mail-display.c b/mail/mail-display.c index ace2dacb3d..13806902b8 100644 --- a/mail/mail-display.c +++ b/mail/mail-display.c @@ -2325,18 +2325,7 @@ popup_realize_cb (GtkWidget *widget, gpointer user_data) static void popup_size_allocate_cb (GtkWidget *widget, GtkAllocation *alloc, gpointer user_data) { - int x, y, w, h, xmax, ymax; - - xmax = gdk_screen_width (); - ymax = gdk_screen_height (); - - gdk_window_get_pointer (NULL, &x, &y, NULL); - w = alloc->width; - h = alloc->height; - x = CLAMP (x - w/2, 0, xmax - w); - y = CLAMP (y - h/2, 0, ymax - h); - gtk_widget_set_uposition (widget, x, y); - + gtk_window_set_position (GTK_WINDOW (widget), GTK_WIN_POS_MOUSE); } static PopupInfo * @@ -2356,7 +2345,7 @@ make_popup_window (GtkWidget *w) gtk_container_add (GTK_CONTAINER (pop->win), fr); gtk_container_add (GTK_CONTAINER (fr), w); - gtk_window_set_policy (GTK_WINDOW (pop->win), FALSE, FALSE, FALSE); + gtk_window_set_resizable (GTK_WINDOW (pop->win), FALSE); g_signal_connect (pop->win, "enter_notify_event", G_CALLBACK (popup_enter_cb), pop); g_signal_connect (pop->win, "leave_notify_event", G_CALLBACK (popup_leave_cb), pop); diff --git a/mail/mail-format.c b/mail/mail-format.c index 3868cf23e8..02c9fc6df5 100644 --- a/mail/mail-format.c +++ b/mail/mail-format.c @@ -1243,39 +1243,6 @@ handle_text_plain (CamelMimePart *part, const char *mime_type, return TRUE; } -static CamelMimePart * -fake_mime_part_from_data (const char *data, int len, const char *type, - guint offset, MailDisplay *md) -{ - GHashTable *fake_parts = g_datalist_get_data (md->data, "fake_parts"); - CamelStream *memstream; - CamelDataWrapper *wrapper; - CamelMimePart *part; - - part = g_hash_table_lookup (fake_parts, GUINT_TO_POINTER (offset)); - if (part) - return part; - - memstream = camel_stream_mem_new_with_buffer (data, len); - wrapper = camel_data_wrapper_new (); - camel_data_wrapper_construct_from_stream (wrapper, memstream); - camel_data_wrapper_set_mime_type (wrapper, type); - camel_object_unref (memstream); - part = camel_mime_part_new (); - camel_medium_set_content_object (CAMEL_MEDIUM (part), wrapper); - camel_object_unref (wrapper); - camel_mime_part_set_disposition (part, "inline"); - - g_hash_table_insert (fake_parts, GUINT_TO_POINTER (offset), part); - return part; -} - -static void -destroy_part (CamelObject *root, gpointer event_data, gpointer user_data) -{ - camel_object_unref (user_data); -} - /* text/enriched (RFC 1896) or text/richtext (included in RFC 1341) */ static gboolean handle_text_enriched (CamelMimePart *part, const char *mime_type, @@ -1655,7 +1622,7 @@ find_preferred_alternative (CamelMultipart *multipart, gboolean want_plain) CamelContentType *type = camel_mime_part_get_content_type (part); char *mime_type = header_content_type_simple (type); - g_strdown (mime_type); + g_ascii_strdown (mime_type, -1); if (want_plain && !strcmp (mime_type, "text/plain")) return part; handler = mail_lookup_handler (mime_type); diff --git a/mail/mail-identify.c b/mail/mail-identify.c index bb05b2f72c..483725c78f 100644 --- a/mail/mail-identify.c +++ b/mail/mail-identify.c @@ -30,7 +30,6 @@ #include #include -#include #include #include #include "mail.h" diff --git a/mail/mail-local.c b/mail/mail-local.c index 010ea12eec..04127c09bb 100644 --- a/mail/mail-local.c +++ b/mail/mail-local.c @@ -29,6 +29,7 @@ #include #endif +#include #include #include @@ -1344,11 +1345,15 @@ static void reconfigure_folder_reconfigured (struct _mail_msg *mm) { struct _reconfigure_msg *m = (struct _reconfigure_msg *)mm; + GtkWidget *dialog; /*char *uri;*/ if (camel_exception_is_set (&mm->ex)) { - gnome_error_dialog (_("If you can no longer open this mailbox, then\n" - "you may need to repair it manually.")); + dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, "%s", + _("If you can no longer open this mailbox, then\n" + "you may need to repair it manually.")); + gtk_dialog_run (GTK_DIALOG (dialog)); } if (m->done) diff --git a/mail/mail-mt.c b/mail/mail-mt.c index 189576d8d3..9813c57773 100644 --- a/mail/mail-mt.c +++ b/mail/mail-mt.c @@ -3,6 +3,7 @@ #endif #include +#include #include #include #include diff --git a/mail/mail-ops.c b/mail/mail-ops.c index c7f12dd8a3..11bf3d8b0e 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -2047,7 +2047,7 @@ save_part_save (struct _mail_msg *mm) content_type = camel_mime_part_get_content_type (m->part); if (header_content_type_is (content_type, "text", "*") && (charset = header_content_type_param (content_type, "charset")) - && g_strcasecmp (charset, "utf-8") != 0) { + && strcasecmp (charset, "utf-8") != 0) { charsetfilter = camel_mime_filter_charset_new_convert ("utf-8", charset); filtered_stream = (CamelStream *) camel_stream_filter_new_with_stream (stream_fs); camel_object_unref (CAMEL_OBJECT (stream_fs)); diff --git a/mail/mail-search.c b/mail/mail-search.c index 3e5b8260b8..9955b34e3a 100644 --- a/mail/mail-search.c +++ b/mail/mail-search.c @@ -28,6 +28,8 @@ #include #endif +#include + #include "mail-search.h" #include "e-searching-tokenizer.h" #include diff --git a/mail/mail-session.c b/mail/mail-session.c index 259e845fe5..f0ee9b04d9 100644 --- a/mail/mail-session.c +++ b/mail/mail-session.c @@ -25,6 +25,7 @@ #endif #include +#include #include #include diff --git a/mail/mail-signature-editor.c b/mail/mail-signature-editor.c index 09de02174f..4ce2ce476c 100644 --- a/mail/mail-signature-editor.c +++ b/mail/mail-signature-editor.c @@ -25,6 +25,7 @@ #include #endif +#include #include #include #include diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index b75bdf1d59..83f155d359 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -25,6 +25,7 @@ #endif #include +#include #include #include "Evolution.h" diff --git a/mail/message-list.c b/mail/message-list.c index 4223dbdcc9..09645debe4 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -1588,19 +1588,19 @@ build_tree (MessageList *ml, CamelFolderThread *thread, CamelFolderChangeInfo *c #endif if (saveuid) { - ETreePath *node = g_hash_table_lookup(ml->uid_nodemap, saveuid); + ETreePath *node = g_hash_table_lookup (ml->uid_nodemap, saveuid); if (node == NULL) { - g_free(ml->cursor_uid); + g_free (ml->cursor_uid); ml->cursor_uid = NULL; - gtk_signal_emit((GtkObject *)ml, message_list_signals[MESSAGE_SELECTED], NULL); + g_signal_emit (ml, message_list_signals[MESSAGE_SELECTED], 0, NULL); } else { - e_tree_set_cursor(ml->tree, node); + e_tree_set_cursor (ml->tree, node); } - g_free(saveuid); - } else if (ml->cursor_uid && !g_hash_table_lookup(ml->uid_nodemap, ml->cursor_uid)) { - g_free(ml->cursor_uid); + g_free (saveuid); + } else if (ml->cursor_uid && !g_hash_table_lookup (ml->uid_nodemap, ml->cursor_uid)) { + g_free (ml->cursor_uid); ml->cursor_uid = NULL; - gtk_signal_emit((GtkObject *)ml, message_list_signals[MESSAGE_SELECTED], NULL); + g_signal_emit (ml, message_list_signals[MESSAGE_SELECTED], 0, NULL); } #ifdef TIMEIT @@ -1905,13 +1905,13 @@ build_flat (MessageList *ml, GPtrArray *summary, CamelFolderChangeInfo *changes) if (saveuid) { ETreePath *node = g_hash_table_lookup(ml->uid_nodemap, saveuid); if (node == NULL) { - g_free(ml->cursor_uid); + g_free (ml->cursor_uid); ml->cursor_uid = NULL; - gtk_signal_emit((GtkObject *)ml, message_list_signals[MESSAGE_SELECTED], NULL); + g_signal_emit (ml, message_list_signals[MESSAGE_SELECTED], 0, NULL); } else { - e_tree_set_cursor(ml->tree, node); + e_tree_set_cursor (ml->tree, node); } - g_free(saveuid); + g_free (saveuid); } #ifdef TIMEIT -- cgit v1.2.3