callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

...And a whole bunch more build fixes.

Browse Source 
2002-12-17  Jeffrey Stedfast  <fejj@ximian.com>

	...And a whole bunch more build fixes.

	* mail-vfolder.c (mail_vfolder_delete_uri): Don't use
	g_string_sprintfa() anymore since it is apparently deprecated.

	* mail-session.c (main_get_filter_driver): Don't use
	g_string_sprintfa() anymore since it is apparently deprecated.

	* mail-ops.c (build_from): Don't use g_string_sprintfa() anymore
	since it is apparently deprecated.

	* mail-callbacks.c (ask_confirm_for_unwanted_html_mail): Don't use
	g_string_sprintfa() anymore since it is apparently deprecated.

	* mail-autofilter.c: Don't use g_string_sprintfa() anymore since
	it is apparently deprecated.

	* folder-browser.c: Don't use g_string_sprintfa() anymore since it
	is apparently deprecated.

	* mail-search.c (mail_search_set_subject): Remove the unnecessary
	g_strdup()'age as well as fix a possible buffer overrun.

	* mail-local.c (mail_local_folder_construct): Use
	g_path_get_basename().

	* mail-config-druid.c (make_account): Don't use e_utf8_*
	functions.

svn path=/trunk/; revision=19152
This commit is contained in:
Jeffrey Stedfast
2002-12-17 20:38:25 +00:00
committed by Jeffrey Stedfast
parent e446a3dd9f
commit f37b0a1ab7
24 changed files with 321 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
mail/ChangeLog
View File

@ -1,3 +1,34 @@
2002-12-17 Jeffrey Stedfast <fejj@ximian.com>
...And a whole bunch more build fixes.
* mail-vfolder.c (mail_vfolder_delete_uri): Don't use
g_string_sprintfa() anymore since it is apparently deprecated.
* mail-session.c (main_get_filter_driver): Don't use
g_string_sprintfa() anymore since it is apparently deprecated.
* mail-ops.c (build_from): Don't use g_string_sprintfa() anymore
since it is apparently deprecated.
* mail-callbacks.c (ask_confirm_for_unwanted_html_mail): Don't use
g_string_sprintfa() anymore since it is apparently deprecated.
* mail-autofilter.c: Don't use g_string_sprintfa() anymore since
it is apparently deprecated.
* folder-browser.c: Don't use g_string_sprintfa() anymore since it
is apparently deprecated.
* mail-search.c (mail_search_set_subject): Remove the unnecessary
g_strdup()'age as well as fix a possible buffer overrun.
* mail-local.c (mail_local_folder_construct): Use
g_path_get_basename().
* mail-config-druid.c (make_account): Don't use e_utf8_*
functions.
2002-12-16 Jeffrey Stedfast <fejj@ximian.com>
* mail-format.c #define a STANDARD_ISSUE_TABLE_OPEN string used

16
mail/folder-browser.c
View File

