From 04a042ee01dba30ba231c48ec7d172b6be1a6fca Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Mon, 25 May 2009 23:07:23 -0400
Subject: Fix compiler warnings in widgets.
---
widgets/misc/e-charset-picker.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
(limited to 'widgets/misc/e-charset-picker.c')
diff --git a/widgets/misc/e-charset-picker.c b/widgets/misc/e-charset-picker.c
index 87652974cb..6c7233ab9f 100644
--- a/widgets/misc/e-charset-picker.c
+++ b/widgets/misc/e-charset-picker.c
@@ -71,9 +71,9 @@ static const char *classnames[] = {
};
typedef struct {
- char *name;
+ const gchar *name;
ECharsetClass class;
- char *subclass;
+ const gchar *subclass;
} ECharset;
/* This list is based on what other mailers/browsers support. There's
@@ -146,7 +146,7 @@ add_charset (GtkWidget *menu, ECharset *charset, gboolean free_name)
item = gtk_menu_item_new_with_label (label);
g_object_set_data_full ((GObject *) item, "charset",
- charset->name, free_name ? g_free : NULL);
+ (gpointer) charset->name, free_name ? g_free : NULL);
g_free (label);
gtk_widget_show (item);
@@ -605,13 +605,14 @@ e_charset_picker_bonobo_ui_populate (BonoboUIComponent *uic, const char *path,
g_free (label);
for (i = 0; i < num_charsets; i++) {
- char *command;
- char *charset_name, *u;
+ gchar *charset_name;
+ gchar *command, *u;
/* escape _'s in the charset name so that it doesn't become an underline in a GtkLabel */
if ((u = strchr (charsets[i].name, '_'))) {
int extra = 1;
- char *s, *d;
+ const gchar *s;
+ gchar *d;
while ((u = strchr (u + 1, '_')))
extra++;
@@ -625,7 +626,7 @@ e_charset_picker_bonobo_ui_populate (BonoboUIComponent *uic, const char *path,
}
*d = '\0';
} else {
- charset_name = charsets[i].name;
+ charset_name = (gchar *) charsets[i].name;
}
if (charsets[i].subclass) {
--
cgit v1.2.3
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.
---
widgets/misc/e-charset-picker.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'widgets/misc/e-charset-picker.c')
diff --git a/widgets/misc/e-charset-picker.c b/widgets/misc/e-charset-picker.c
index 6c7233ab9f..5d1f8c036a 100644
--- a/widgets/misc/e-charset-picker.c
+++ b/widgets/misc/e-charset-picker.c
@@ -10,7 +10,7 @@
* 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/>
*
*
* Authors:
@@ -444,7 +444,7 @@ e_charset_picker_dialog (const char *title, const char *prompt,
* locale character set
* @callback: a callback function for actions in the group, or %NULL
* @user_data: user data to be passed to @callback, or %NULL
- *
+ *
* Adds a set of #GtkRadioActions for available character sets to
* @action_group. The @default_charset (or locale character set if
* @default_charset is %NULL) will be added first, and selected by
--
cgit v1.2.3