diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2002-03-14 08:34:35 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2002-03-14 08:34:35 +0800 |
| commit | a18af91be595552c76016523bcaa6e5bf7fb508b (patch) | |
| tree | 6b345b9b74e42a83fd6e620ede7d78e60bf3a6dc | |
| parent | 828991183bc924b2ec7d5019790e9200d9a37a6d (diff) | |
| download | gsoc2013-evolution-a18af91be595552c76016523bcaa6e5bf7fb508b.tar.gz gsoc2013-evolution-a18af91be595552c76016523bcaa6e5bf7fb508b.tar.zst gsoc2013-evolution-a18af91be595552c76016523bcaa6e5bf7fb508b.zip | |
If the charset item doesn't have a class (aka "Unknown"), don't write a
2002-03-13 Jeffrey Stedfast <fejj@ximian.com>
* e-charset-picker.c (add_charset): If the charset item doesn't
have a class (aka "Unknown"), don't write a class name, instead
just give the charset name as the menu item label. Fixes bug
#14753.
svn path=/trunk/; revision=16154
| -rw-r--r-- | widgets/misc/ChangeLog | 7 | ||||
| -rw-r--r-- | widgets/misc/e-charset-picker.c | 8 |
2 files changed, 12 insertions, 3 deletions
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog index 62ccbf968d..8e3d1447ca 100644 --- a/widgets/misc/ChangeLog +++ b/widgets/misc/ChangeLog @@ -1,3 +1,10 @@ +2002-03-13 Jeffrey Stedfast <fejj@ximian.com> + + * e-charset-picker.c (add_charset): If the charset item doesn't + have a class (aka "Unknown"), don't write a class name, instead + just give the charset name as the menu item label. Fixes bug + #14753. + 2002-03-13 Christopher James Lahey <clahey@ximian.com> * e-multi-config-dialog.c: Added alpha blending here. diff --git a/widgets/misc/e-charset-picker.c b/widgets/misc/e-charset-picker.c index aa2d174d89..5c8751149e 100644 --- a/widgets/misc/e-charset-picker.c +++ b/widgets/misc/e-charset-picker.c @@ -123,18 +123,20 @@ add_charset (GtkWidget *menu, ECharset *charset, gboolean free_name) { GtkWidget *item; char *label; - + if (charset->subclass) { label = g_strdup_printf ("%s, %s (%s)", _(classnames[charset->class]), _(charset->subclass), charset->name); - } else { + } else if (charset->class) { label = g_strdup_printf ("%s (%s)", _(classnames[charset->class]), charset->name); + } else { + label = g_strdup (charset->name); } - + item = gtk_menu_item_new_with_label (label); gtk_object_set_data_full (GTK_OBJECT (item), "charset", charset->name, free_name ? g_free : NULL); |