From 36c0946ab4e316587b9ad4108e89b21a7ac4b3f8 Mon Sep 17 00:00:00 2001 From: Paul Mangan Date: Sat, 21 Jan 2006 15:26:08 +0000 Subject: [PATCH] 2006-01-21 [paul] 1.9.100cvs178 * src/prefs_themes.c fix broken underlining of label text with some translations --- ChangeLog | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/prefs_themes.c | 12 +++--------- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 27f92fae1..3c7b6c086 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-01-21 [paul] 1.9.100cvs178 + + * src/prefs_themes.c + fix broken underlining of label text + with some translations + 2006-01-21 [colin] 1.9.100cvs177 * po/fr.po diff --git a/PATCHSETS b/PATCHSETS index 929b8a2e5..d88f25d0d 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1161,3 +1161,4 @@ ( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 manual/handling.xml; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/keyboard.xml; cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/prefs_summaries.c; ) > 1.9.100cvs175.patchset ( cvs diff -u -r 1.654.2.1205 -r 1.654.2.1206 configure.ac; cvs diff -u -r 1.24.2.12 -r 1.24.2.13 Makefile.am; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/Makefile; diff -u /dev/null manual/dist/html/.cvsignore; diff -u /dev/null manual/dist/html/Makefile.am; diff -u /dev/null manual/dist/pdf/.cvsignore; diff -u /dev/null manual/dist/pdf/Makefile.am; diff -u /dev/null manual/dist/ps/.cvsignore; diff -u /dev/null manual/dist/ps/Makefile.am; diff -u /dev/null manual/dist/txt/.cvsignore; diff -u /dev/null manual/dist/txt/Makefile.am; ) > 1.9.100cvs176.patchset ( cvs diff -u -r 1.42.2.18 -r 1.42.2.19 po/fr.po; ) > 1.9.100cvs177.patchset +( cvs diff -u -r 1.3.2.37 -r 1.3.2.38 src/prefs_themes.c; ) > 1.9.100cvs178.patchset diff --git a/configure.ac b/configure.ac index b3bd189a6..0e45cf61f 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=100 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=177 +EXTRA_VERSION=178 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/prefs_themes.c b/src/prefs_themes.c index 9b29d4187..5f736a97b 100644 --- a/src/prefs_themes.c +++ b/src/prefs_themes.c @@ -805,9 +805,6 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin { ThemesPage *prefs_themes = (ThemesPage *)page; ThemesData *tdata = prefs_themes_data; - gchar *buf; - const gchar *tmp; - gint i; /* from gtk/about.c */ GtkStyle *style; GdkColormap *cmap; @@ -878,17 +875,14 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin gtk_box_pack_start (GTK_BOX (hbox3), btn_install, FALSE, FALSE, 0); GTK_WIDGET_SET_FLAGS (btn_install, GTK_CAN_DEFAULT); - btn_more = gtk_button_new_with_label (_("Get more...")); + btn_more = gtk_button_new_with_label (_("Get more...")); gtk_widget_show (btn_more); gtk_box_pack_start (GTK_BOX (hbox3), btn_more, FALSE, FALSE, 0); GTK_WIDGET_SET_FLAGS (btn_more, GTK_CAN_DEFAULT); /* make it look like an uri */ gtk_button_set_relief(GTK_BUTTON(btn_more), GTK_RELIEF_NONE); - tmp = gtk_label_get_text(GTK_LABEL(GTK_BIN(btn_more)->child)); - buf = g_strdup(tmp); - for (i = 0; buf[i] != '\0'; buf[i++] = '_'); - gtk_label_set_pattern(GTK_LABEL(GTK_BIN(btn_more)->child), buf); - g_free(buf); + gtk_label_set_use_markup(GTK_LABEL(GTK_BIN(btn_more)->child), TRUE); + cmap = gdk_drawable_get_colormap((mainwindow_get_mainwindow())->window->window); gdk_colormap_alloc_colors(cmap, uri_color, 2, FALSE, TRUE, success); if (success[0] == TRUE && success[1] == TRUE) { -- 2.25.1