GNOME.org
 

[evolution] Fix even more compiler warnings and disable one for format strings

commit 84c55f4e983c4458a08f9bd19fe63b3fd7af2fa7
Author: Milan Crha <mcrha redhat com>
Date:   Fri Jun 5 14:48:29 2009 +0200

    Fix even more compiler warnings and disable one for format strings
---
 addressbook/conduit/address-conduit.c              |   10 ++++----
 calendar/conduits/calendar/calendar-conduit.c      |    7 +++--
 calendar/conduits/memo/memo-conduit.c              |    7 +++--
 calendar/conduits/todo/todo-conduit.c              |    7 +++--
 calendar/gui/e-cal-model-tasks.c                   |    2 +-
 calendar/gui/print.c                               |    6 +---
 configure.ac                                       |    3 +-
 mail/em-account-editor.c                           |   14 ++++++------
 mail/em-format-quote.c                             |    7 ++---
 mail/em-inline-filter.c                            |   16 +++++++-------
 mail/em-stripsig-filter.c                          |   12 +++++-----
 .../apps-evolution-external-editor.schemas.in      |    2 +
 plugins/external-editor/external-editor.c          |    4 +-
 plugins/folder-unsubscribe/folder-unsubscribe.c    |    3 +-
 plugins/hula-account-setup/camel-hula-listener.c   |    4 +-
 plugins/ipod-sync/evolution-ipod-sync.c            |   22 +++++++++----------
 plugins/ipod-sync/ipod.c                           |    4 +-
 plugins/vcard-inline/Makefile.am                   |    2 +
 shell/e-shell-window.c                             |    4 +-
 19 files changed, 70 insertions(+), 66 deletions(-)

diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c
index ed17e40..15cbe75 100644
--- a/addressbook/conduit/address-conduit.c
+++ b/addressbook/conduit/address-conduit.c
@@ -29,7 +29,6 @@
 
 #define G_LOG_DOMAIN "eaddrconduit"
 
-#include <bonobo.h>
 #include <libxml/parser.h>
 #include <pi-source.h>
 #include <pi-socket.h>
@@ -471,7 +470,7 @@ addrconduit_load_configuration (guint32 pilot_id)
 	g_assert (c != NULL);
 
 	c->pilot_id = pilot_id;