@ -742,10 +742,10 @@ folder_browser_paste (GtkWidget *menuitem, FolderBrowser *fb)
static void
update_status_bar (FolderBrowser *fb)
{
extern CamelFolder *outbox_folder, *sent_folder;
CORBA_Environment ev;
int tmp, total;
GString *work;
extern CamelFolder *outbox_folder, *sent_folder;
if (fb->folder == NULL
|| fb->message_list == NULL
@ -773,28 +773,28 @@ update_status_bar(FolderBrowser *fb)
}
work = g_string_new ("");
g_string_sprintfa(work, _("%d new"), camel_folder_get_unread_message_count(fb->folder));
g_string_append_printf (work, _("%d new"), camel_folder_get_unread_message_count (fb->folder));
tmp = message_list_hidden (fb->message_list);
if (0 < tmp && tmp < total) {
g_string_append (work, _(", "));
if (tmp < total / 2)
g_string_sprintfa(work, _("%d hidden"), tmp);
g_string_append_printf (work, _("%d hidden"), tmp);
else
g_string_sprintfa(work, _("%d visible"), total - tmp);
g_string_append_printf (work, _("%d visible"), total - tmp);
}
tmp = e_selection_model_selected_count (e_tree_get_selection_model (fb->message_list->tree));
if (tmp) {
g_string_append (work, _(", "));
g_string_sprintfa(work, _("%d selected"), tmp);
g_string_append_printf (work, _("%d selected"), tmp);
}
g_string_append (work, _(", "));
if (fb->folder == outbox_folder)
g_string_sprintfa(work, _("%d unsent"), total);
g_string_append_printf (work, _("%d unsent"), total);
else if (fb->folder == sent_folder)
g_string_sprintfa(work, _("%d sent"), total);
g_string_append_printf (work, _("%d sent"), total);
else
g_string_sprintfa(work, _("%d total"), total);
g_string_append_printf (work, _("%d total"), total);
CORBA_exception_init (&ev);
GNOME_Evolution_ShellView_setFolderBarLabel (fb->shell_view, work->str, &ev);

11
mail/mail-accounts.h
View File

@ -65,23 +65,12 @@ struct _MailAccountsTab {
GdkBitmap *mark_bitmap;
GtkTreeView *table;
#if 0
ETable *table;
ETableModel *model;
#endif
GtkButton *mail_add;
GtkButton *mail_edit;
GtkButton *mail_delete;
GtkButton *mail_default;
GtkButton *mail_able;
GtkCList *news;
int news_row;
GtkButton *news_add;
GtkButton *news_edit;
GtkButton *news_delete;
GtkWidget *news_editor;
};
struct _MailAccountsTabClass {

7
mail/mail-autofilter.c
View File

@ -372,13 +372,14 @@ mail_filter_delete_uri(CamelStore *store, const char *uri)
s = g_string_new (_("The following filter rule(s):\n"));
l = deleted;
while (l) {
g_string_sprintfa(s, " %s\n", (char *)l->data);
g_string_append_printf (s, " %s\n", (char *)l->data);
l = l->next;
}
g_string_sprintfa (s, _("Used the removed folder:\n '%s'\n"
g_string_append_printf (s, _("Used the removed folder:\n '%s'\n"
"And have been updated."), uri);
dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, "%s", s->str);
dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_INFO,
GTK_BUTTONS_CLOSE, "%s", s->str);
g_signal_connect_swapped (dialog, "response", G_CALLBACK (gtk_widget_destroy), dialog);
g_string_free (s, TRUE);

2
mail/mail-callbacks.c
View File

@ -255,7 +255,7 @@ ask_confirm_for_unwanted_html_mail (EMsgComposer *composer, EDestination **recip
name = e_destination_get_textrep (recipients[i]);
g_string_sprintfa (str, " %s\n", name);
g_string_append_printf (str, " %s\n", name);
}
}

22
mail/mail-composer-prefs.c
View File

@ -213,7 +213,7 @@ sig_edit (GtkWidget *widget, MailComposerPrefs *prefs)
GtkTreeIter iter;
GtkTreeSelection *selection;
selection = gtk_tree_view_get_selection (prefs->sig_clist);
selection = gtk_tree_view_get_selection (prefs->sig_list);
if (!gtk_tree_selection_get_selected (selection, &model, &iter))
return;
@ -239,8 +239,8 @@ mail_composer_prefs_new_signature (MailComposerPrefs *prefs, gboolean html, cons
GtkTreeSelection *selection;
char *name = NULL, *val;
model = (GtkListStore *) gtk_tree_view_get_model (prefs->sig_clist);
selection = gtk_tree_view_get_selection (prefs->sig_clist);
model = (GtkListStore *) gtk_tree_view_get_model (prefs->sig_list);
selection = gtk_tree_view_get_selection (prefs->sig_list);
if (sig->name)
val = name = g_strconcat (sig->name, " ", _("[script]"), NULL);
else
@ -266,7 +266,7 @@ sig_delete (GtkWidget *widget, MailComposerPrefs *prefs)
GtkTreeSelection *selection;
GtkTreeIter iter;
selection = gtk_tree_view_get_selection (prefs->sig_clist);
selection = gtk_tree_view_get_selection (prefs->sig_list);
if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
gtk_tree_model_get (model, &iter, 1, &sig, -1);
gtk_list_store_remove ((GtkListStore *) model, &iter);
@ -416,7 +416,7 @@ sig_event_client (MailConfigSigEvent event, MailConfigSignature *sig, MailCompos
d(printf ("accounts NAME CHANGED\n"));
/* this is one bizarro interface */
model = gtk_tree_view_get_model (prefs->sig_clist);
model = gtk_tree_view_get_model (prefs->sig_list);
sprintf (path, "%d", sig->id);
if (gtk_tree_model_get_iter_from_string (model, &iter, path)) {
char *val, *name = NULL;
@ -432,7 +432,7 @@ sig_event_client (MailConfigSigEvent event, MailConfigSignature *sig, MailCompos
break;
case MAIL_CONFIG_SIG_EVENT_CONTENT_CHANGED:
d(printf ("accounts CONTENT CHANGED\n"));
selection = gtk_tree_view_get_selection (prefs->sig_clist);
selection = gtk_tree_view_get_selection (prefs->sig_list);
if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
gtk_tree_model_get (model, &iter, 1, &current, -1);
if (sig == current)
@ -864,18 +864,18 @@ mail_composer_prefs_construct (MailComposerPrefs *prefs)
prefs->sig_delete = GTK_BUTTON (glade_xml_get_widget (gui, "cmdSignatureDelete"));
g_signal_connect (prefs->sig_delete, "clicked", G_CALLBACK (sig_delete), prefs);
prefs->sig_clist = GTK_TREE_VIEW (glade_xml_get_widget (gui, "clistSignatures"));
prefs->sig_list = GTK_TREE_VIEW (glade_xml_get_widget (gui, "clistSignatures"));
model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_POINTER);
gtk_tree_view_set_model (prefs->sig_clist, (GtkTreeModel *)model);
gtk_tree_view_insert_column_with_attributes (prefs->sig_clist, -1, _("Signature(s)"),
gtk_tree_view_set_model (prefs->sig_list, (GtkTreeModel *)model);
gtk_tree_view_insert_column_with_attributes (prefs->sig_list, -1, _("Signature(s)"),
gtk_cell_renderer_text_new (),
"text", 0,
NULL);
selection = gtk_tree_view_get_selection (prefs->sig_clist);
selection = gtk_tree_view_get_selection (prefs->sig_list);
gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
g_signal_connect (selection, "changed", G_CALLBACK (sig_selection_changed), prefs);
sig_fill_clist (prefs->sig_clist);
sig_fill_clist (prefs->sig_list);
if (mail_config_get_signature_list () == NULL) {
gtk_widget_set_sensitive ((GtkWidget *) prefs->sig_delete, FALSE);
gtk_widget_set_sensitive ((GtkWidget *) prefs->sig_edit, FALSE);

3
mail/mail-composer-prefs.h
View File

@ -96,10 +96,9 @@ struct _MailComposerPrefs {
/* Keyboard Shortcuts */
GtkOptionMenu *shortcuts_type;
GtkCList *keybindings;
/* Signatures */
GtkTreeView *sig_clist;
GtkTreeView *sig_list;
GtkButton *sig_add;
GtkButton *sig_edit;
GtkButton *sig_delete;

4
mail/mail-config-druid.c
View File

@ -38,7 +38,7 @@
#include <libgnomeui/gnome-druid-page-standard.h>
#include <glade/glade.h>
#include <gtkhtml/gtkhtml.h>
#include <gal/widgets/e-unicode.h>
#include "mail-config-druid.h"
#include "mail-config.h"
#include "mail-ops.h"
@ -473,7 +473,7 @@ make_account (void)
account->id = g_new0 (MailConfigIdentity, 1);
name = g_get_real_name ();
account->id->name = e_utf8_from_locale_string (name);
account->id->name = g_strdup (name);
user = g_get_user_name ();
if (user && !uname (&uts) && strchr (uts.nodename, '.'))
account->id->address = g_strdup_printf ("%s@%s", user, uts.nodename);

16
mail/mail-format.c
View File

@ -1869,14 +1869,14 @@ mail_get_message_rfc822 (CamelMimeMessage *message, gboolean want_plain, gboolea
* <P> to <PRE> switch.
*/
if (!strncasecmp (text, "<pre>", 5))
g_string_sprintfa (retval, "<PRE>");
g_string_append_printf (retval, "<PRE>");
/* create credits */
cia = camel_mime_message_get_from (message);
buf = camel_address_format (CAMEL_ADDRESS (cia));
if (buf) {
html = camel_text_to_html (buf, CAMEL_MIME_FILTER_TOHTML_CONVERT_NL, 0);
g_string_sprintfa (retval, "%s<b>From:</b> %s<br>",
g_string_append_printf (retval, "%s<b>From:</b> %s<br>",
citation, html);
g_free (html);
g_free (buf);
@ -1886,7 +1886,7 @@ mail_get_message_rfc822 (CamelMimeMessage *message, gboolean want_plain, gboolea
buf = camel_address_format (CAMEL_ADDRESS (cia));
if (buf) {
html = camel_text_to_html (buf, CAMEL_MIME_FILTER_TOHTML_CONVERT_NL, 0);
g_string_sprintfa (retval, "%s<b>To:</b> %s<br>",
g_string_append_printf (retval, "%s<b>To:</b> %s<br>",
citation, html);
g_free (html);
g_free (buf);
@ -1896,7 +1896,7 @@ mail_get_message_rfc822 (CamelMimeMessage *message, gboolean want_plain, gboolea
buf = camel_address_format (CAMEL_ADDRESS (cia));
if (buf) {
html = camel_text_to_html (buf, CAMEL_MIME_FILTER_TOHTML_CONVERT_NL, 0);
g_string_sprintfa (retval, "%s<b>Cc:</b> %s<br>",
g_string_append_printf (retval, "%s<b>Cc:</b> %s<br>",
citation, html);
g_free (html);
g_free (buf);
@ -1906,7 +1906,7 @@ mail_get_message_rfc822 (CamelMimeMessage *message, gboolean want_plain, gboolea
if (buf) {
html = camel_text_to_html (buf, CAMEL_MIME_FILTER_TOHTML_CONVERT_NL |
CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS, 0);
g_string_sprintfa (retval, "%s<b>Subject:</b> %s<br>",
g_string_append_printf (retval, "%s<b>Subject:</b> %s<br>",
citation, html);
g_free (html);
}
@ -1914,14 +1914,14 @@ mail_get_message_rfc822 (CamelMimeMessage *message, gboolean want_plain, gboolea
date_val = camel_mime_message_get_date (message, &offset);
buf = header_format_date (date_val, offset);
html = camel_text_to_html (buf, CAMEL_MIME_FILTER_TOHTML_CONVERT_NL, 0);
g_string_sprintfa (retval, "%s<b>Date:</b> %s<br>", citation, html);
g_string_append_printf (retval, "%s<b>Date:</b> %s<br>", citation, html);
g_free (html);
g_free (buf);
if (!strncasecmp (text, "<pre>", 5))
g_string_sprintfa (retval, "%s<br>%s", citation, text + 5);
g_string_append_printf (retval, "%s<br>%s", citation, text + 5);
else
g_string_sprintfa (retval, "%s<br>%s", citation, text);
g_string_append_printf (retval, "%s<br>%s", citation, text);
g_free (text);
buf = retval->str;

8
mail/mail-local.c
View File

@ -629,14 +629,12 @@ mail_local_folder_get_type (void)
static MailLocalFolder *
mail_local_folder_construct(MailLocalFolder *mlf, MailLocalStore *parent_store, const char *full_name, CamelException *ex)
{
const char *name;
char *metapath;
name = g_basename (full_name);
char *metapath, *name;
name = g_path_get_basename (full_name);
d(printf ("constructing local folder: full = %s, name = %s\n", full_name, name));
camel_folder_construct (CAMEL_FOLDER (mlf), CAMEL_STORE (parent_store), full_name, name);
g_free (name);
mlf->real_path = g_strdup (((CamelFolder *) mlf)->full_name);

1
mail/mail-mt.c
View File

@ -15,7 +15,6 @@
#include <gtk/gtkstock.h>
#include <libgnome/gnome-i18n.h>
#include <gal/widgets/e-gui-utils.h>
#include <gal/widgets/e-unicode.h>
#include "folder-browser-factory.h"
#include "e-util/e-msgport.h"

10
mail/mail-ops.c
View File

@ -33,7 +33,6 @@
#include <errno.h>
#include <libgnome/gnome-exec.h>
#include <gal/util/e-util.h>
#include <gal/widgets/e-unicode.h>
#include <camel/camel-mime-filter-from.h>
#include <camel/camel-operation.h>
#include <camel/camel-vtrash-folder.h>
@ -1839,6 +1838,7 @@ build_from(struct _header_raw *header)
header_address_unref (addr);
}
}
if (tmp == NULL)
g_string_append (out, "unknown@nodomain.now.au");
@ -1857,12 +1857,14 @@ build_from(struct _header_raw *header)
thetime = header_decode_date (tmp, &offset);
thetime += ((offset / 100) * (60 * 60)) + (offset % 100) * 60;
gmtime_r (&thetime, &tm);
g_string_sprintfa(out, " %s %s %d %02d:%02d:%02d %4d\n",
tz_days[tm.tm_wday],
tz_months[tm.tm_mon], tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_year + 1900);
g_string_append_printf (out, " %s %s %d %02d:%02d:%02d %4d\n",
tz_days[tm.tm_wday], tz_months[tm.tm_mon],
tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec,
tm.tm_year + 1900);
ret = out->str;
g_string_free (out, FALSE);
return ret;
}

16
mail/mail-search-dialogue.c
View File

@ -37,25 +37,25 @@ static void mail_search_dialogue_finalise (GObject *obj);
static GtkDialogClass *parent_class;
guint
GType
mail_search_dialogue_get_type (void)
{
static GType type = 0;
if (!type) {
GTypeInfo type_info = {
static const GTypeInfo info = {
sizeof (MailSearchDialogueClass),
NULL,
NULL,
NULL, /* base_class_init */
NULL, /* base_class_finalize */
(GClassInitFunc) mail_search_dialogue_class_init,
NULL,
NULL,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (MailSearchDialogue),
0,
(GtkObjectInitFunc)mail_search_dialogue_init,
(GInstanceInitFunc) mail_search_dialogue_init,
};
type = g_type_register_static (gtk_dialog_get_type (), "MailSearchDialogue", &type_info, 0);
type = g_type_register_static (gtk_dialog_get_type (), "MailSearchDialogue", &info, 0);
}
return type;

2
mail/mail-search-dialogue.h
View File

@ -50,7 +50,7 @@ struct _MailSearchDialogueClass {
/* signals */
};
guint mail_search_dialogue_get_type (void);
GType mail_search_dialogue_get_type (void);
MailSearchDialogue *mail_search_dialogue_new (void);
MailSearchDialogue *mail_search_dialogue_new_with_rule (FilterRule *rule);

101
mail/mail-search.c
View File

@ -30,7 +30,6 @@
#include "mail-search.h"
#include "e-searching-tokenizer.h"
#include <gal/widgets/e-unicode.h>
#include <gtkhtml/gtkhtml-search.h>
#include <gtkhtml/htmlengine.h>
#include <libgnomeui/gnome-window-icon.h>
@ -106,43 +105,31 @@ mail_search_redisplay_message (MailSearch *ms)
}
static void
mail_search_set_subject (MailSearch *ms, const gchar *subject)
mail_search_set_subject (MailSearch *ms, const char *subject)
{
gchar *utf8_subject = NULL;
gchar *gtk_subject = NULL;
char *utf8_subject = NULL;
if (subject && *subject) {
utf8_subject = g_strdup (subject);
if (g_utf8_validate (utf8_subject, -1, NULL)) {
#define ARBITRARY_CUTOFF 40
if (g_utf8_strlen (utf8_subject, -1) > ARBITRARY_CUTOFF + 3) {
char *p = g_utf8_offset_to_pointer (utf8_subject, ARBITRARY_CUTOFF);
const gint ARBITRARY_CUTOFF = 40;
if (g_utf8_strlen (utf8_subject, -1) > ARBITRARY_CUTOFF) {
gchar *p = g_utf8_offset_to_pointer (utf8_subject, ARBITRARY_CUTOFF);
strcpy (p, "...");
}
} else {
/* If the subject contains bad utf8, don't show anything in the frame label. */
g_free (utf8_subject);
utf8_subject = NULL;
}
if (utf8_subject) {
gtk_subject = utf8_subject;
utf8_subject = NULL;
}
} else {
gtk_subject = g_strdup (_("(Untitled Message)"));
utf8_subject = g_strdup (_("(Untitled Message)"));
}
gtk_frame_set_label (GTK_FRAME (ms->msg_frame), gtk_subject);
gtk_frame_set_label (GTK_FRAME (ms->msg_frame), utf8_subject);
g_free (gtk_subject);
g_free (utf8_subject);
}
@ -180,31 +167,24 @@ dialog_destroy_cb (GtkWidget *w, MailSearch *ms)
}
static void
dialog_clicked_cb (GtkWidget *w, gint button_number, MailSearch *ms)
dialog_clicked_cb (GtkWidget *widget, gint button_number, MailSearch *ms)
{
ESearchingTokenizer *st = mail_search_tokenizer (ms);
if (button_number == 0) { /* "Search" */
char *search_text;
char *search_text, *tmp;
tmp = gtk_editable_get_chars (GTK_EDITABLE (ms->entry), 0, -1);
g_strstrip (tmp);
search_text = e_utf8_from_gtk_string ((GtkWidget *) ms->entry, tmp);
g_free (tmp);
search_text = gtk_editable_get_chars (GTK_EDITABLE (ms->entry), 0, -1);
g_strstrip (search_text);
if (search_text && *search_text) {
if (ms->last_search && !strcmp (ms->last_search, search_text)) {
if (! gtk_html_engine_search_next (ms->mail->html)) {
g_free (ms->last_search);
ms->last_search = NULL;
}
} else {
g_free (ms->last_search);
ms->last_search = NULL;
@ -221,30 +201,24 @@ dialog_clicked_cb (GtkWidget *w, gint button_number, MailSearch *ms)
}
}
g_free (search_text);
} else if (button_number == 1) { /* "Close" */
gtk_widget_destroy (w);
gtk_widget_destroy (widget);
}
}
static void
begin_cb (ESearchingTokenizer *st, gchar *foo, MailSearch *ms)
begin_cb (ESearchingTokenizer *st, char *foo, MailSearch *ms)
{
const gchar *subject;
const char *subject;
if (ms && ms->mail && ms->mail->current_message) {
subject = ms->mail->current_message->subject;
if (subject == NULL)
subject = _("Untitled Message");
} else {
subject = _("Empty Message");
}
gtk_label_set_text (GTK_LABEL (ms->count_label), "0");
@ -254,7 +228,8 @@ begin_cb (ESearchingTokenizer *st, gchar *foo, MailSearch *ms)
static void
match_cb (ESearchingTokenizer *st, MailSearch *ms)
{
gchar buf[16];
char buf[16];
g_snprintf (buf, 16, "%d", e_searching_tokenizer_match_count (st));
gtk_label_set_text (GTK_LABEL (ms->count_label), buf);
}
@ -273,7 +248,6 @@ mail_search_construct (MailSearch *ms, MailDisplay *mail)
GtkWidget *matches_hbox;
GtkWidget *toggles_hbox;
GtkWidget *frame_vbox;
GtkWidget *entry;
GtkWidget *count_label;
GtkWidget *case_check;
@ -290,7 +264,7 @@ mail_search_construct (MailSearch *ms, MailDisplay *mail)
/* Basic set-up */
ms->mail = mail;
g_object_ref((mail));
g_object_ref (mail);
gtk_window_set_title ((GtkWindow *) ms, _("Find in Message"));
@ -303,14 +277,10 @@ mail_search_construct (MailSearch *ms, MailDisplay *mail)
ms->search_forward = TRUE;
ms->case_sensitive = FALSE;
ms->begin_handler = g_signal_connect((ms->mail->html->engine->ht),
"begin",
G_CALLBACK (begin_cb),
ms);
ms->match_handler = g_signal_connect((ms->mail->html->engine->ht),
"match",
G_CALLBACK (match_cb),
ms);
ms->begin_handler = g_signal_connect (ms->mail->html->engine->ht, "begin",
G_CALLBACK (begin_cb), ms);
ms->match_handler = g_signal_connect (ms->mail->html->engine->ht, "match",
G_CALLBACK (match_cb), ms);
/* Construct the dialog contents. */
@ -386,28 +356,17 @@ mail_search_construct (MailSearch *ms, MailDisplay *mail)
/* Hook up signals */
g_signal_connect((case_check),
"toggled",
G_CALLBACK (toggled_case_cb),
ms);
g_signal_connect (case_check, "toggled", G_CALLBACK (toggled_case_cb), ms);
#if 0
g_signal_connect((fwd_check),
"toggled",
G_CALLBACK (toggled_fwd_cb),
ms);
g_signal_connect (fwd_check, "toggled", G_CALLBACK (toggled_fwd_cb), ms);
#endif
g_signal_connect((ms),
"clicked",
G_CALLBACK (dialog_clicked_cb),
ms);
g_signal_connect (ms, "clicked", G_CALLBACK (dialog_clicked_cb), ms);
gtk_signal_connect_object (GTK_OBJECT (ms),
"destroy",
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",
gtk_signal_connect_object (GTK_OBJECT (ms->mail), "destroy",
G_CALLBACK (gtk_widget_destroy),
GTK_OBJECT (ms));
}
@ -415,13 +374,13 @@ mail_search_construct (MailSearch *ms, MailDisplay *mail)
GtkWidget *
mail_search_new (MailDisplay *mail)
{
gpointer ptr;
GtkWidget *widget;
g_return_val_if_fail (mail && IS_MAIL_DISPLAY (mail), NULL);
ptr = g_object_new(mail_search_get_type (), NULL);
mail_search_construct (MAIL_SEARCH (ptr), mail);
widget = g_object_new (mail_search_get_type (), NULL);
mail_search_construct (MAIL_SEARCH (widget), mail);
return GTK_WIDGET (ptr);
return widget;
}

3
mail/mail-session.c
View File

@ -31,7 +31,6 @@
#include <libgnome/gnome-config.h>
#include <libgnome/gnome-sound.h>
#include <gal/widgets/e-unicode.h>
#include "camel/camel-filter-driver.h"
#include "filter/filter-context.h"
@ -797,7 +796,7 @@ main_get_filter_driver (CamelSession *session, const char *type, CamelException
g_string_append (faction, "\"(beep)\"");
break;
case MAIL_CONFIG_NOTIFY_PLAY_SOUND:
g_string_sprintfa (faction, "\"(play-sound \\\"%s\\\")\"",
g_string_append_printf (faction, "\"(play-sound \\\"%s\\\")\"",
mail_config_get_new_mail_notify_sound_file ());
break;
default:

1
mail/mail-signature-editor.c
View File

@ -30,7 +30,6 @@
#include <bonobo/bonobo-stream-memory.h>
#include <gal/widgets/e-gui-utils.h>
#include <gal/widgets/e-unicode.h>
#include "e-msg-composer.h"
#include "mail-signature-editor.h"

16
mail/mail-tools.c
View File

@ -31,14 +31,16 @@
#include <ctype.h>
#include <errno.h>
#include <string.h>
#include <gal/widgets/e-unicode.h>
#include "camel/camel.h"
#include "camel/camel-vee-folder.h"
#include <camel/camel.h>
#include <camel/camel-vee-folder.h>
#include <filter/vfolder-rule.h>
#include <filter/vfolder-context.h>
#include <filter/filter-option.h>
#include <filter/filter-input.h>
#include "mail-vfolder.h"
#include "filter/vfolder-rule.h"
#include "filter/vfolder-context.h"
#include "filter/filter-option.h"
#include "filter/filter-input.h"
#include "mail.h" /*session*/
#include "mail-tools.h"
#include "mail-local.h"

10
mail/mail-vfolder.c
View File

@ -423,7 +423,7 @@ mail_vfolder_delete_uri(CamelStore *store, const char *uri)
because the adduri call above does the work async */
if (uri_cmp (uri, source)) {
vf = g_hash_table_lookup (vfolder_hash, rule->name);
g_assert(vf);
g_assert (vf != NULL);
g_signal_handlers_disconnect_matched (rule, G_SIGNAL_MATCH_FUNC|G_SIGNAL_MATCH_DATA, 0,
0, NULL, rule_changed, vf);
vfolder_rule_remove_source ((VfolderRule *)rule, source);
@ -437,16 +437,16 @@ mail_vfolder_delete_uri(CamelStore *store, const char *uri)
UNLOCK();
if (changed->str[0]) {
GtkDialog *gd;
GtkWidget *dialog;
char *user;
gd = (GtkDialog *)gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_INFO, GTK_BUTTONS_OK,
dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_INFO, GTK_BUTTONS_OK,
_("The following vFolder(s):\n%s"
"Used the removed folder:\n '%s'\n"
"And have been updated."),
changed->str, uri);
g_signal_connect_swapped(gd, "response", G_CALLBACK(gtk_widget_destroy), gd);
gtk_widget_show((GtkWidget *)gd);
g_signal_connect_swapped (dialog, "response", G_CALLBACK (gtk_widget_destroy), dialog);
gtk_widget_show (dialog);
user = g_strdup_printf ("%s/vfolders.xml", evolution_dir);
rule_context_save ((RuleContext *) context, user);

1
mail/main.c
View File

@ -23,7 +23,6 @@
#include <gal/widgets/e-gui-utils.h>
#include <gal/widgets/e-cursors.h>
#include <gal/widgets/e-unicode.h>
#include "e-util/e-passwords.h"
#include "e-util/e-proxy.h"

1
mail/message-browser.c
View File

@ -25,7 +25,6 @@
#endif
#include <gal/util/e-util.h>
#include <gal/widgets/e-unicode.h>
#include <bonobo/bonobo-exception.h>
#include <bonobo/bonobo-ui-component.h>

12
mail/message-tag-editor.c
View File

@ -44,19 +44,19 @@ message_tag_editor_get_type (void)
static GType type = 0;
if (!type) {
GTypeInfo type_info = {
static const GTypeInfo info = {
sizeof (MessageTagEditorClass),
NULL,
NULL,
NULL, /* base_class_init */
NULL, /* base_class_finalize */
(GClassInitFunc) message_tag_editor_class_init,
NULL,
NULL,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (MessageTagEditor),
0,
(GInstanceInitFunc) message_tag_editor_init,
};
type = g_type_register_static (gtk_dialog_get_type (), "MessageTagEditor", &type_info, 0);
type = g_type_register_static (gtk_dialog_get_type (), "MessageTagEditor", &info, 0);
}
return type;

12
mail/message-tag-followup.c
View File

@ -33,8 +33,6 @@
#include <libgnomeui/gnome-window-icon.h>
#include <libgnomeui/gnome-pixmap.h>
#include <gal/widgets/e-unicode.h>
#include "message-tag-followup.h"
#include "mail-config.h"
@ -72,17 +70,19 @@ message_tag_followup_get_type (void)
static GType type = 0;
if (!type) {
GTypeInfo type_info = {
static const GTypeInfo info = {
sizeof (MessageTagFollowUpClass),
NULL, NULL,
NULL, /* base_class_init */
NULL, /* base_class_finalize */
(GClassInitFunc) message_tag_followup_class_init,
NULL, NULL,
NULL, /* class_finalize */
NULL, /* class_data */
sizeof (MessageTagFollowUp),
0,
(GInstanceInitFunc) message_tag_followup_init,
};
type = g_type_register_static (message_tag_editor_get_type (), "MessageTagFollowUp", &type_info, 0);
type = g_type_register_static (message_tag_editor_get_type (), "MessageTagFollowUp", &info, 0);
}
return type;

1
mail/subscribe-dialog.c
View File

@ -33,7 +33,6 @@
#include <libgnomeui/gnome-appbar.h>
#include <gal/util/e-util.h>
#include <gal/widgets/e-unicode.h>
#include <gal/e-table/e-cell-toggle.h>
#include <gal/e-table/e-cell-text.h>