diff options
| author | Kjartan Maraas <kmaraas@src.gnome.org> | 2007-10-31 06:21:14 +0800 |
|---|---|---|
| committer | Kjartan Maraas <kmaraas@src.gnome.org> | 2007-10-31 06:21:14 +0800 |
| commit | f13fd21b50fa97b4ce7e29ce82d471c1f1870c11 (patch) | |
| tree | 4f04f16373ca46b199bcd2677c9d2d434d308d9f /plugins/ipod-sync | |
| parent | 5c1b5556bf7d92acddefa8bd01911299b5acad61 (diff) | |
| download | gsoc2013-evolution-f13fd21b50fa97b4ce7e29ce82d471c1f1870c11.tar gsoc2013-evolution-f13fd21b50fa97b4ce7e29ce82d471c1f1870c11.tar.gz gsoc2013-evolution-f13fd21b50fa97b4ce7e29ce82d471c1f1870c11.tar.bz2 gsoc2013-evolution-f13fd21b50fa97b4ce7e29ce82d471c1f1870c11.tar.lz gsoc2013-evolution-f13fd21b50fa97b4ce7e29ce82d471c1f1870c11.tar.xz gsoc2013-evolution-f13fd21b50fa97b4ce7e29ce82d471c1f1870c11.tar.zst gsoc2013-evolution-f13fd21b50fa97b4ce7e29ce82d471c1f1870c11.zip | |
Fix warnings from sparse and gcc
svn path=/trunk/; revision=34458
Diffstat (limited to 'plugins/ipod-sync')
| -rw-r--r-- | plugins/ipod-sync/ChangeLog | 5 | ||||
| -rw-r--r-- | plugins/ipod-sync/evolution-ipod-sync.c | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/plugins/ipod-sync/ChangeLog b/plugins/ipod-sync/ChangeLog index fc53b2bc0b..5d792691c2 100644 --- a/plugins/ipod-sync/ChangeLog +++ b/plugins/ipod-sync/ChangeLog @@ -1,3 +1,8 @@ +2007-10-26 Kjartan Maraas <kmaraas@gnome.org> + + * evolution-ipod-sync.c: (ipod_check_status): Don't mix code + and declarations. + 2007-09-14 Matthew Barnes <mbarnes@redhat.com> ** Fixes part of bug #476231 diff --git a/plugins/ipod-sync/evolution-ipod-sync.c b/plugins/ipod-sync/evolution-ipod-sync.c index 3b0a3d2de0..73e5536c17 100644 --- a/plugins/ipod-sync/evolution-ipod-sync.c +++ b/plugins/ipod-sync/evolution-ipod-sync.c @@ -29,13 +29,14 @@ ipod_check_status (gboolean silent) if (check_hal () == FALSE) { if (!silent) { + GtkWidget *message; gchar *msg1, *msg2; 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.") ); - GtkWidget *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, msg2); gtk_dialog_run (GTK_DIALOG (message)); @@ -62,13 +63,14 @@ ipod_check_status (gboolean silent) * it wasn't plugged in. Either way, we want to umount * the iPod when we finish syncing. */ if (!silent) { + GtkWidget *message; gchar *msg1, *msg2; 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.")); - GtkWidget *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, msg2); gtk_dialog_run (GTK_DIALOG (message)); |