-	management = gnome_pilot_conduit_management_new ("e_address_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);
+	management = gnome_pilot_conduit_management_new ((gchar*)"e_address_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);
 	g_object_ref_sink (management);
 	config = gnome_pilot_conduit_config_new (management, pilot_id);
 	g_object_ref_sink (config);
@@ -1559,14 +1558,15 @@ addressbook_authenticate (EBook *book,
 	e_uri_free (e_uri);
 
 	passwd = e_passwords_get_password (component_name, pass_key);
-	if (passwd)
-		passwd = "";
+	if (!passwd)
+		passwd = g_strdup ("");
 
 	if (book)
 		if (!e_book_authenticate_user (book, user, passwd, auth, NULL))
 			LOG (g_warning ("Authentication failed"));
 	g_free (pass_key);
 	g_free (str_uri);
+	g_free (passwd);
 
 	return;
 }
@@ -2183,7 +2183,7 @@ conduit_get_gpilot_conduit (guint32 pilot_id)
 
 	LOG (g_message ( "in address's conduit_get_gpilot_conduit\n" ));
 
-	retval = gnome_pilot_conduit_sync_abs_new ("AddressDB", 0x61646472);
+	retval = gnome_pilot_conduit_sync_abs_new ((gchar*)"AddressDB", 0x61646472);
 	g_assert (retval != NULL);
 
 	ctxt = e_addr_context_new (pilot_id);
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
index e899ad2..04f7c42 100644
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ b/calendar/conduits/calendar/calendar-conduit.c
@@ -123,7 +123,7 @@ calconduit_load_configuration (guint32 pilot_id)
 	c->pilot_id = pilot_id;
 
 	/* Sync Type */
-	management = gnome_pilot_conduit_management_new ("e_calendar_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);
+	management = gnome_pilot_conduit_management_new ((gchar*)"e_calendar_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);
 	g_object_ref_sink (management);
 	config = gnome_pilot_conduit_config_new (management, pilot_id);
 	g_object_ref_sink (config);
@@ -400,7 +400,8 @@ print_local (ECalLocalRecord *local)
 		return buff;
 	}
 
-	return "";
+	strcpy (buff, "");
+	return buff;
 }
 
 static gchar *print_remote (GnomePilotRecord *remote)
@@ -2104,7 +2105,7 @@ conduit_get_gpilot_conduit (guint32 pilot_id)
 
 	LOG (g_message ( "in calendar's conduit_get_gpilot_conduit\n" ));
 
-	retval = gnome_pilot_conduit_sync_abs_new ("DatebookDB", 0x64617465);
+	retval = gnome_pilot_conduit_sync_abs_new ((gchar*)"DatebookDB", 0x64617465);
 	g_assert (retval != NULL);
 
 	ctxt = e_calendar_context_new (pilot_id);
diff --git a/calendar/conduits/memo/memo-conduit.c b/calendar/conduits/memo/memo-conduit.c
index b22216e..8fae261 100644
--- a/calendar/conduits/memo/memo-conduit.c
+++ b/calendar/conduits/memo/memo-conduit.c
@@ -126,7 +126,7 @@ memoconduit_load_configuration (guint32 pilot_id)
 
 	c->pilot_id = pilot_id;
 
-	management = gnome_pilot_conduit_management_new ("e_memo_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);
+	management = gnome_pilot_conduit_management_new ((gchar*)"e_memo_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);
 	g_object_ref_sink (management);
 	config = gnome_pilot_conduit_config_new (management, pilot_id);
 	g_object_ref_sink (config);
@@ -314,7 +314,8 @@ print_local (EMemoLocalRecord *local)
 		return buff;
 	}
 
-	return "";
+	strcpy (buff, "");
+	return buff;
 }
 
 static gchar *print_remote (GnomePilotRecord *remote)
@@ -1382,7 +1383,7 @@ conduit_get_gpilot_conduit (guint32 pilot_id)
 
 	LOG (g_message ( "in memo's conduit_get_gpilot_conduit\n" ));
 
-	retval = gnome_pilot_conduit_sync_abs_new ("MemoDB", 0x6D656D6F);
+	retval = gnome_pilot_conduit_sync_abs_new ((gchar*)"MemoDB", 0x6D656D6F);
 	g_assert (retval != NULL);
 
 	ctxt = e_memo_context_new (pilot_id);
diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c
index 7ff2161..b5bfc5b 100644
--- a/calendar/conduits/todo/todo-conduit.c
+++ b/calendar/conduits/todo/todo-conduit.c
@@ -128,7 +128,7 @@ todoconduit_load_configuration (guint32 pilot_id)
 
 	c->pilot_id = pilot_id;
 
-	management = gnome_pilot_conduit_management_new ("e_todo_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);
+	management = gnome_pilot_conduit_management_new ((gchar*)"e_todo_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);
 	g_object_ref_sink (management);
 	config = gnome_pilot_conduit_config_new (management, pilot_id);
 	g_object_ref_sink (config);
@@ -385,7 +385,8 @@ print_local (EToDoLocalRecord *local)
 		return buff;
 	}
 
-	return "";
+	strcpy (buff, "");
+	return buff;
 }
 
 static gchar *print_remote (GnomePilotRecord *remote)
@@ -1572,7 +1573,7 @@ conduit_get_gpilot_conduit (guint32 pilot_id)
 
 	LOG (g_message ( "in todo's conduit_get_gpilot_conduit\n" ));
 
-	retval = gnome_pilot_conduit_sync_abs_new ("ToDoDB", 0x746F646F);
+	retval = gnome_pilot_conduit_sync_abs_new ((gchar*)"ToDoDB", 0x746F646F);
 	g_assert (retval != NULL);
 
 	ctxt = e_todo_context_new (pilot_id);
diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c
index 63749c5..63bc37a 100644
--- a/calendar/gui/e-cal-model-tasks.c
+++ b/calendar/gui/e-cal-model-tasks.c
@@ -329,7 +329,7 @@ get_priority (ECalModelComponent *comp_data)
 
 	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_PRIORITY_PROPERTY);
 	if (prop)
-		return e_cal_util_priority_to_string (icalproperty_get_priority (prop));
+		return (gpointer) e_cal_util_priority_to_string (icalproperty_get_priority (prop));
 
 	return (gpointer) "";
 }
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index 6931474..eced381 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -2587,11 +2587,9 @@ print_comp_draw_real (GtkPrintOperation *operation,
 		/* Priority */
 		e_cal_component_get_priority (comp, &priority);
 		if (priority && *priority >= 0) {
-			gchar *priority_string, *pri_text;
+			gchar *pri_text;
 
-			priority_string = e_cal_util_priority_to_string (*priority);
-
-			pri_text = g_strdup_printf (_("Priority: %s"), priority_string);
+			pri_text = g_strdup_printf (_("Priority: %s"), e_cal_util_priority_to_string (*priority));
 			top = bound_text (context, font, pri_text, -1,
 					  0.0, top, width, height, FALSE, &page_start, &pages);
 			top += get_font_size (font) - 6;
diff --git a/configure.ac b/configure.ac
index a4d35b0..2fa56ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,7 +58,7 @@ AS_COMPILER_FLAGS(WARNING_FLAGS,
 	-Wno-unused-parameter
 	-Wdeclaration-after-statement
 	-Werror-implicit-function-declaration
-	-Wformat-nonliteral -Wformat-security -Winit-self
+	-Wformat-security -Winit-self
 	-Wmissing-declarations -Wmissing-include-dirs
 	-Wmissing-noreturn -Wnested-externs -Wpointer-arith
 	-Wredundant-decls -Wundef -Wwrite-strings")
@@ -69,6 +69,7 @@ AC_SUBST(WARNING_FLAGS)
 #
 #	-Wmissing-format-attribute
 #	-Wshadow
+#	-Wformat-nonliteral
 
 CFLAGS="$CFLAGS $WARNING_FLAGS"
 
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index 1f0fdb8..bce0bbb 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -1421,7 +1421,7 @@ emae_refresh_providers(EMAccountEditor *emae, EMAccountEditorService *service)
 			current[len] = 0;
 		}
 	} else {
-		current = "imap";
+		current = (gchar*)"imap";
 	}
 
 	store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_POINTER);
