[evolution-patches] Cleanups of compiler warnings and other fixes for evolution/mail
- From: Kjartan Maraas <kmaraas broadpark no>
- To: evolution-patches <evolution-patches gnome org>
- Subject: [evolution-patches] Cleanups of compiler warnings and other fixes for evolution/mail
- Date: Fri, 22 Sep 2006 17:04:32 +0200
Just wanted to get this out of my queue now that we have a bit of
overlap in patches in this area. I'll rediff if you apply any of the
other patches.
Cheers
Kjartan
? evolution-mail-2.8.schemas
? mail.error
? warnings
? default/nb
Index: em-account-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-account-editor.c,v
retrieving revision 1.48
diff -u -p -r1.48 em-account-editor.c
--- em-account-editor.c 22 Aug 2006 09:58:10 -0000 1.48
+++ em-account-editor.c 22 Sep 2006 15:00:56 -0000
@@ -1777,7 +1777,7 @@ emae_identity_page(EConfig *ec, EConfigI
gui->default_account = GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, "management_default"));
if (!mail_config_get_default_account ()
|| (account == mail_config_get_default_account ())
- || (GPOINTER_TO_INT(g_object_get_data (emae->account, "default_flagged"))) )
+ || (GPOINTER_TO_INT (g_object_get_data (G_OBJECT (emae->account), "default_flagged"))) )
gtk_toggle_button_set_active (gui->default_account, TRUE);
if (emae->do_signature) {
@@ -2625,7 +2625,7 @@ emae_check_complete(EConfig *ec, const c
editing multiple accounts at a time
*/
if (gtk_toggle_button_get_active(emae->priv->default_account))
- g_object_set_data (emae->account, "default_flagged", GINT_TO_POINTER(1));
+ g_object_set_data (G_OBJECT (emae->account), "default_flagged", GINT_TO_POINTER(1));
if (pageid == NULL || !strcmp(pageid, "00.identity")) {
/* TODO: check the account name is set, and unique in the account list */
Index: em-composer-prefs.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-composer-prefs.c,v
retrieving revision 1.34
diff -u -p -r1.34 em-composer-prefs.c
--- em-composer-prefs.c 11 Jul 2006 16:47:09 -0000 1.34
+++ em-composer-prefs.c 22 Sep 2006 15:00:56 -0000
@@ -609,7 +609,7 @@ spell_get_language_str (EMComposerPrefs
if (!gtk_tree_model_get_iter_first ((GtkTreeModel *) model, &iter))
return NULL;
- str = g_string_new ("");
+ str = g_string_new (NULL);
do {
gboolean state;
Index: em-composer-utils.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-composer-utils.c,v
retrieving revision 1.54
diff -u -p -r1.54 em-composer-utils.c
--- em-composer-utils.c 18 Apr 2006 20:56:36 -0000 1.54
+++ em-composer-utils.c 22 Sep 2006 15:00:56 -0000
@@ -136,7 +136,7 @@ ask_confirm_for_unwanted_html_mail (EMsg
GString *str;
int i;
- str = g_string_new("");
+ str = g_string_new(NULL);
for (i = 0; recipients[i] != NULL; ++i) {
if (!e_destination_get_html_mail_pref (recipients[i])) {
const char *name;
@@ -1723,7 +1723,7 @@ attribution_format (const char *format,
time_t date;
int type;
- str = g_string_new ("");
+ str = g_string_new (NULL);
date = camel_mime_message_get_date (message, &tzone);
Index: em-filter-rule.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-filter-rule.c,v
retrieving revision 1.1
diff -u -p -r1.1 em-filter-rule.c
--- em-filter-rule.c 17 Jun 2004 07:34:49 -0000 1.1
+++ em-filter-rule.c 22 Sep 2006 15:00:56 -0000
@@ -165,9 +165,9 @@ em_filter_rule_replace_action(EMFilterRu
void
em_filter_rule_build_action(EMFilterRule *fr, GString *out)
{
- g_string_append(out, "(begin\n");
+ g_string_append_len(out, "(begin\n", 7);
filter_part_build_code_list(fr->actions, out);
- g_string_append(out, ")\n");
+ g_string_append_len(out, ")\n", 2);
}
static int
Index: em-folder-browser.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-folder-browser.c,v
retrieving revision 1.91
diff -u -p -r1.91 em-folder-browser.c
--- em-folder-browser.c 14 Sep 2006 16:58:53 -0000 1.91
+++ em-folder-browser.c 22 Sep 2006 15:00:56 -0000
@@ -55,7 +55,6 @@
#include "mail-tools.h"
#include "mail-config.h"
-#include <e-util/e-dialog-utils.h>
#include <e-util/e-icon-factory.h>
#include <camel/camel-stream.h>
@@ -93,7 +92,6 @@
#include "message-list.h"
#include "mail-component.h"
-#include "mail-ops.h"
#include "evolution-shell-component-utils.h" /* Pixmap stuff, sigh */
@@ -372,7 +370,7 @@ generate_viewoption_menu (GtkWidget *emf
return menu;
}
-
+#if 0
static GArray *
viewoption_menu_generator ()
{
@@ -400,6 +398,7 @@ viewoption_menu_generator ()
return menu;
}
+#endif
static void
emfb_realize (GtkWidget *widget)
@@ -417,7 +416,6 @@ emfb_init(GObject *o)
EMFolderBrowser *emfb = (EMFolderBrowser *)o;
RuleContext *search_context = mail_component_peek_search_context (mail_component_peek ());
struct _EMFolderBrowserPrivate *p;
- GtkWidget *menu;
p = emfb->priv = g_malloc0(sizeof(struct _EMFolderBrowserPrivate));
@@ -681,7 +679,7 @@ void em_folder_browser_show_wide(EMFolde
gtk_widget_reparent((GtkWidget *)emfb->view.list, w);
gtk_widget_reparent((GtkWidget *)emfb->priv->preview, w);
gtk_widget_destroy(emfb->vpane);
- gtk_container_resize_children (w);
+ gtk_container_resize_children (GTK_CONTAINER (w));
emfb->vpane = w;
gtk_widget_show(w);
@@ -748,7 +746,7 @@ emfb_search_config_search(EFilterBar *ef
if (input)
filter_input_set_value(input, query);
- words = camel_search_words_split(query);
+ words = camel_search_words_split((const unsigned char *)query);
for (i=0;i<words->len;i++)
strings = g_slist_prepend(strings, g_strdup(words->words[i]->word));
camel_search_words_free (words);
@@ -847,8 +845,6 @@ struct _setup_msg {
static char *
vfolder_setup_desc(struct _mail_msg *mm, int done)
{
- struct _setup_msg *m = (struct _setup_msg *)mm;
-
return g_strdup(_("Searching"));
}
@@ -1021,7 +1017,7 @@ emfb_search_search_activated(ESearchBar
/* Set the search expression */
g_object_get (esb, "query", &search_word, NULL);
- vfolder_setup (efb->account_search_vf, search_word, NULL, folder_list_account);
+ vfolder_setup ((CamelFolder *)efb->account_search_vf, search_word, NULL, folder_list_account);
folder_uri = mail_tools_folder_to_url ((CamelFolder *)efb->account_search_vf);
emfb_set_search_folder (emfv, (CamelFolder *)efb->account_search_vf, folder_uri);
@@ -1079,7 +1075,7 @@ emfb_search_search_activated(ESearchBar
l = l->next;
}
- vfolder_setup (efb->all_account_search_vf, search_word, NULL, folder_list);
+ vfolder_setup ((CamelFolder *)efb->all_account_search_vf, search_word, NULL, folder_list);
folder_uri = mail_tools_folder_to_url ((CamelFolder *)efb->all_account_search_vf);
emfb_set_search_folder (emfv, (CamelFolder *)efb->all_account_search_vf, folder_uri);
@@ -1184,7 +1180,7 @@ emfb_list_message_selected (MessageList
static void
emfb_edit_cut(BonoboUIComponent *uid, void *data, const char *path)
{
- EMFolderBrowser *emfb = data;
+/* EMFolderBrowser *emfb = data; */
/* TODO: pity we can't sucblass this method, ugh, virtualise it? */
@@ -1234,7 +1230,7 @@ emfb_edit_select_all(BonoboUIComponent *
EMFolderView *emfv = data;
message_list_select_all(emfv->list);
- gtk_widget_grab_focus (emfv->list);
+ gtk_widget_grab_focus (GTK_WIDGET (emfv->list));
}
static void
Index: em-folder-utils.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-folder-utils.c,v
retrieving revision 1.7
diff -u -p -r1.7 em-folder-utils.c
--- em-folder-utils.c 8 Feb 2006 11:51:32 -0000 1.7
+++ em-folder-utils.c 22 Sep 2006 15:00:56 -0000
@@ -120,8 +120,8 @@ emft_copy_folders__copy (struct _mail_ms
pending = g_list_append (pending, fi);
- toname = g_string_new ("");
- fromname = g_string_new ("");
+ toname = g_string_new (NULL);
+ fromname = g_string_new (NULL);
tmp = strrchr (m->frombase, '/');
if (tmp == NULL)
Index: em-folder-view.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-folder-view.c,v
retrieving revision 1.161
diff -u -p -r1.161 em-folder-view.c
--- em-folder-view.c 18 Sep 2006 17:24:45 -0000 1.161
+++ em-folder-view.c 22 Sep 2006 15:00:57 -0000
@@ -59,6 +59,8 @@
#include <camel/camel-url.h>
#include <camel/camel-vee-folder.h>
+#include <libedataserver/e-data-server-util.h>
+
#include <bonobo/bonobo-main.h>
#include <bonobo/bonobo-object.h>
#include <bonobo/bonobo-generic-factory.h>
@@ -94,7 +96,6 @@
#include "em-folder-view.h"
#include "em-folder-browser.h"
#include "em-mailer-prefs.h"
-#include "em-folder-browser.h"
#include "em-message-browser.h"
#include "message-list.h"
#include "em-utils.h"
@@ -189,7 +190,6 @@ emfv_init(GObject *o)
EMFolderView *emfv = (EMFolderView *)o;
struct _EMFolderViewPrivate *p;
extern CamelSession *session;
- GtkWidget *search_bar;
gtk_box_set_homogeneous (GTK_BOX (emfv), FALSE);
@@ -561,7 +561,7 @@ emfv_setup_view_instance(EMFolderView *e
id = mail_config_folder_to_safe_url (emfv->folder);
p->view_instance = gal_view_instance_new (collection, id);
- show_wide = em_folder_browser_get_wide (emfv);
+ show_wide = em_folder_browser_get_wide ((EMFolderBrowser *)emfv);
if (show_wide) {
char *safe_id, *filename;
@@ -719,7 +719,7 @@ emfv_selection_get(GtkWidget *widget, Gt
if (p->selection_uri == NULL)
return;
- gtk_selection_data_set(data, data->target, 8, p->selection_uri, strlen(p->selection_uri));
+ gtk_selection_data_set(data, data->target, 8, (unsigned char *)p->selection_uri, strlen(p->selection_uri));
}
static void
@@ -1471,7 +1471,7 @@ static void
emfv_message_reply(EMFolderView *emfv, int mode)
{
char *html;
- guint len;
+ int len;
if (emfv->list->cursor_uid == NULL)
return;
@@ -1515,7 +1515,7 @@ emfv_message_search(BonoboUIComponent *u
else {
/* We are in top level. Just grab focus to Search Bar */
gtk_widget_grab_focus (((ESearchBar *)((EMFolderBrowser *) emfv)->search)->entry);
- gtk_option_menu_set_history (((ESearchBar *)((EMFolderBrowser *) emfv)->search)->scopeoption, 3);
+ gtk_option_menu_set_history (GTK_OPTION_MENU (((ESearchBar *)((EMFolderBrowser *) emfv)->search)->scopeoption), 3);
}
}
@@ -1920,7 +1920,7 @@ emfv_enable_menus(EMFolderView *emfv)
EMMenuTargetSelect *t;
t = em_menu_target_new_select(emfv->menu, emfv->folder, emfv->folder_uri, message_list_get_selected(emfv->list));
- t->target.widget = emfv;
+ t->target.widget = GTK_WIDGET (emfv);
e_menu_update_target((EMenu *)emfv->menu, t);
}
}
@@ -1937,7 +1937,7 @@ emfv_enable_menus(EMFolderView *emfv)
disable_mask = ~0;
}
- name = g_string_new("");
+ name = g_string_new(NULL);
for (l = emfv->enable_map; l; l = l->next) {
EMFolderViewEnable *map = l->data;
int i;
@@ -2874,7 +2874,7 @@ emfv_on_url_cb (GObject *emitter, const
camel_url_free(curl);
camel_object_unref(cia);
} else if (!strncmp (url, "##", 2)) {
- nice_url = g_strdup_printf (_("Click to hide/unhide addresses"), url);
+ nice_url = g_strdup (_("Click to hide/unhide addresses"));
} else
nice_url = g_strdup_printf (_("Click to open %s"), url);
}
Index: em-format-html-display.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-format-html-display.c,v
retrieving revision 1.105
diff -u -p -r1.105 em-format-html-display.c
--- em-format-html-display.c 18 Sep 2006 17:24:46 -0000 1.105
+++ em-format-html-display.c 22 Sep 2006 15:00:57 -0000
@@ -85,6 +85,7 @@
#include <camel/camel-string-utils.h>
#include <misc/e-cursors.h>
+#include <misc/e-attachment-bar.h>
#include <e-util/e-util.h>
#include <e-util/e-util-private.h>
@@ -462,7 +463,7 @@ void em_format_html_display_set_caret_mo
gtk_html_set_caret_mode(((EMFormatHTML *)efhd)->html, state);
}
-EAttachmentBar *
+GtkWidget *
em_format_html_display_get_bar (EMFormatHTMLDisplay *efhd)
{
return efhd->priv->attachment_bar;
@@ -618,16 +619,16 @@ clear_button_clicked_cb (GtkWidget *widg
{
struct _EMFormatHTMLDisplayPrivate *p = efhd->priv;
- gtk_entry_set_text (p->search_entry, "");
+ gtk_entry_set_text (GTK_ENTRY (p->search_entry), "");
- gtk_signal_emit_by_name (p->search_entry, "activate", efhd);
+ g_signal_emit_by_name (p->search_entry, "activate", efhd);
}
/* Controlls the visibility of icon_entry's visibility */
static void
icon_entry_changed_cb (GtkWidget *widget, GtkWidget *clear_button)
{
- const char *text = gtk_entry_get_text (widget);
+ const char *text = gtk_entry_get_text (GTK_ENTRY (widget));
if (text && *text)
gtk_widget_show (clear_button);
@@ -639,7 +640,7 @@ GtkWidget *
em_format_html_get_search_dialog (EMFormatHTMLDisplay *efhd)
{
struct _EMFormatHTMLDisplayPrivate *p = efhd->priv;
- GtkWidget *hbox3, *hbox2, *button3, *button2, *button1, *label1, *alignment, *image1, *label2;
+ GtkWidget *hbox2, *button3, *button2, *label1;
GtkWidget *icon_entry, *clear_button;
p->search_entry_box = gtk_hbox_new (FALSE, 0);
@@ -651,15 +652,15 @@ em_format_html_get_search_dialog (EMForm
/* Icon entry */
icon_entry = e_icon_entry_new ();
p->search_entry = e_icon_entry_get_entry (E_ICON_ENTRY (icon_entry));
- gtk_label_set_mnemonic_widget (label1, p->search_entry);
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label1), p->search_entry);
gtk_widget_show (p->search_entry);
clear_button = e_icon_entry_create_button ("gtk-clear");
e_icon_entry_pack_widget (E_ICON_ENTRY (icon_entry), clear_button, FALSE);
gtk_widget_show_all (icon_entry);
gtk_widget_hide (clear_button);
- g_signal_connect (G_OBJECT (clear_button), "button-press-event", clear_button_clicked_cb, efhd);
- g_signal_connect (G_OBJECT (p->search_entry), "changed", icon_entry_changed_cb, clear_button);
+ g_signal_connect (G_OBJECT (clear_button), "button-press-event", (GCallback)clear_button_clicked_cb, efhd);
+ g_signal_connect (G_OBJECT (p->search_entry), "changed", (GCallback)icon_entry_changed_cb, clear_button);
gtk_box_pack_start ((GtkBox *)(p->search_entry_box), icon_entry, FALSE, FALSE, 0);
// gtk_box_pack_start ((GtkBox *)(p->search_entry_box), icon_entry, TRUE, TRUE, 0);
@@ -673,7 +674,7 @@ em_format_html_get_search_dialog (EMForm
gtk_box_pack_start ((GtkBox *)(hbox2), button3, FALSE, FALSE, 5);
button2 = gtk_button_new_with_mnemonic (_("Fo_rward"));
- gtk_button_set_image (button2, gtk_image_new_from_stock(GTK_STOCK_GO_FORWARD, GTK_ICON_SIZE_BUTTON));
+ gtk_button_set_image (GTK_BUTTON (button2), gtk_image_new_from_stock(GTK_STOCK_GO_FORWARD, GTK_ICON_SIZE_BUTTON));
gtk_widget_show (button2);
gtk_box_pack_start ((GtkBox *)(hbox2), button2, FALSE, FALSE, 5);
@@ -684,7 +685,7 @@ em_format_html_get_search_dialog (EMForm
p->search_matches_label = gtk_label_new (_(""));
gtk_widget_show (p->search_matches_label);
gtk_box_pack_start ((GtkBox *)(hbox2), p->search_matches_label, TRUE, TRUE, 0);
- p->search_dialog = (GtkWidget *)hbox2;
+ p->search_dialog = (GtkHBox *)hbox2;
p->search_wrap = FALSE;
@@ -704,7 +705,7 @@ static void
set_focus_cb (GtkWidget *window, GtkWidget *widget, EMFormatHTMLDisplay *efhd)
{
struct _EMFormatHTMLDisplayPrivate *p = efhd->priv;
- GtkWidget *sbar = p->search_dialog;
+ GtkWidget *sbar = GTK_WIDGET (p->search_dialog);
while (widget != NULL && widget != sbar) {
widget = widget->parent;
@@ -729,7 +730,7 @@ em_format_html_display_search(EMFormatHT
GtkWidget *toplevel;
gtk_widget_show ( (GtkWidget *)(p->search_dialog));
gtk_widget_grab_focus ( (GtkWidget *)(p->search_entry));
- gtk_widget_show ( (GtkWidget *) p->search_entry_box);
+ gtk_widget_show (p->search_entry_box);
toplevel = gtk_widget_get_toplevel ((GtkWidget *)(p->search_dialog));
@@ -750,15 +751,14 @@ em_format_html_display_search_with (EMFo
struct _EMFormatHTMLDisplayPrivate *p = efhd->priv;
if (p->search_dialog){
- GtkWidget *toplevel;
gtk_widget_show ( (GtkWidget *)(p->search_dialog));
/* Set the query */
- gtk_entry_set_text ( (GtkWidget *) p->search_entry, word);
- gtk_widget_hide ( (GtkWidget *) p->search_entry_box);
+ gtk_entry_set_text (GTK_ENTRY (p->search_entry), word);
+ gtk_widget_hide (p->search_entry_box);
/* Trigger the search */
- gtk_signal_emit_by_name (p->search_entry, "activate", efhd);
+ g_signal_emit_by_name (p->search_entry, "activate", efhd);
}
}
@@ -768,7 +768,7 @@ em_format_html_display_search_close (EMF
struct _EMFormatHTMLDisplayPrivate *p = efhd->priv;
if (p->search_dialog)
- efhd_search_destroy(p->search_dialog, efhd);
+ efhd_search_destroy(GTK_WIDGET (p->search_dialog), efhd);
}
void
@@ -875,21 +875,22 @@ efhd_html_link_clicked (GtkHTML *html, c
{
d(printf("link clicked event '%s'\n", url));
if (url && !strncmp(url, "##", 2)) {
- if (!strcmp (url, "##TO##"))
+ if (!strcmp (url, "##TO##")) {
if (!(((EMFormatHTML *) efhd)->header_wrap_flags & EM_FORMAT_HTML_HEADER_TO))
((EMFormatHTML *) efhd)->header_wrap_flags |= EM_FORMAT_HTML_HEADER_TO;
else
((EMFormatHTML *) efhd)->header_wrap_flags &= ~EM_FORMAT_HTML_HEADER_TO;
- else if (!strcmp (url, "##CC##"))
+ } else if (!strcmp (url, "##CC##")) {
if (!(((EMFormatHTML *) efhd)->header_wrap_flags & EM_FORMAT_HTML_HEADER_CC))
((EMFormatHTML *) efhd)->header_wrap_flags |= EM_FORMAT_HTML_HEADER_CC;
else
((EMFormatHTML *) efhd)->header_wrap_flags &= ~EM_FORMAT_HTML_HEADER_CC;
- else if (!strcmp (url, "##BCC##"))
+ } else if (!strcmp (url, "##BCC##")) {
if (!(((EMFormatHTML *) efhd)->header_wrap_flags & EM_FORMAT_HTML_HEADER_BCC))
((EMFormatHTML *) efhd)->header_wrap_flags |= EM_FORMAT_HTML_HEADER_BCC;
else
((EMFormatHTML *) efhd)->header_wrap_flags &= ~EM_FORMAT_HTML_HEADER_BCC;
+ }
em_format_redraw((EMFormat *)efhd);
} else
g_signal_emit((GObject *)efhd, efhd_signals[EFHD_LINK_CLICKED], 0, url);
Index: em-format-html-display.h
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-format-html-display.h,v
retrieving revision 1.10
diff -u -p -r1.10 em-format-html-display.h
--- em-format-html-display.h 30 Jun 2006 09:46:25 -0000 1.10
+++ em-format-html-display.h 22 Sep 2006 15:00:57 -0000
@@ -63,7 +63,7 @@ void em_format_html_display_paste (EMFor
void em_format_html_display_zoom_in (EMFormatHTMLDisplay *efhd);
void em_format_html_display_zoom_out (EMFormatHTMLDisplay *efhd);
void em_format_html_display_zoom_reset (EMFormatHTMLDisplay *efhd);
-EAttachmentBar *em_format_html_display_get_bar (EMFormatHTMLDisplay *efhd);
+GtkWidget *em_format_html_display_get_bar (EMFormatHTMLDisplay *efhd);
gboolean em_format_html_display_popup_menu (EMFormatHTMLDisplay *efhd);
Index: em-format-html.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-format-html.c,v
retrieving revision 1.91
diff -u -p -r1.91 em-format-html.c
--- em-format-html.c 28 Aug 2006 13:06:42 -0000 1.91
+++ em-format-html.c 22 Sep 2006 15:00:57 -0000
@@ -1536,7 +1536,7 @@ efh_format_address (EMFormatHTML *efh, G
g_free (addr);
if (name && *name)
- g_string_append (out, ">");
+ g_string_append_len (out, ">", 4);
break;
case CAMEL_HEADER_ADDRESS_GROUP:
g_string_append_printf (out, "%s: ", name);
@@ -1553,26 +1553,26 @@ efh_format_address (EMFormatHTML *efh, G
i++;
a = a->next;
if (a)
- g_string_append (out, ", ");
+ g_string_append_len (out, ", ", 2);
/* Let us add a '...' if we have more addresses */
if (limit > 0 && wrap && a && (i>(limit-1))) {
if (!strcmp (field, i18n_hdrs[2])) {
- g_string_append (out, "<a href=\"##TO##\">...</a>");
+ g_string_append_len (out, "<a href=\"##TO##\">...</a>", 24);
str = g_strdup_printf ("<a href=\"##TO##\"><img src=\"%s/plus.png\" /></a> ", EVOLUTION_ICONSDIR);
return str;
}
else if (!strcmp (field, i18n_hdrs[3])) {
- g_string_append (out, "<a href=\"##CC##\">...</a>");
+ g_string_append_len (out, "<a href=\"##CC##\">...</a>", 24);
str = g_strdup_printf ("<a href=\"##CC##\"><img src=\"%s/plus.png\" /></a> ", EVOLUTION_ICONSDIR);
return str;
}
else if (!strcmp (field, i18n_hdrs[4])) {
- g_string_append (out, "<a href=\"##BCC##\">...</a>");
+ g_string_append_len (out, "<a href=\"##BCC##\">...</a>", 25);
str = g_strdup_printf ("<a href=\"##BCC##\"><img src=\"%s/plus.png\" /></a> ", EVOLUTION_ICONSDIR);
return str;
@@ -1603,8 +1603,8 @@ static void
efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct _camel_header_raw *header, guint32 flags, const char *charset)
{
EMFormatHTML *efh = (EMFormatHTML *)emf;
- char *name, *value = NULL, *p;
- const char *label, *txt;
+ char *name, *value = NULL, *p, *label;
+ const char *txt;
int addrspec = 0, i;
char *str_field = NULL;
@@ -1640,8 +1640,8 @@ efh_format_header(EMFormat *emf, CamelSt
label = _(name);
- html = g_string_new("");
- img = efh_format_address(emf, html, addrs, label);
+ html = g_string_new(NULL);
+ img = efh_format_address((EMFormatHTML *)emf, html, addrs, label);
if (img) {
// str_field = g_strdup_printf ("<table><tr><td valign=top>%s</td><td valign=top><b>%s:</b></td></tr></table>", img, label);
@@ -1714,7 +1714,7 @@ efh_format_header(EMFormat *emf, CamelSt
if (ng == NULL)
return;
- html = g_string_new("");
+ html = g_string_new(NULL);
scan = ng;
while (scan) {
g_string_append_printf(html, "<a href=\"news:%s\";>%s</a>", scan->newsgroup, scan->newsgroup);
Index: em-format-quote.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-format-quote.c,v
retrieving revision 1.19
diff -u -p -r1.19 em-format-quote.c
--- em-format-quote.c 8 Aug 2005 04:30:38 -0000 1.19
+++ em-format-quote.c 22 Sep 2006 15:00:57 -0000
@@ -237,7 +237,7 @@ emfq_format_address (GString *out, struc
g_free (addr);
if (name && *name)
- g_string_append (out, ">");
+ g_string_append_len (out, ">", 4);
break;
case CAMEL_HEADER_ADDRESS_GROUP:
g_string_append_printf (out, "%s: ", name);
@@ -253,7 +253,7 @@ emfq_format_address (GString *out, struc
a = a->next;
if (a)
- g_string_append (out, ", ");
+ g_string_append_len (out, ", ", 2);
}
}
@@ -301,7 +301,7 @@ emfq_format_header (EMFormat *emf, Camel
label = _(name);
- html = g_string_new ("");
+ html = g_string_new (NULL);
emfq_format_address (html, addrs);
camel_header_address_unref (addrs);
txt = value = html->str;
@@ -440,7 +440,6 @@ emfq_format_attachment(EMFormat *emf, Ca
#include <camel/camel-medium.h>
#include <camel/camel-mime-part.h>
#include <camel/camel-multipart.h>
-#include <camel/camel-url.h>
static void
emfq_text_plain(EMFormatQuote *emfq, CamelStream *stream, CamelMimePart *part, EMFormatHandler *info)
Index: em-format.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-format.c,v
retrieving revision 1.52
diff -u -p -r1.52 em-format.c
--- em-format.c 20 Apr 2006 16:35:32 -0000 1.52
+++ em-format.c 22 Sep 2006 15:00:58 -0000
@@ -121,7 +121,7 @@ emf_init(GObject *o)
emf->inline_table = g_hash_table_new(g_str_hash, g_str_equal);
e_dlist_init(&emf->header_list);
em_format_default_headers(emf);
- emf->part_id = g_string_new("");
+ emf->part_id = g_string_new(NULL);
}
static void
@@ -311,7 +311,7 @@ em_format_fallback_handler(EMFormat *emf
* @size is used to allocate the structure, so that it can be directly
* subclassed by implementors.
*
- * @cid can be used to override the key used to retreive the PURI, if NULL,
+ * @cid can be used to override the key used to retrieve the PURI, if NULL,
* then the content-location and the content-id of the @part are stored
* as lookup keys for the part.
*
@@ -1097,7 +1097,7 @@ em_format_describe_part(CamelMimePart *p
const char *text;
char *out;
- stext = g_string_new("");
+ stext = g_string_new(NULL);
text = gnome_vfs_mime_get_description(mime_type);
g_string_append_printf(stext, _("%s attachment"), text?text:mime_type);
if ((text = camel_mime_part_get_filename (part)))
@@ -1208,7 +1208,7 @@ static void
emf_multipart_alternative(EMFormat *emf, CamelStream *stream, CamelMimePart *part, const EMFormatHandler *info)
{
CamelMultipart *mp = (CamelMultipart *)camel_medium_get_content_object((CamelMedium *)part);
- int i, nparts, bestid;
+ int i, nparts, bestid = 0;
CamelMimePart *best = NULL;
if (!CAMEL_IS_MULTIPART(mp)) {
Index: em-format.h
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-format.h,v
retrieving revision 1.16
diff -u -p -r1.16 em-format.h
--- em-format.h 19 May 2005 06:06:35 -0000 1.16
+++ em-format.h 22 Sep 2006 15:00:58 -0000
@@ -303,11 +303,11 @@ void em_format_pull_level(EMFormat *emf)
#define em_format_format_clone(emf, folder, uid, msg, src) ((EMFormatClass *)G_OBJECT_GET_CLASS(emf))->format_clone((emf), (folder), (uid), (msg), (src))
/* formats a new message */
#define em_format_format(emf, folder, uid, msg) ((EMFormatClass *)G_OBJECT_GET_CLASS(emf))->format_clone((emf), (folder), (uid), (msg), NULL)
-#define em_format_redraw(emf) ((EMFormatClass *)G_OBJECT_GET_CLASS(emf))->format_clone((emf), \
+#define em_format_redraw(emf) ((EMFormatClass *)G_OBJECT_GET_CLASS(emf))->format_clone((EMFormat *)(emf), \
((EMFormat *)(emf))->folder, \
((EMFormat *)(emf))->uid, \
((EMFormat *)(emf))->message, \
- (emf))
+ (EMFormat *)(emf))
void em_format_format_error(EMFormat *emf, struct _CamelStream *stream, const char *fmt, ...);
#define em_format_format_attachment(emf, stream, msg, type, info) ((EMFormatClass *)G_OBJECT_GET_CLASS(emf))->format_attachment((emf), (stream), (msg), (type), (info))
#define em_format_format_source(emf, stream, msg) ((EMFormatClass *)G_OBJECT_GET_CLASS(emf))->format_source((emf), (stream), (msg))
Index: em-mailer-prefs.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-mailer-prefs.c,v
retrieving revision 1.39
diff -u -p -r1.39 em-mailer-prefs.c
--- em-mailer-prefs.c 9 Aug 2006 08:43:27 -0000 1.39
+++ em-mailer-prefs.c 22 Sep 2006 15:00:58 -0000
@@ -832,7 +832,7 @@ em_mailer_prefs_construct (EMMailerPrefs
gtk_widget_set_sensitive ((GtkWidget *) prefs->notify_play_sound, FALSE);
buf = gconf_client_get_string (prefs->gconf, "/apps/evolution/mail/notify/sound", NULL);
- gtk_file_chooser_set_filename (GTK_FILE_CHOOSER_BUTTON (prefs->notify_sound_file), buf ? buf : "");
+ gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (prefs->notify_sound_file), buf ? buf : "");
g_signal_connect (GTK_FILE_CHOOSER_BUTTON (prefs->notify_sound_file), "selection-changed",
G_CALLBACK (notify_sound_changed), prefs);
if (val != MAIL_CONFIG_NOTIFY_PLAY_SOUND)
Index: em-migrate.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-migrate.c,v
retrieving revision 1.55
diff -u -p -r1.55 em-migrate.c
--- em-migrate.c 26 Apr 2006 08:15:39 -0000 1.55
+++ em-migrate.c 22 Sep 2006 15:00:58 -0000
@@ -589,7 +589,7 @@ is_xml1encoded (const char *txt)
static char *
decode_xml1 (const char *txt)
{
- GString *out = g_string_new ("");
+ GString *out = g_string_new (NULL);
const unsigned char *p;
char *res;
@@ -630,7 +630,7 @@ decode_xml1 (const char *txt)
static char *
utf8_reencode (const char *txt)
{
- GString *out = g_string_new ("");
+ GString *out = g_string_new (NULL);
const unsigned char *p;
char *res;
@@ -1589,7 +1589,7 @@ mbox_build_filename (GString *path, cons
g_string_append_len (path, start, inptr - start);
if (*inptr == '/') {
- g_string_append (path, ".sbd/");
+ g_string_append_len (path, ".sbd/", 5);
inptr++;
/* strip extranaeous '/'s */
@@ -1612,7 +1612,7 @@ em_migrate_folder(EMMigrateSession *sess
GString *src, *dest;
int res = -1;
- src = g_string_new("");
+ src = g_string_new(NULL);
g_string_printf(src, "%s/folder-metadata.xml", dirname);
if (stat (src->str, &st) == -1
@@ -1623,7 +1623,7 @@ em_migrate_folder(EMMigrateSession *sess
return 0;
}
- dest = g_string_new("");
+ dest = g_string_new(NULL);
uri = get_local_store_uri(dirname, &name, &index);
em_migrate_set_folder_name (full_name);
thread_list = get_local_et_expanded (dirname);
@@ -1680,7 +1680,7 @@ em_migrate_folder(EMMigrateSession *sess
/* create a .cmeta file specifying to index and/or thread the folder */
g_string_truncate (dest, dlen);
- g_string_append (dest, ".cmeta");
+ g_string_append_len (dest, ".cmeta", 6);
if ((fp = fopen (dest->str, "w")) != NULL) {
int fd = fileno (fp);
@@ -2102,7 +2102,7 @@ em_migrate_pop_uid_caches_1_4 (const cha
g_string_truncate (newpath, newpath->len - 1);
if (e_util_mkdir_hier (newpath->str, 0777) == -1
- || cp(oldpath->str, (g_string_append(newpath, "/uid-cache"))->str, FALSE, CP_UNIQUE)) {
+ || cp(oldpath->str, (g_string_append_len (newpath, "/uid-cache", 10))->str, FALSE, CP_UNIQUE)) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
_("Unable to copy POP3 keep-on-server data `%s': %s"),
oldpath->str, g_strerror(errno));
@@ -2153,23 +2153,23 @@ em_migrate_folder_expand_state_1_4 (cons
DIR *dir;
srcpath = g_string_new (g_get_home_dir ());
- g_string_append (srcpath, "/evolution/config");
+ g_string_append_len (srcpath, "/evolution/config", 17);
if (stat (srcpath->str, &st) == -1 || !S_ISDIR (st.st_mode)) {
g_string_free (srcpath, TRUE);
return 0;
}
destpath = g_string_new (evolution_dir);
- g_string_append (destpath, "/mail/config");
+ g_string_append_len (destpath, "/mail/config", 12);
if (e_util_mkdir_hier (destpath->str, 0777) == -1 || !(dir = opendir (srcpath->str))) {
g_string_free (destpath, TRUE);
g_string_free (srcpath, TRUE);
return 0;
}
- g_string_append (srcpath, "/et-expanded-");
+ g_string_append_len (srcpath, "/et-expanded-", 13);
slen = srcpath->len;
- g_string_append (destpath, "/et-expanded-");
+ g_string_append_len (destpath, "/et-expanded-", 13);
dlen = destpath->len;
evo14_mbox_root = g_build_filename (g_get_home_dir (), "evolution", "local", NULL);
@@ -2251,14 +2251,14 @@ em_migrate_folder_view_settings_1_4 (con
DIR *dir;
srcpath = g_string_new (g_get_home_dir ());
- g_string_append (srcpath, "/evolution/views/mail");
+ g_string_append_len (srcpath, "/evolution/views/mail", 21);
if (stat (srcpath->str, &st) == -1 || !S_ISDIR (st.st_mode)) {
g_string_free (srcpath, TRUE);
return 0;
}
destpath = g_string_new (evolution_dir);
- g_string_append (destpath, "/mail/views");
+ g_string_append_len (destpath, "/mail/views", 11);
if (e_util_mkdir_hier (destpath->str, 0777) == -1 || !(dir = opendir (srcpath->str))) {
g_string_free (destpath, TRUE);
g_string_free (srcpath, TRUE);
Index: em-popup.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-popup.c,v
retrieving revision 1.42
diff -u -p -r1.42 em-popup.c
--- em-popup.c 23 Aug 2006 07:59:00 -0000 1.42
+++ em-popup.c 22 Sep 2006 15:00:58 -0000
@@ -757,7 +757,7 @@ emp_standard_menu_factory(EPopup *emp, v
g_free (mime_type);
if (apps) {
- GString *label = g_string_new("");
+ GString *label = g_string_new(NULL);
GSList *open_menus = NULL;
GList *l;
Index: em-utils.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-utils.c,v
retrieving revision 1.83
diff -u -p -r1.83 em-utils.c
--- em-utils.c 23 Aug 2006 14:05:19 -0000 1.83
+++ em-utils.c 22 Sep 2006 15:00:58 -0000
@@ -343,7 +343,7 @@ em_utils_edit_filters (GtkWidget *parent
* Picked this from e-d-s/libedataserver/e-data.
* But it allows more characters to occur in filenames, especially when saving attachment.
*/
-void
+static void
em_filename_make_safe (gchar *string)
{
gchar *p, *ts;
@@ -391,7 +391,7 @@ emu_get_save_filesel (GtkWidget *parent,
GTK_STOCK_SAVE, GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (filesel), GTK_RESPONSE_OK);
- gtk_file_chooser_set_local_only (filesel, FALSE);
+ gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (filesel), FALSE);
#else
char *filename;
Index: em-vfolder-rule.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-vfolder-rule.c,v
retrieving revision 1.12
diff -u -p -r1.12 em-vfolder-rule.c
--- em-vfolder-rule.c 11 Jul 2006 17:20:36 -0000 1.12
+++ em-vfolder-rule.c 22 Sep 2006 15:00:58 -0000
@@ -413,25 +413,24 @@ select_source(GtkWidget *list, struct _s
static void
select_source_with_changed(GtkWidget *widget, struct _source_data *data)
{
- em_vfolder_rule_with_t with;
- GList *group = NULL;
- gboolean sensitive = FALSE;
+ em_vfolder_rule_with_t with = 0;
+ GSList *group = NULL;
gint i = 0;
- if ( !gtk_toggle_button_get_active (widget) )
+ if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
return;
- group = gtk_radio_button_get_group (widget);
+ group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (widget));
- for (i=0; i< g_list_length(group); i++) {
- if ( g_list_nth_data (group, with = i) == widget )
+ for (i=0; i< g_slist_length(group); i++) {
+ if ( g_slist_nth_data (group, with = i) == widget )
break;
}
if ( with < EM_VFOLDER_RULE_WITH_SPECIFIC || with > EM_VFOLDER_RULE_WITH_LOCAL )
with = 0;
- gtk_widget_set_sensitive (data->source_selector, !with );
+ gtk_widget_set_sensitive (data->source_selector, !with);
data->vr->with = with;
}
@@ -614,7 +613,6 @@ get_widget(FilterRule *fr, RuleContext *
GtkWidget *widget, *frame, *list;
struct _source_data *data;
GtkRadioButton *rb;
- GList *group;
const char *source;
GtkTreeIter iter;
GladeXML *gui;
@@ -671,9 +669,9 @@ get_widget(FilterRule *fr, RuleContext *
data->source_selector = (GtkWidget *)glade_xml_get_widget (gui, "source_selector");
- rb = g_list_nth_data(gtk_radio_button_get_group (rb), vr->with);
- gtk_toggle_button_set_active (rb, TRUE);
- gtk_signal_emit_by_name (rb, "toggled");
+ rb = g_slist_nth_data(gtk_radio_button_get_group (rb), vr->with);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rb), TRUE);
+ g_signal_emit_by_name (rb, "toggled");
set_sensitive(data);
Index: mail-autofilter.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-autofilter.c,v
retrieving revision 1.58
diff -u -p -r1.58 mail-autofilter.c
--- mail-autofilter.c 8 Feb 2006 11:51:32 -0000 1.58
+++ mail-autofilter.c 22 Sep 2006 15:00:58 -0000
@@ -428,7 +428,7 @@ mail_filter_delete_uri(CamelStore *store
GString *s;
GList *l;
- s = g_string_new("");
+ s = g_string_new(NULL);
l = deleted;
while (l) {
g_string_append_printf (s, " %s\n", (char *)l->data);
Index: mail-component.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-component.c,v
retrieving revision 1.137
diff -u -p -r1.137 mail-component.c
--- mail-component.c 4 Sep 2006 10:36:49 -0000 1.137
+++ mail-component.c 22 Sep 2006 15:00:58 -0000
@@ -510,7 +510,7 @@ view_changed(EMFolderView *emfv, ECompon
if (emfv->folder) {
char *name, *title;
guint32 visible, unread, deleted, junked;
- GString *tmp = g_string_new("");
+ GString *tmp = g_string_new(NULL);
camel_object_get(emfv->folder, NULL,
CAMEL_FOLDER_NAME, &name,
@@ -1043,7 +1043,7 @@ setline_check(void *key, void *value, vo
int
status_check (GNOME_Evolution_ShellState shell_state)
{
- int status;
+ int status = 0;
switch (shell_state)
{
Index: mail-ops.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-ops.c,v
retrieving revision 1.458
diff -u -p -r1.458 mail-ops.c
--- mail-ops.c 23 Aug 2006 07:59:00 -0000 1.458
+++ mail-ops.c 22 Sep 2006 15:00:59 -0000
@@ -469,7 +469,7 @@ mail_send_message(CamelFolder *queue, co
camel_medium_set_header (CAMEL_MEDIUM (message), "X-Mailer", "Evolution " VERSION SUB_VERSION " " VERSION_COMMENT);
- err = g_string_new("");
+ err = g_string_new(NULL);
xev = mail_tool_remove_xevolution_headers (message);
tmp = camel_header_raw_find(&xev, "X-Evolution-Account", NULL);
@@ -1655,15 +1655,10 @@ struct _empty_trash_msg {
static char *empty_trash_desc(struct _mail_msg *mm, int done)
{
- /* FIXME after 1.4 is out and we're not in string freeze any more. */
-#if 0
struct _empty_trash_msg *m = (struct _empty_trash_msg *)mm;
return g_strdup_printf (_("Emptying trash in \'%s\'"),
m->account ? m->account->name : _("Local Folders"));
-#else
- return g_strdup(_("Expunging folder"));
-#endif
}
static void empty_trash_empty(struct _mail_msg *mm)
@@ -1983,7 +1978,7 @@ save_messages_save (struct _mail_msg *mm
CamelStreamFilter *filtered_stream;
CamelMimeFilterFrom *from_filter;
CamelStream *stream;
- int fd, i;
+ int i;
char *from;
stream = camel_stream_vfs_new_with_uri (m->path, O_WRONLY | O_CREAT | O_TRUNC, 0666);
Index: mail-send-recv.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-send-recv.c,v
retrieving revision 1.110
diff -u -p -r1.110 mail-send-recv.c
--- mail-send-recv.c 21 Aug 2006 16:25:57 -0000 1.110
+++ mail-send-recv.c 22 Sep 2006 15:00:59 -0000
@@ -312,7 +312,7 @@ static send_info_t get_receive_type(cons
return SEND_INVALID;
}
-gboolean
+static void
dialog_map (GtkWidget *window, GdkEvent *event, GtkWidget *table)
{
int h, w;
Index: mail-session.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-session.c,v
retrieving revision 1.111
diff -u -p -r1.111 mail-session.c
--- mail-session.c 24 Apr 2006 06:55:13 -0000 1.111
+++ mail-session.c 22 Sep 2006 15:00:59 -0000
@@ -505,8 +505,8 @@ main_get_filter_driver (CamelSession *se
if (strcmp (type, FILTER_SOURCE_JUNKTEST) != 0) {
GString *fsearch, *faction;
- fsearch = g_string_new ("");
- faction = g_string_new ("");
+ fsearch = g_string_new (NULL);
+ faction = g_string_new (NULL);
if (!strcmp (type, FILTER_SOURCE_DEMAND))
type = FILTER_SOURCE_INCOMING;
Index: mail-signature-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-signature-editor.c,v
retrieving revision 1.45
diff -u -p -r1.45 mail-signature-editor.c
--- mail-signature-editor.c 17 Dec 2005 17:45:33 -0000 1.45
+++ mail-signature-editor.c 22 Sep 2006 15:00:59 -0000
@@ -413,7 +413,8 @@ mail_signature_editor (ESignature *sig,
destroy_editor (editor);
return;
}
-
+
+ CORBA_exception_init(&ev);
editor->engine = (GNOME_GtkHTML_Editor_Engine) Bonobo_Unknown_queryInterface
(bonobo_widget_get_objref (BONOBO_WIDGET (editor->control)), "IDL:GNOME/GtkHTML/Editor/Engine:1.0", &ev);
CORBA_exception_free(&ev);
Index: message-list.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/message-list.c,v
retrieving revision 1.437
diff -u -p -r1.437 message-list.c
--- message-list.c 25 Aug 2006 17:48:15 -0000 1.437
+++ message-list.c 22 Sep 2006 15:00:59 -0000
@@ -82,7 +82,6 @@
#ifdef TIMEIT
#include <sys/time.h>
-#include <unistd.h>
#endif
#ifdef G_OS_WIN32
@@ -1169,14 +1168,14 @@ sanitize_recipients (const gchar *string
GString *gstring;
gboolean quoted = FALSE;
const gchar *p;
- GString *recipients = g_string_new ("");
+ GString *recipients = g_string_new (NULL);
char *single_add;
char **name;
if (!string || !*string)
return "";
- gstring = g_string_new ("");
+ gstring = g_string_new (NULL);
for (p = string; *p; p = g_utf8_next_char (p)) {
gunichar c = g_utf8_get_char (p);
@@ -1187,10 +1186,10 @@ sanitize_recipients (const gchar *string
single_add = g_string_free (gstring, FALSE);
name = g_strsplit(single_add,"<",2);
g_string_append (recipients, *name);
- g_string_append (recipients, ",");
+ g_string_append_c (recipients, ",");
g_free (single_add);
g_strfreev (name);
- gstring = g_string_new ("");
+ gstring = g_string_new (NULL);
continue;
}
@@ -1367,7 +1366,7 @@ ml_tree_value_at (ETreeModel *etm, ETree
CamelFolder *folder;
CamelURL *curl;
EAccount *account;
- char *location, *euri, *url;
+ char *location = NULL, *euri, *url;
if (CAMEL_IS_VEE_FOLDER(message_list->folder)) {
folder = camel_vee_folder_get_location((CamelVeeFolder *)message_list->folder, (CamelVeeMessageInfo *)msg_info, NULL);
@@ -1399,7 +1398,6 @@ ml_tree_value_at (ETreeModel *etm, ETree
}
case COL_MIXED_RECIPIENTS:
case COL_RECIPIENTS:{
- char **sender_name;
str = camel_message_info_to (msg_info);
return sanitize_recipients(str);
@@ -1549,9 +1547,9 @@ static ECell * create_composite_cell (in
"color_column", COL_COLOUR,
NULL);
- e_cell_hbox_append (cell_hbox, cell_from, show_email ? col : alt_col, 68);
- e_cell_hbox_append (cell_hbox, cell_attach, COL_ATTACHMENT, 5);
- e_cell_hbox_append (cell_hbox, cell_date, COL_SENT, 27);
+ e_cell_hbox_append (E_CELL_HBOX (cell_hbox), cell_from, show_email ? col : alt_col, 68);
+ e_cell_hbox_append (E_CELL_HBOX (cell_hbox), cell_attach, COL_ATTACHMENT, 5);
+ e_cell_hbox_append (E_CELL_HBOX (cell_hbox), cell_date, COL_SENT, 27);
cell_sub = e_cell_text_new(fixed_name? fixed_name:NULL, GTK_JUSTIFY_LEFT);
g_object_set (G_OBJECT (cell_sub),
@@ -1559,12 +1557,12 @@ static ECell * create_composite_cell (in
"color_column", COL_COLOUR,
NULL);
cell_tree = e_cell_tree_new (NULL, NULL, TRUE, cell_sub);
- e_cell_vbox_append (cell_vbox, cell_hbox, COL_FROM);
- e_cell_vbox_append (cell_vbox, cell_tree, COL_SUBJECT);
+ e_cell_vbox_append (E_CELL_VBOX (cell_vbox), cell_hbox, COL_FROM);
+ e_cell_vbox_append (E_CELL_VBOX (cell_vbox), cell_tree, COL_SUBJECT);
- g_object_set_data (cell_vbox, "cell_date", cell_date);
- g_object_set_data (cell_vbox, "cell_sub", cell_sub);
- g_object_set_data (cell_vbox, "cell_from", cell_from);
+ g_object_set_data (G_OBJECT (cell_vbox), "cell_date", cell_date);
+ g_object_set_data (G_OBJECT (cell_vbox), "cell_sub", cell_sub);
+ g_object_set_data (G_OBJECT (cell_vbox), "cell_from", cell_from);
g_free (fixed_name);
@@ -1574,8 +1572,8 @@ static ECell * create_composite_cell (in
static void
composite_cell_set_strike_col (ECell *cell, int col)
{
- g_object_set (g_object_get_data(cell, "cell_date"), "strikeout_column", col, NULL);
- g_object_set (g_object_get_data(cell, "cell_from"), "strikeout_column", col, NULL);
+ g_object_set (g_object_get_data(G_OBJECT (cell), "cell_date"), "strikeout_column", col, NULL);
+ g_object_set (g_object_get_data(G_OBJECT (cell), "cell_from"), "strikeout_column", col, NULL);
}
static ETableExtras *
@@ -1718,7 +1716,7 @@ message_list_setup_etree (MessageList *m
d(printf ("folder name is '%s'\n", name));
path = mail_config_folder_to_cachename (message_list->folder, "et-expanded-");
- g_object_set_data (((GnomeCanvasItem *) item)->canvas, "freeze-cursor", 1);
+ g_object_set_data (G_OBJECT (((GnomeCanvasItem *) item)->canvas), "freeze-cursor", GINT_TO_POINTER (1));
if (path && g_stat (path, &st) == 0 && st.st_size > 0 && S_ISREG (st.st_mode)) {
/* build based on saved file */
Index: message-list.h
===================================================================
RCS file: /cvs/gnome/evolution/mail/message-list.h,v
retrieving revision 1.92
diff -u -p -r1.92 message-list.h
--- message-list.h 2 Jun 2006 18:12:02 -0000 1.92
+++ message-list.h 22 Sep 2006 15:00:59 -0000
@@ -218,6 +218,7 @@ void message_list_hide_uids (Mess
void message_list_hide_clear (MessageList *ml);
void message_list_set_threaded (MessageList *ml, gboolean threaded);
+void message_list_set_expand_all (MessageList *ml, gboolean threaded);
void message_list_set_threaded_expand_all (MessageList *ml);
void message_list_set_threaded_collapse_all (MessageList *ml);
Index: importers/mail-importer.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/importers/mail-importer.c,v
retrieving revision 1.13
diff -u -p -r1.13 mail-importer.c
--- importers/mail-importer.c 8 Feb 2006 11:51:32 -0000 1.13
+++ importers/mail-importer.c 22 Sep 2006 15:00:59 -0000
@@ -235,7 +235,7 @@ import_mbox_import(struct _mail_msg *mm)
while (camel_mime_parser_step(mp, 0, 0) == CAMEL_MIME_PARSER_STATE_FROM) {
CamelMimeMessage *msg;
const char *tmp;
- int pc;
+ int pc = 0;
guint32 flags = 0;
if (st.st_size > 0)
Index: importers/netscape-importer.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/importers/netscape-importer.c,v
retrieving revision 1.22
diff -u -p -r1.22 netscape-importer.c
--- importers/netscape-importer.c 6 Jan 2006 06:44:15 -0000 1.22
+++ importers/netscape-importer.c 22 Sep 2006 15:00:59 -0000
@@ -627,7 +627,7 @@ netscape_filter_map_folder_to_uri (char
s = g_string_new("mbox:");
g_string_append(s, g_get_home_dir());
- g_string_append(s, "/mail/local#");
+ g_string_append_len(s, "/mail/local#", 12);
while (ptr) {
if ( (ptr2 = strchr (ptr, '/')) == NULL)
Index: importers/pine-importer.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/importers/pine-importer.c,v
retrieving revision 1.18
diff -u -p -r1.18 pine-importer.c
--- importers/pine-importer.c 5 Feb 2006 23:46:26 -0000 1.18
+++ importers/pine-importer.c 22 Sep 2006 15:00:59 -0000
@@ -197,7 +197,7 @@ import_contacts(void)
g_object_unref(primary);
g_object_unref(source_list);
- line = g_string_new("");
+ line = g_string_new(NULL);
g_string_set_size(line, 256);
offset = 0;
while (fgets(line->str+offset, 256, fp)) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
