From ffa17ed195a6bbb40d386fb572b7941e22f47f8d Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Tue, 26 May 2009 13:20:45 -0400
Subject: Fix compiler warnings in plugins.
---
plugins/backup-restore/backup.c | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
(limited to 'plugins/backup-restore/backup.c')
diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c
index 7d3c208a28..7e7cc50461 100644
--- a/plugins/backup-restore/backup.c
+++ b/plugins/backup-restore/backup.c
@@ -373,7 +373,7 @@ main (int argc, char **argv)
g_thread_init (NULL);
gtk_init_with_args (
- &argc, &argv, NULL, options, GETTEXT_PACKAGE, &error);
+ &argc, &argv, NULL, options, (gchar *) GETTEXT_PACKAGE, &error);
if (error != NULL) {
g_printerr ("%s\n", error->message);
g_error_free (error);
@@ -401,8 +401,9 @@ main (int argc, char **argv)
if (gui_arg && !check_op) {
GtkWidget *widget, *container;
- char *str = NULL, *txt;
- const char *txt2;
+ const gchar *txt, *txt2;
+ gchar *str = NULL;
+ gchar *markup;
gtk_window_set_default_icon_name ("evolution");
@@ -454,34 +455,34 @@ main (int argc, char **argv)
txt2 = "Should not be here now, really...";
}
- txt = g_strconcat ("<b><big>", txt, "</big></b>", NULL);
+ markup = g_strconcat ("<b><big>", txt, "</big></b>", NULL);
widget = gtk_label_new (NULL);
gtk_label_set_line_wrap (GTK_LABEL (widget), FALSE);
- gtk_label_set_markup (GTK_LABEL (widget), txt);
+ gtk_label_set_markup (GTK_LABEL (widget), markup);
gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.0);
gtk_widget_show (widget);
- g_free (txt);
+ g_free (markup);
gtk_table_attach (GTK_TABLE (container), widget, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
- txt = g_strconcat (txt2, " ", _("This may take a while depending on the amount of data in your account."), NULL);
+ markup = g_strconcat (txt2, " ", _("This may take a while depending on the amount of data in your account."), NULL);
widget = gtk_label_new (NULL);
gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE);
- gtk_label_set_markup (GTK_LABEL (widget), txt);
+ gtk_label_set_markup (GTK_LABEL (widget), markup);
gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
gtk_widget_show (widget);
- g_free (txt);
+ g_free (markup);
gtk_table_attach (GTK_TABLE (container), widget, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
pbar = gtk_progress_bar_new ();
if (str) {
- txt = g_strconcat ("<i>", str, "</i>", NULL);
+ markup = g_strconcat ("<i>", str, "</i>", NULL);
widget = gtk_label_new (NULL);
- gtk_label_set_markup (GTK_LABEL (widget), txt);
+ gtk_label_set_markup (GTK_LABEL (widget), markup);
gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
- g_free (txt);
+ g_free (markup);
g_free (str);
gtk_table_attach (GTK_TABLE (container), widget, 1, 2, 2, 3, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
gtk_table_set_row_spacing (GTK_TABLE (container), 2, 6);
--
cgit
From e4afd3f9fb962ea1295a0657ec9f83a427829171 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Tue, 26 May 2009 23:21:02 -0400
Subject: Remove trailing whitespace, again.
---
plugins/backup-restore/backup.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
(limited to 'plugins/backup-restore/backup.c')
diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c
index 7e7cc50461..19e9e98bb1 100644
--- a/plugins/backup-restore/backup.c
+++ b/plugins/backup-restore/backup.c
@@ -11,13 +11,13 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
*
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
*/
-
+
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
@@ -182,7 +182,7 @@ backup (const char *filename)
g_return_if_fail (filename && *filename);
quotedfname = g_shell_quote(filename);
-
+
CANCEL (complete);
txt = _("Shutting down Evolution");
/* FIXME Will the versioned setting always work? */
@@ -226,10 +226,10 @@ restore (const char *filename)
{
char *command;
char *quotedfname;
-
+
g_return_if_fail (filename && *filename);
quotedfname = g_shell_quote(filename);
-
+
/* FIXME Will the versioned setting always work? */
CANCEL (complete);
txt = _("Shutting down Evolution");
@@ -281,7 +281,7 @@ check (const char *filename)
g_return_if_fail (filename && *filename);
quotedfname = g_shell_quote(filename);
-
+
command = g_strdup_printf ("tar ztf %s | grep -e \"^\\.evolution/$\"", quotedfname);
result = system (command);
g_free (command);
@@ -294,7 +294,7 @@ check (const char *filename)
result = system (command);
g_free (command);
g_free (quotedfname);
-
+
g_message ("Second result %d", result);
}
--
cgit