aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/ipod-sync
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2009-06-05 20:48:29 +0800
committerMilan Crha <mcrha@redhat.com>2009-06-05 20:50:42 +0800
commit84c55f4e983c4458a08f9bd19fe63b3fd7af2fa7 (patch)
treec6cb7ea33f0ef3424cc060d4d1b79287f8dd0a10 /plugins/ipod-sync
parenta979826a00beebd29850445ff2a27187946fade1 (diff)
downloadgsoc2013-evolution-84c55f4e983c4458a08f9bd19fe63b3fd7af2fa7.tar
gsoc2013-evolution-84c55f4e983c4458a08f9bd19fe63b3fd7af2fa7.tar.gz
gsoc2013-evolution-84c55f4e983c4458a08f9bd19fe63b3fd7af2fa7.tar.bz2
gsoc2013-evolution-84c55f4e983c4458a08f9bd19fe63b3fd7af2fa7.tar.lz
gsoc2013-evolution-84c55f4e983c4458a08f9bd19fe63b3fd7af2fa7.tar.xz
gsoc2013-evolution-84c55f4e983c4458a08f9bd19fe63b3fd7af2fa7.tar.zst
gsoc2013-evolution-84c55f4e983c4458a08f9bd19fe63b3fd7af2fa7.zip
Fix even more compiler warnings and disable one for format strings
Diffstat (limited to 'plugins/ipod-sync')
-rw-r--r--plugins/ipod-sync/evolution-ipod-sync.c22
-rw-r--r--plugins/ipod-sync/ipod.c4
2 files changed, 12 insertions, 14 deletions
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;