aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2009-06-05 20:48:29 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-06-09 19:18:28 +0800
commitb0e26e9c5f13c710c7677959cc457158206befe1 (patch)
treeb4a7791f26ff0928e862d9d44b3b81e52cd986e0 /plugins
parentf9f7c3efa62b85e8f54e59382fef9ef8c80df6e6 (diff)
downloadgsoc2013-evolution-b0e26e9c5f13c710c7677959cc457158206befe1.tar.gz
gsoc2013-evolution-b0e26e9c5f13c710c7677959cc457158206befe1.tar.zst
gsoc2013-evolution-b0e26e9c5f13c710c7677959cc457158206befe1.zip
Fix even more compiler warnings and disable one for format strings
Diffstat (limited to 'plugins')
-rw-r--r--plugins/external-editor/apps-evolution-external-editor.schemas.in2
-rw-r--r--plugins/external-editor/external-editor.c4
-rw-r--r--plugins/folder-unsubscribe/folder-unsubscribe.c3
-rw-r--r--plugins/hula-account-setup/camel-hula-listener.c4
-rw-r--r--plugins/ipod-sync/evolution-ipod-sync.c22
-rw-r--r--plugins/ipod-sync/ipod.c4
6 files changed, 20 insertions, 19 deletions
diff --git a/plugins/external-editor/apps-evolution-external-editor.schemas.in b/plugins/external-editor/apps-evolution-external-editor.schemas.in
index 38becebdb7..0f7db301e8 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 5d8ae3bfcd..a7f06b62bf 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 1d5e4fb8dc..7005ac7feb 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 818c6a5e14..04fa4605d2 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 11df39777a..a60bd2dfd3 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 41267ae3e6..75568660f1 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;