[evolution-patches] debug removal patches mail/e-util
- From: Not Zed <notzed ximian com>
- To: asdf <evolution-patches lists ximian com>
- Subject: [evolution-patches] debug removal patches mail/e-util
- Date: Tue, 01 Mar 2005 15:01:01 +0800
remove some debug and fix some misc warnings
Index: e-util/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/e-util/ChangeLog,v
retrieving revision 1.528
diff -u -p -r1.528 ChangeLog
--- e-util/ChangeLog 23 Feb 2005 18:56:57 -0000 1.528
+++ e-util/ChangeLog 1 Mar 2005 07:00:39 -0000
@@ -1,3 +1,7 @@
+2005-03-01 Not Zed <NotZed Ximian com>
+
+ * *.c: Remove/disable debug.
+
2005-02-23 Hans Petter Jansson <hpj novell com>
* Makefile.am (eutilinclude_HEADERS)
Index: e-util/e-account.c
===================================================================
RCS file: /cvs/gnome/evolution/e-util/e-account.c,v
retrieving revision 1.13
diff -u -p -r1.13 e-account.c
--- e-util/e-account.c 21 Dec 2004 15:50:38 -0000 1.13
+++ e-util/e-account.c 1 Mar 2005 07:00:39 -0000
@@ -33,6 +33,8 @@
#include <gconf/gconf-client.h>
+#define d(x)
+
enum {
CHANGED,
LAST_SIGNAL
@@ -820,6 +822,7 @@ gboolean e_account_get_bool(EAccount *ea
return *((gboolean *)addr(ea, type));
}
+#if d(!)0
static void
dump_account(EAccount *ea)
{
@@ -830,6 +833,7 @@ dump_account(EAccount *ea)
printf(" ->\n%s\n", xml);
g_free(xml);
}
+#endif
/* TODO: should it return true if it changed? */
void e_account_set_string(EAccount *ea, e_account_item_t type, const char *val)
@@ -840,13 +844,12 @@ void e_account_set_string(EAccount *ea,
g_warning("Trying to set non-writable option account value");
} else {
p = (char **)addr(ea, type);
- printf("Setting string %d: old '%s' new '%s'\n", type, *p, val);
+ d(printf("Setting string %d: old '%s' new '%s'\n", type, *p, val));
if (*p != val
&& (*p == NULL || val == NULL || strcmp(*p, val) != 0)) {
g_free(*p);
*p = g_strdup(val);
-
- dump_account(ea);
+ d(dump_account(ea));
g_signal_emit(ea, signals[CHANGED], 0, type);
}
}
@@ -861,7 +864,7 @@ void e_account_set_int(EAccount *ea, e_a
if (*p != val) {
*p = val;
- dump_account(ea);
+ d(dump_account(ea));
g_signal_emit(ea, signals[CHANGED], 0, type);
}
}
@@ -876,7 +879,7 @@ void e_account_set_bool(EAccount *ea, e_
if (*p != val) {
*p = val;
- dump_account(ea);
+ d(dump_account(ea));
g_signal_emit(ea, signals[CHANGED], 0, type);
}
}
@@ -899,7 +902,7 @@ e_account_writable_option(EAccount *ea,
info = g_hash_table_lookup(ea_option_table, key);
}
- printf("checking writable option '%s' perms=%08x\n", option, info?info->perms:0);
+ d(printf("checking writable option '%s' perms=%08x\n", option, info?info->perms:0));
return info == NULL
|| (info->perms & ea_perms) == 0;
Index: e-util/e-menu.c
===================================================================
RCS file: /cvs/gnome/evolution/e-util/e-menu.c,v
retrieving revision 1.7
diff -u -p -r1.7 e-menu.c
--- e-util/e-menu.c 14 Feb 2005 15:52:12 -0000 1.7
+++ e-util/e-menu.c 1 Mar 2005 07:00:39 -0000
@@ -829,7 +829,7 @@ emph_construct(EPluginHook *eph, EPlugin
menu = emph_construct_menu(eph, node);
if (menu) {
- printf(" plugin adding factory %p\n", klass);
+ d(printf(" plugin adding factory %p\n", klass));
e_menu_class_add_factory(klass, menu->id, emph_menu_factory, menu);
emph->menus = g_slist_append(emph->menus, menu);
}
@@ -857,7 +857,7 @@ emph_finalise(GObject *o)
static void
emph_class_init(EPluginHookClass *klass)
{
- printf("EMenuHook class init %p '%s'\n", klass, g_type_name(((GObjectClass *)klass)->g_type_class.g_type));
+ d(printf("EMenuHook class init %p '%s'\n", klass, g_type_name(((GObjectClass *)klass)->g_type_class.g_type)));
((GObjectClass *)klass)->finalize = emph_finalise;
klass->construct = emph_construct;
Index: e-util/e-plugin-mono.c
===================================================================
RCS file: /cvs/gnome/evolution/e-util/e-plugin-mono.c,v
retrieving revision 1.2
diff -u -p -r1.2 e-plugin-mono.c
--- e-util/e-plugin-mono.c 20 Sep 2004 05:59:54 -0000 1.2
+++ e-util/e-plugin-mono.c 1 Mar 2005 07:00:39 -0000
@@ -11,6 +11,8 @@
#include <mono/metadata/assembly.h>
#include <mono/jit/jit.h>
+#define d(x)
+
static MonoDomain *domain;
/* ********************************************************************** */
@@ -68,7 +70,7 @@ epm_invoke(EPlugin *ep, const char *name
if (epm->handler == NULL
|| (p->klass = mono_class_from_name(mono_assembly_get_image(p->assembly), "", epm->handler)) == NULL) {
- printf("Using static callbacks only");
+ d(printf("Using static callbacks only"));
} else {
p->plugin = mono_object_new(domain, p->klass);
/* could conceivably init with some context too */
@@ -79,7 +81,7 @@ epm_invoke(EPlugin *ep, const char *name
m = g_hash_table_lookup(p->methods, name);
if (m == NULL) {
if (p->klass) {
- printf("looking up method '%s' in class\n", name);
+ d(printf("looking up method '%s' in class\n", name));
/* class method */
d = mono_method_desc_new(name, FALSE);
if (d == NULL) {
@@ -93,7 +95,7 @@ epm_invoke(EPlugin *ep, const char *name
return NULL;
}
} else {
- printf("looking up static method '%s'\n", name);
+ d(printf("looking up static method '%s'\n", name));
/* static method */
d = mono_method_desc_new(name, FALSE);
if (d == NULL) {
@@ -121,7 +123,7 @@ epm_invoke(EPlugin *ep, const char *name
if (res) {
void **p = mono_object_unbox(res);
- printf("mono method returned '%p' %ld\n", *p, (long int)*p);
+ d(printf("mono method returned '%p' %ld\n", *p, (long int)*p));
return *p;
} else
return NULL;
Index: e-util/md5-utils.c
===================================================================
RCS file: /cvs/gnome/evolution/e-util/md5-utils.c,v
retrieving revision 1.4
diff -u -p -r1.4 md5-utils.c
--- e-util/md5-utils.c 2 Jan 2002 20:48:39 -0000 1.4
+++ e-util/md5-utils.c 1 Mar 2005 07:00:39 -0000
@@ -336,8 +336,6 @@ md5_get_digest_from_file (const gchar *f
gint nb_bytes_read;
FILE *fp;
- printf("generating checksum\n");
-
md5_init (&ctx);
fp = fopen(filename, "r");
if (!fp) {
@@ -354,10 +352,4 @@ md5_get_digest_from_file (const gchar *f
md5_final (&ctx, digest);
-
- printf("checksum done\n");
}
-
-
-
-
Index: mail/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3597
diff -u -p -r1.3597 ChangeLog
--- mail/ChangeLog 28 Feb 2005 04:51:26 -0000 1.3597
+++ mail/ChangeLog 1 Mar 2005 07:00:52 -0000
@@ -1,3 +1,30 @@
+2005-03-01 Not Zed <NotZed Ximian com>
+
+ * message-list.c: include atkutil.h
+ (message_list_construct): cast warning.
+
+ * mail-session.c (mail_session_set_interactive): remove unused
+ variable since we can no longer terminate password requests.
+
+ * mail-autofilter.c (em_vfolder_rule_from_address): properly
+ define in header.
+
+ * em-utils.c (emu_get_save_filesel): only define filename in the
+ !gtkfilechooser case.
+
+ * em-mailer-prefs.c (restore_labels_clicked): cast for warning.
+ (em_mailer_prefs_construct): same.
+
+ * em-format-html.c (efh_format_header): remove unused variable.
+
+ * em-account-editor.c (emae_widget_druid_glade): remove unused
+ variable.
+
+ * importers/mail-importer.h: forward-delcare struct
+ _MailComponent.
+
+ * *c: remove/disable various debug.
+
2005-02-24 Not Zed <NotZed Ximian com>
** See bug #72609
Index: mail/e-searching-tokenizer.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/e-searching-tokenizer.c,v
retrieving revision 1.20
diff -u -p -r1.20 e-searching-tokenizer.c
--- mail/e-searching-tokenizer.c 3 Dec 2004 03:38:03 -0000 1.20
+++ mail/e-searching-tokenizer.c 1 Mar 2005 07:00:53 -0000
@@ -571,7 +571,7 @@ output_match(struct _searcher *s, unsign
endtoken = find_token(s, end);
if (starttoken == NULL || endtoken == NULL) {
- printf("Cannot find match history for match %d-%d\n", start, end);
+ d(printf("Cannot find match history for match %d-%d\n", start, end));
return;
}
@@ -669,7 +669,7 @@ push_subpending(struct _searcher *s, int
{
/* This is really an assertion, we just ignore the last pending match instead of crashing though */
if (s->submatchp >= s->words) {
- printf("ERROR: submatch pending stack overflow\n");
+ d(printf("ERROR: submatch pending stack overflow\n"));
s->submatchp = s->words-1;
}
Index: mail/em-account-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-account-editor.c,v
retrieving revision 1.22
diff -u -p -r1.22 em-account-editor.c
--- mail/em-account-editor.c 24 Feb 2005 01:48:15 -0000 1.22
+++ mail/em-account-editor.c 1 Mar 2005 07:00:53 -0000
@@ -525,13 +525,13 @@ emae_auto_detect(EMAccountEditor *emae)
|| (entries = service->provider->extra_conf) == NULL)
return;
- printf("Running auto-detect\n");
+ d(printf("Running auto-detect\n"));
url = emae_account_url(emae, E_ACCOUNT_SOURCE_URL);
camel_provider_auto_detect(service->provider, url, &auto_detected, NULL);
camel_url_free(url);
if (auto_detected == NULL) {
- printf(" no values detected\n");
+ d(printf(" no values detected\n"));
return;
}
@@ -646,8 +646,6 @@ emae_signaturetype_changed(GtkComboBox *
gtk_tree_model_get(model, &iter, 1, &uid, -1);
}
- printf("signaturetype changed: %d uid=%s\n", id, uid?uid:"");
-
e_account_set_string(emae->account, E_ACCOUNT_ID_SIGNATURE, uid);
g_free(uid);
}
@@ -698,7 +696,6 @@ emae_setup_signatures(EMAccountEditor *e
gtk_list_store_append(store, &iter);
gtk_list_store_set(store, &iter, 0, sig->autogen?_("Autogenerated"):sig->name, 1, sig->uid, -1);
- printf("check sig '%s' is ours '%s' = %s\n", sig->uid, current, (current && !strcmp(current, sig->uid))?"yep":"no");
if (current && !strcmp(current, sig->uid))
active = i;
@@ -1918,7 +1915,7 @@ emae_receive_options_extra_item(EConfig
return NULL;
section:
- printf("Building extra section '%s'\n", eitem->path);
+ d(printf("Building extra section '%s'\n", eitem->path));
url = emae_account_url(emae, emae_service_info[service->type].account_uri_key);
item->extra_table = g_hash_table_new(g_str_hash, g_str_equal);
@@ -2225,7 +2222,6 @@ emae_management_page(EConfig *ec, EConfi
static GtkWidget *
emae_widget_druid_glade(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data)
{
- EMAccountEditor *emae = data;
GladeXML *druidxml = glade_xml_new(EVOLUTION_GLADEDIR "/mail-config.glade", item->label, NULL);
GtkWidget *w;
@@ -2351,19 +2347,19 @@ emae_check_complete(EConfig *ec, const c
|| tmp[0] == 0
|| is_email(tmp));
if (!ok)
- printf("identity incomplete\n");
+ d(printf("identity incomplete\n"));
}
if (ok && (pageid == NULL || !strcmp(pageid, "10.receive"))) {
ok = emae_service_complete(emae, &emae->priv->source);
if (!ok)
- printf("receive page incomplete\n");
+ d(printf("receive page incomplete\n"));
}
if (ok && (pageid == NULL || !strcmp(pageid, "30.send"))) {
ok = emae_service_complete(emae, &emae->priv->transport);
if (!ok)
- printf("send page incomplete\n");
+ d(printf("send page incomplete\n"));
}
if (ok && (pageid == NULL || !strcmp(pageid, "40.management"))) {
@@ -2372,7 +2368,7 @@ emae_check_complete(EConfig *ec, const c
&& ((ea = mail_config_get_account_by_name(tmp)) == NULL
|| ea == emae->original);
if (!ok)
- printf("management page incomplete\n");
+ d(printf("management page incomplete\n"));
}
/* We use the page-check of various pages to 'prepare' or
@@ -2453,12 +2449,12 @@ emae_commit(EConfig *ec, GSList *items,
/* the mail-config*acconts* api needs a lot of work */
if (emae->original) {
- printf("Committing account '%s'\n", e_account_get_string(emae->account, E_ACCOUNT_NAME));
+ d(printf("Committing account '%s'\n", e_account_get_string(emae->account, E_ACCOUNT_NAME)));
e_account_import(emae->original, emae->account);
account = emae->original;
e_account_list_change(accounts, account);
} else {
- printf("Adding new account '%s'\n", e_account_get_string(emae->account, E_ACCOUNT_NAME));
+ d(printf("Adding new account '%s'\n", e_account_get_string(emae->account, E_ACCOUNT_NAME)));
e_account_list_add(accounts, emae->account);
account = emae->account;
Index: mail/em-format-html-display.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-format-html-display.c,v
retrieving revision 1.62
diff -u -p -r1.62 em-format-html-display.c
--- mail/em-format-html-display.c 8 Feb 2005 03:50:38 -0000 1.62
+++ mail/em-format-html-display.c 1 Mar 2005 07:00:54 -0000
@@ -1434,8 +1434,8 @@ efhd_bonobo_object(EMFormatHTML *efh, Gt
wrapper = camel_medium_get_content_object((CamelMedium *)pobject->part);
if (FALSE && !g_ascii_strncasecmp (eb->type, "text/", 5)) {
/* do charset conversion, etc */
- printf ("performing charset conversion for %s component\n", eb->type);
- em_format_format_text ((EMFormat *) efh, (CamelStream *) cstream, wrapper);
+ d(printf("performing charset conversion for %s component\n", eb->type));
+ em_format_format_text((EMFormat *)efh, (CamelStream *)cstream, wrapper);
} else {
camel_data_wrapper_decode_to_stream (wrapper, (CamelStream *) cstream);
}
Index: mail/em-format-html.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-format-html.c,v
retrieving revision 1.74
diff -u -p -r1.74 em-format-html.c
--- mail/em-format-html.c 24 Feb 2005 17:18:37 -0000 1.74
+++ mail/em-format-html.c 1 Mar 2005 07:00:55 -0000
@@ -562,7 +562,7 @@ efh_object_requested(GtkHTML *html, GtkH
res = pobject->func(efh, eb, pobject);
e_dlist_addhead(&efh->pending_object_list, (EDListNode *)pobject);
} else {
- printf("HTML Includes reference to unknown object '%s'\n", eb->classid);
+ d(printf("HTML Includes reference to unknown object '%s'\n", eb->classid));
}
return res;
@@ -1484,7 +1484,6 @@ efh_format_address (GString *out, struct
static void
efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct _camel_header_raw *header, guint32 flags, const char *charset)
{
- CamelMimeMessage *msg = (CamelMimeMessage *)part;
EMFormatHTML *efh = (EMFormatHTML *)emf;
char *name, *value = NULL, *p;
const char *label, *txt;
Index: mail/em-icon-stream.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-icon-stream.c,v
retrieving revision 1.5
diff -u -p -r1.5 em-icon-stream.c
--- mail/em-icon-stream.c 3 Dec 2004 03:38:03 -0000 1.5
+++ mail/em-icon-stream.c 1 Mar 2005 07:00:55 -0000
@@ -168,7 +168,7 @@ emis_sync_close(CamelStream *stream)
pixbuf = gdk_pixbuf_loader_get_pixbuf(emis->loader);
if (pixbuf == NULL) {
- printf("couldn't get pixbuf from loader\n");
+ d(printf("couldn't get pixbuf from loader\n"));
emis_cleanup(emis);
return -1;
}
Index: mail/em-mailer-prefs.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-mailer-prefs.c,v
retrieving revision 1.28
diff -u -p -r1.28 em-mailer-prefs.c
--- mail/em-mailer-prefs.c 25 Jan 2005 10:30:17 -0000 1.28
+++ mail/em-mailer-prefs.c 1 Mar 2005 07:00:55 -0000
@@ -248,7 +248,7 @@ restore_labels_clicked (GtkWidget *widge
for (i = 0; i < 5; i++) {
gtk_entry_set_text (prefs->labels[i].name, _(label_defaults[i].name));
colorpicker_set_color (prefs->labels[i].color, label_defaults[i].colour);
- atk_object_set_name (gtk_widget_get_accessible (prefs->labels[i].color), _(label_defaults[i].name));
+ atk_object_set_name(gtk_widget_get_accessible((GtkWidget *)prefs->labels[i].color), _(label_defaults[i].name));
}
}
@@ -884,7 +884,7 @@ em_mailer_prefs_construct (EMMailerPrefs
colorpicker_set_color (prefs->labels[i].color, label->colour);
g_signal_connect (prefs->labels[i].color, "color-set", G_CALLBACK (label_color_set), prefs);
- atk_object_set_name (gtk_widget_get_accessible (prefs->labels[i].color), label->name);
+ atk_object_set_name(gtk_widget_get_accessible((GtkWidget *)prefs->labels[i].color), label->name);
i++;
list = list->next;
Index: mail/em-menu.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-menu.c,v
retrieving revision 1.7
diff -u -p -r1.7 em-menu.c
--- mail/em-menu.c 5 Jan 2005 07:55:26 -0000 1.7
+++ mail/em-menu.c 1 Mar 2005 07:00:55 -0000
@@ -100,8 +100,6 @@ emp_target_free(EMenu *ep, EMenuTarget *
static void
emp_class_init(GObjectClass *klass)
{
- printf("em menu class init\n");
-
klass->finalize = emp_finalise;
((EMenuClass *)klass)->target_free = emp_target_free;
Index: mail/em-utils.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-utils.c,v
retrieving revision 1.57
diff -u -p -r1.57 em-utils.c
--- mail/em-utils.c 23 Feb 2005 06:14:21 -0000 1.57
+++ mail/em-utils.c 1 Mar 2005 07:00:56 -0000
@@ -304,7 +304,7 @@ emu_get_save_filesel (GtkWidget *parent,
{
GtkWidget *filesel;
const char *dir;
- char *realname, *filename, *gdir;
+ char *realname, *gdir;
GConfClient *gconf;
#ifdef USE_GTKFILECHOOSER
@@ -316,6 +316,8 @@ emu_get_save_filesel (GtkWidget *parent,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (filesel), GTK_RESPONSE_OK);
#else
+ char *filename;
+
filesel = gtk_file_selection_new (title);
#endif
Index: mail/mail-autofilter.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-autofilter.c,v
retrieving revision 1.53
diff -u -p -r1.53 mail-autofilter.c
--- mail/mail-autofilter.c 18 Feb 2005 16:43:55 -0000 1.53
+++ mail/mail-autofilter.c 1 Mar 2005 07:00:56 -0000
@@ -52,6 +52,7 @@
#include "em-filter-editor.h"
#include "filter/filter-option.h"
+#define d(x)
static void
rule_match_recipients (RuleContext *context, FilterRule *rule, CamelInternetAddress *iaddr)
@@ -385,7 +386,7 @@ mail_filter_rename_uri(CamelStore *store
changed = rule_context_rename_uri((RuleContext *)fc, eolduri, enewuri, g_str_equal);
if (changed) {
- printf("Folder rename '%s' -> '%s' changed filters, resaving\n", olduri, newuri);
+ d(printf("Folder rename '%s' -> '%s' changed filters, resaving\n", olduri, newuri));
if (rule_context_save((RuleContext *)fc, user) == -1)
g_warning("Could not write out changed filter rules\n");
rule_context_free_uri_list((RuleContext *)fc, changed);
@@ -431,7 +432,7 @@ mail_filter_delete_uri(CamelStore *store
g_string_free(s, TRUE);
gtk_widget_show(dialog);
- printf("Folder deleterename '%s' changed filters, resaving\n", euri);
+ d(printf("Folder delete/rename '%s' changed filters, resaving\n", euri));
if (rule_context_save ((RuleContext *) fc, user) == -1)
g_warning ("Could not write out changed filter rules\n");
rule_context_free_uri_list ((RuleContext *) fc, deleted);
Index: mail/mail-autofilter.h
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-autofilter.h,v
retrieving revision 1.12
diff -u -p -r1.12 mail-autofilter.h
--- mail/mail-autofilter.h 17 Jun 2004 07:34:49 -0000 1.12
+++ mail/mail-autofilter.h 1 Mar 2005 07:00:56 -0000
@@ -39,9 +39,10 @@ enum {
FilterRule *em_vfolder_rule_from_message(EMVFolderContext *context, CamelMimeMessage *msg, int flags, const char *source);
FilterRule *filter_rule_from_message(EMFilterContext *context, CamelMimeMessage *msg, int flags);
+FilterRule *em_vfolder_rule_from_address(EMVFolderContext *context, CamelInternetAddress *addr, int flags, const char *source);
/* easiest place to put this */
-void filter_gui_add_from_message (CamelMimeMessage *msg, const char *source, int flags);
+void filter_gui_add_from_message(CamelMimeMessage *msg, const char *source, int flags);
/* Also easiest place for these, we should really share a global rule context for this stuff ... */
void mail_filter_rename_uri(CamelStore *store, const char *olduri, const char *newuri);
Index: mail/mail-session.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-session.c,v
retrieving revision 1.102
diff -u -p -r1.102 mail-session.c
--- mail/mail-session.c 23 Feb 2005 18:56:58 -0000 1.102
+++ mail/mail-session.c 1 Mar 2005 07:00:56 -0000
@@ -667,7 +667,6 @@ mail_session_set_interactive (gboolean i
MAIL_SESSION (session)->interactive = interactive;
if (!interactive) {
- struct _pass_msg *pm;
struct _user_message_msg *um;
d(printf ("Gone non-interactive, checking for outstanding interactive tasks\n"));
Index: mail/message-list.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/message-list.c,v
retrieving revision 1.411
diff -u -p -r1.411 message-list.c
--- mail/message-list.c 23 Feb 2005 06:11:20 -0000 1.411
+++ mail/message-list.c 1 Mar 2005 07:00:57 -0000
@@ -40,6 +40,7 @@
#include <gtk/gtkmain.h>
#include <gtk/gtkinvisible.h>
#include <libgnome/gnome-i18n.h>
+#include <atk/atkutil.h>
#include <gal/util/e-util.h>
#include <gal/widgets/e-gui-utils.h>
@@ -1529,11 +1530,11 @@ ml_selection_get(GtkWidget *widget, GtkS
if (info & 2) {
/* text/plain */
- printf("setting text/plain selection for uids\n");
+ d(printf("setting text/plain selection for uids\n"));
em_utils_selection_set_mailbox(data, selection->folder, selection->uids);
} else {
/* x-uid-list */
- printf("setting x-uid-list selection for uids\n");
+ d(printf("setting x-uid-list selection for uids\n"));
em_utils_selection_set_uidlist(data, selection->folder_uri, selection->uids);
}
}
@@ -1552,8 +1553,7 @@ static void
ml_selection_received(GtkWidget *widget, GtkSelectionData *data, guint time, MessageList *ml)
{
if (data->target != gdk_atom_intern ("x-uid-list", FALSE)) {
- printf("Unknown selection received by message-list\n");
-
+ d(printf("Unknown selection received by message-list\n"));
return;
}
@@ -1771,12 +1771,12 @@ ml_tree_drag_motion(ETree *tree, GdkDrag
for (targets = context->targets; targets; targets = targets->next) {
int i;
- printf("atom drop '%s'\n", gdk_atom_name(targets->data));
+ d(printf("atom drop '%s'\n", gdk_atom_name(targets->data)));
for (i=0;i<sizeof(ml_drag_info)/sizeof(ml_drag_info[0]);i++)
if (targets->data == (void *)ml_drag_info[i].atom)
actions |= ml_drag_info[i].actions;
}
- printf("\n");
+ d(printf("\n"));
actions &= context->actions;
action = context->suggested_action;
@@ -2036,9 +2036,9 @@ message_list_construct (MessageList *mes
if (!construct_failed)
e_tree_root_node_set_visible (message_list->tree, FALSE);
- if (atk_get_root () != NULL) {
- a11y = gtk_widget_get_accessible (message_list->tree);
- atk_object_set_name (a11y, _("Message List"));
+ if (atk_get_root() != NULL) {
+ a11y = gtk_widget_get_accessible((GtkWidget *)message_list->tree);
+ atk_object_set_name(a11y, _("Message List"));
}
g_signal_connect((message_list->tree), "cursor_activated",
Index: mail/importers/mail-importer.h
===================================================================
RCS file: /cvs/gnome/evolution/mail/importers/mail-importer.h,v
retrieving revision 1.5
diff -u -p -r1.5 mail-importer.h
--- mail/importers/mail-importer.h 31 Jan 2005 21:46:52 -0000 1.5
+++ mail/importers/mail-importer.h 1 Mar 2005 07:00:57 -0000
@@ -31,6 +31,8 @@ struct _MailImporter {
gboolean frozen; /* Is folder frozen? */
};
+struct _MailComponent;
+
void mail_importer_init (struct _MailComponent *mc);
void mail_importer_uninit (void);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]