@@ -2257,7 +2257,7 @@ section:
 		case CAMEL_PROVIDER_CONF_CHECKBOX:
 			w = emae_option_toggle(service, url, entries[i].text, entries[i].name, atoi(entries[i].value));
 			gtk_table_attach((GtkTable *)parent, w, 0, 2, row, row+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);
-			g_hash_table_insert(extra, entries[i].name, w);
+			g_hash_table_insert(extra, (gpointer)entries[i].name, w);
 			if (depw)
 				depl = g_slist_prepend(depl, w);
 			row++;
@@ -2278,7 +2278,7 @@ section:
 			}
 			row++;
 			/* FIXME: this is another hack for exchange/groupwise connector */
-			g_hash_table_insert(item->extra_table, entries[i].name, w);
+			g_hash_table_insert(item->extra_table, (gpointer)entries[i].name, w);
 			break;
 		case CAMEL_PROVIDER_CONF_CHECKSPIN:
 			w = emae_option_checkspin(service, url, entries[i].name, entries[i].text, entries[i].value);
@@ -3053,7 +3053,7 @@ em_account_editor_construct(EMAccountEditor *emae, EAccount *account, em_account
 
 		for (i=0;entries && entries[i].type != CAMEL_PROVIDER_CONF_END;i++) {
 			struct _receive_options_item *item;
-			gchar *name = entries[i].name;
+			const gchar *name = entries[i].name;
 			gint myindex = index;
 
 			if (entries[i].type != CAMEL_PROVIDER_CONF_SECTION_START
@@ -3068,7 +3068,7 @@ em_account_editor_construct(EMAccountEditor *emae, EAccount *account, em_account
 			item = g_malloc0(sizeof(*item));
 			item->item.type = E_CONFIG_SECTION_TABLE;
 			item->item.path = g_strdup_printf("20.receive_options/%02d.%s", myindex, name?name:"unnamed");
-			item->item.label = entries[i].text;
+			item->item.label = g_strdup (entries[i].text);
 
 			l = g_slist_prepend(l, item);
 
@@ -3076,12 +3076,12 @@ em_account_editor_construct(EMAccountEditor *emae, EAccount *account, em_account
 			item->item.type = E_CONFIG_ITEM_TABLE;
 			item->item.path = g_strdup_printf("20.receive_options/%02d.%s/80.camelitem", myindex, name?name:"unnamed");
 			item->item.factory = emae_receive_options_extra_item;
-			item->item.user_data = entries[i].name;
+			item->item.user_data = g_strdup (entries[i].name);
 
 			l = g_slist_prepend(l, item);
 
 			index += 10;
-			g_hash_table_insert(have, entries[i].name, have);
+			g_hash_table_insert(have, (gpointer)entries[i].name, have);
 		}
 	}
 	g_hash_table_destroy(have);
diff --git a/mail/em-format-quote.c b/mail/em-format-quote.c
index a61c3f2..af8616a 100644
--- a/mail/em-format-quote.c
+++ b/mail/em-format-quote.c
@@ -174,7 +174,7 @@ emfq_format_error(EMFormat *emf, CamelStream *stream, const gchar *txt)
 static void
 emfq_format_text_header (EMFormatQuote *emfq, CamelStream *stream, const gchar *label, const gchar *value, guint32 flags, gint is_html)
 {
-	const gchar *fmt, *html;
+	const gchar *html;
 	gchar *mhtml = NULL;
 
 	if (value == NULL)
@@ -189,11 +189,10 @@ emfq_format_text_header (EMFormatQuote *emfq, CamelStream *stream, const gchar *
 		html = value;
 
 	if (flags & EM_FORMAT_HEADER_BOLD)
-		fmt = "<b>%s</b>: %s<br>";
+		camel_stream_printf (stream, "<b>%s</b>: %s<br>", label, html);
 	else
-		fmt = "%s: %s<br>";
+		camel_stream_printf (stream, "%s: %s<br>", label, html);
 
-	camel_stream_printf (stream, fmt, label, html);
 	g_free (mhtml);
 }
 
diff --git a/mail/em-inline-filter.c b/mail/em-inline-filter.c
index 71d16e9..19e3f26 100644
--- a/mail/em-inline-filter.c
+++ b/mail/em-inline-filter.c
@@ -39,8 +39,8 @@ static void em_inline_filter_class_init (EMInlineFilterClass *klass);
 static void em_inline_filter_init (CamelObject *object);
 static void em_inline_filter_finalize (CamelObject *object);
 
-static void emif_filter(CamelMimeFilter *f, gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace);
-static void emif_complete(CamelMimeFilter *f, gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace);
+static void emif_filter(CamelMimeFilter *f, const gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace);
+static void emif_complete(CamelMimeFilter *f, const gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace);
 static void emif_reset(CamelMimeFilter *f);
 
 static CamelMimeFilterClass *parent_class = NULL;
@@ -337,21 +337,21 @@ emif_scan(CamelMimeFilter *f, gchar *in, gsize len, gint final)
 }
 
 static void
-emif_filter(CamelMimeFilter *f, gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace)
+emif_filter(CamelMimeFilter *f, const gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace)
 {
-	emif_scan(f, in, len, FALSE);
+	emif_scan(f, (gchar*)in, len, FALSE);
 
-	*out = in;
+	*out = (gchar*)in;
 	*outlen = len;
 	*outprespace = prespace;
 }
 
 static void
-emif_complete(CamelMimeFilter *f, gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace)
+emif_complete(CamelMimeFilter *f, const gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace)
 {
-	emif_scan(f, in, len, TRUE);
+	emif_scan(f, (gchar*)in, len, TRUE);
 
-	*out = in;
+	*out = (gchar*)in;
 	*outlen = len;
 	*outprespace = prespace;
 }
diff --git a/mail/em-stripsig-filter.c b/mail/em-stripsig-filter.c
index 6540002..f4097a1 100644
--- a/mail/em-stripsig-filter.c
+++ b/mail/em-stripsig-filter.c
@@ -34,9 +34,9 @@
 static void em_stripsig_filter_class_init (EMStripSigFilterClass *klass);
 static void em_stripsig_filter_init (EMStripSigFilter *filter, EMStripSigFilterClass *klass);
 
-static void filter_filter (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace,
+static void filter_filter (CamelMimeFilter *filter, const gchar *in, gsize len, gsize prespace,
 			   gchar **out, gsize *outlen, gsize *outprespace);
-static void filter_complete (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace,
+static void filter_complete (CamelMimeFilter *filter, const gchar *in, gsize len, gsize prespace,
 			     gchar **out, gsize *outlen, gsize *outprespace);
 static void filter_reset (CamelMimeFilter *filter);
 
@@ -83,7 +83,7 @@ em_stripsig_filter_init (EMStripSigFilter *filter, EMStripSigFilterClass *klass)
 }
 
 static void
-strip_signature (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace,
+strip_signature (CamelMimeFilter *filter, const gchar *in, gsize len, gsize prespace,
 		 gchar **out, gsize *outlen, gsize *outprespace, gint flush)
 {
 	EMStripSigFilter *stripsig = (EMStripSigFilter *) filter;
@@ -126,20 +126,20 @@ strip_signature (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace,
 	else if (!start)
 		inptr = inend;
 
-	*out = in;
+	*out = (gchar*)in;
 	*outlen = inptr - in;
 	*outprespace = prespace;
 }
 
 static void
-filter_filter (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace,
+filter_filter (CamelMimeFilter *filter, const gchar *in, gsize len, gsize prespace,
 	       gchar **out, gsize *outlen, gsize *outprespace)
 {
 	strip_signature (filter, in, len, prespace, out, outlen, outprespace, FALSE);
 }
 
 static void
-filter_complete (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace,
+filter_complete (CamelMimeFilter *filter, const gchar *in, gsize len, gsize prespace,
 		 gchar **out, gsize *outlen, gsize *outprespace)
 {
 	strip_signature (filter, in, len, prespace, out, outlen, outprespace, TRUE);
diff --git a/plugins/external-editor/apps-evolution-external-editor.schemas.in b/plugins/external-editor/apps-evolution-external-editor.schemas.in
index 38beceb..0f7db30 100644
--- a/plugins/external-editor/apps-evolution-external-editor.schemas.in
+++ b/plugins/external-editor/apps-evolution-external-editor.schemas.in
@@ -10,7 +10,9 @@
         <short>Default External Editor</short>
         <long>The default command that must be used as the editor.</long>
       </locale>
+   </schema>
 
+   <schema>
       <key>/schemas/apps/evolution/eplugin/external-editor/launch-on-key-press</key>
       <applyto>/apps/evolution/eplugin/external-editor/launch-on-key-press</applyto>
       <owner>evolution-mail</owner>
diff --git a/plugins/external-editor/external-editor.c b/plugins/external-editor/external-editor.c
index 5d8ae3b..a7f06b6 100644
--- a/plugins/external-editor/external-editor.c
+++ b/plugins/external-editor/external-editor.c
@@ -226,7 +226,7 @@ async_external_editor (EMsgComposer *composer)
 	} else {
 		g_warning ("Temporary file fd is null");
 		g_idle_add ((GSourceFunc) run_error_dialog,
-			    "org.gnome.evolution.plugins.external-editor:no-temp-file");
+			    (gpointer)"org.gnome.evolution.plugins.external-editor:no-temp-file");
 		g_idle_add ((GSourceFunc) enable_composer, composer);
 		return;
 	}
@@ -248,7 +248,7 @@ async_external_editor (EMsgComposer *composer)
 	{
 		g_warning ("Unable to launch %s: ", editor_cmd_line);
 		g_idle_add ((GSourceFunc) run_error_dialog,
-			    "org.gnome.evolution.plugins.external-editor:editor-not-launchable");
+			    (gpointer)"org.gnome.evolution.plugins.external-editor:editor-not-launchable");
 		g_idle_add ((GSourceFunc) enable_composer, composer);
 
 		g_free (filename);
diff --git a/plugins/folder-unsubscribe/folder-unsubscribe.c b/plugins/folder-unsubscribe/folder-unsubscribe.c
index 1d5e4fb..7005ac7 100644
--- a/plugins/folder-unsubscribe/folder-unsubscribe.c
+++ b/plugins/folder-unsubscribe/folder-unsubscribe.c
@@ -56,10 +56,11 @@ folder_unsubscribe_desc (struct _folder_unsub_t *msg)
 		_("Unsubscribing from folder \"%s\""), msg->uri);
 }
 
+extern CamelSession *session;
+
 static void
 folder_unsubscribe_exec (struct _folder_unsub_t *msg)
 {
-	extern CamelSession *session;
 	const gchar *path = NULL;
 	CamelStore *store;
 	CamelURL *url;
diff --git a/plugins/hula-account-setup/camel-hula-listener.c b/plugins/hula-account-setup/camel-hula-listener.c
index 818c6a5..04fa460 100644
--- a/plugins/hula-account-setup/camel-hula-listener.c
+++ b/plugins/hula-account-setup/camel-hula-listener.c
@@ -178,7 +178,7 @@ add_esource (const gchar *conf_key, const gchar *group_name,  const gchar *sourc
         GConfClient *client;
 	GSList *ids, *temp;
 	gboolean result;
-	gchar *source_selection_key;
+	const gchar *source_selection_key;
 	gchar *relative_uri;
 	const gchar *cal_port = "8081";
 	/* const gchar *use_ssl = ""; */
@@ -245,7 +245,7 @@ remove_esource (const gchar *conf_key, const gchar *group_name, gchar * source_n
 	GConfClient* client;
 	GSList *ids;
 	GSList *node_tobe_deleted;
-	gchar *source_selection_key;
+	const gchar *source_selection_key;
 
         client = gconf_client_get_default();
         list = e_source_list_new_for_gconf (client, conf_key);
diff --git a/plugins/ipod-sync/evolution-ipod-sync.c b/plugins/ipod-sync/evolution-ipod-sync.c
index 11df397..a60bd2d 100644
--- a/plugins/ipod-sync/evolution-ipod-sync.c
+++ b/plugins/ipod-sync/evolution-ipod-sync.c
@@ -45,18 +45,17 @@ ipod_check_status (gboolean silent)
 	{
 		if (!silent) {
 			GtkWidget *message;
-			gchar *msg1, *msg2;
+			gchar *msg1;
 			msg1 = g_strdup_printf("<span weight=\"bold\" size=\"larger\">%s</span>\n\n", _("Hardware Abstraction Layer not loaded"));
-			msg2 = g_strdup_printf("%s%s", msg1, _("The \"hald\" service is required but not currently "
-								"running. Please enable the service and rerun this "
-								"program, or contact your system administrator.") );
 
-			message = gtk_message_dialog_new_with_markup (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, msg2);
+			message = gtk_message_dialog_new_with_markup (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
+				"%s%s", msg1, _("The \"hald\" service is required but not currently "
+						"running. Please enable the service and rerun this "
+						"program, or contact your system administrator."));
 
 			gtk_dialog_run (GTK_DIALOG (message));
 
 			g_free(msg1);
-			g_free(msg2);
 			gtk_widget_destroy (message);
 		}
 		return FALSE;
@@ -79,18 +78,17 @@ ipod_check_status (gboolean silent)
 		 * the iPod when we finish syncing. */
 		if (!silent) {
 			GtkWidget *message;
-			gchar *msg1, *msg2;
+			gchar *msg1;
 			msg1 = g_strdup_printf("<span weight=\"bold\" size=\"larger\">%s</span>\n\n", _("Search for an iPod failed"));
-			msg2 = g_strdup_printf("%s%s", msg1, _("Evolution could not find an iPod to synchronize with. "
-								"Either the iPod is not connected to the system or it "
-								"is not powered on."));
 
-			message = gtk_message_dialog_new_with_markup (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, msg2);
+			message = gtk_message_dialog_new_with_markup (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
+				"%s%s", msg1, _("Evolution could not find an iPod to synchronize with. "
+						"Either the iPod is not connected to the system or it "
+						"is not powered on."));
 
 			gtk_dialog_run (GTK_DIALOG (message));
 
 			g_free(msg1);
-			g_free(msg2);
 			gtk_widget_destroy (message);
 		}
 
diff --git a/plugins/ipod-sync/ipod.c b/plugins/ipod-sync/ipod.c
index 41267ae..7556866 100644
--- a/plugins/ipod-sync/ipod.c
+++ b/plugins/ipod-sync/ipod.c
@@ -70,7 +70,7 @@ try_mount (gchar *device)
 	GError *err = NULL;
 	gint exit_status;
 
-	argv[0] = MOUNT;
+	argv[0] = (gchar*)MOUNT;
 	argv[1] = device;
 	argv[2] = NULL;
 
@@ -94,7 +94,7 @@ try_umount (gchar *device)
 	GError *err = NULL;
 	gint exit_status;
 
-	argv[0] = UMOUNT;
+	argv[0] = (gchar*)UMOUNT;
 	argv[1] = device;
 	argv[2] = NULL;
 
diff --git a/plugins/vcard-inline/Makefile.am b/plugins/vcard-inline/Makefile.am
index 01e1f3f..499db50 100644
--- a/plugins/vcard-inline/Makefile.am
+++ b/plugins/vcard-inline/Makefile.am
@@ -27,3 +27,5 @@ EXTRA_DIST = org-gnome-vcard-inline.eplug.xml
 
 BUILT_SOURCES = $(plugin_DATA)
 CLEANFILES = $(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index 6e8215c..685b5a8 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -51,7 +51,7 @@
 
 #include <string.h>
 
-#if NM_SUPPORT
+#if defined(NM_SUPPORT) && NM_SUPPORT
 gboolean e_shell_dbus_initialise (EShell *shell);
 #endif
 
@@ -572,7 +572,7 @@ setup_statusbar_notebook (EShellWindow *window)
 static void
 setup_nm_support (EShellWindow *window)
 {
-#if NM_SUPPORT
+#if defined(NM_SUPPORT) && NM_SUPPORT
        e_shell_dbus_initialise (window->priv->shell.eshell);
 #endif
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]