| 1 |
tetromino 12/05/03 05:05:48 |
| 2 |
|
| 3 |
Added: devhelp-3.4.1-gsettings-fonts.patch |
| 4 |
Log: |
| 5 |
Version bump, now supports globs in search tab. Add patch to use gsettings instead of libgnome's gconf keys for default fonts (bug #396637, thanks to Rafał Mużyło). |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-util/devhelp/files/devhelp-3.4.1-gsettings-fonts.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/devhelp/files/devhelp-3.4.1-gsettings-fonts.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/devhelp/files/devhelp-3.4.1-gsettings-fonts.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: devhelp-3.4.1-gsettings-fonts.patch |
| 16 |
=================================================================== |
| 17 |
From d761ce906fab110d38d9e71d4c25a334d79b9869 Mon Sep 17 00:00:00 2001 |
| 18 |
From: =?UTF-8?q?Rafa=C5=82=20Mu=C5=BCy=C5=82o?= <galtgendo@××.pl> |
| 19 |
Date: Thu, 3 May 2012 00:15:50 -0400 |
| 20 |
Subject: [PATCH] stop using obsoleted default keys |
| 21 |
|
| 22 |
https://bugzilla.gnome.org/show_bug.cgi?id=646402 |
| 23 |
--- |
| 24 |
src/dh-preferences.c | 36 ++++++++---------------------------- |
| 25 |
src/dh-util.c | 14 ++++++++------ |
| 26 |
2 files changed, 16 insertions(+), 34 deletions(-) |
| 27 |
|
| 28 |
diff --git a/src/dh-preferences.c b/src/dh-preferences.c |
| 29 |
index 7d75ebf..0f33810 100644 |
| 30 |
--- a/src/dh-preferences.c |
| 31 |
+++ b/src/dh-preferences.c |
| 32 |
@@ -287,41 +287,21 @@ preferences_connect_conf_listeners (void) |
| 33 |
} |
| 34 |
#endif |
| 35 |
|
| 36 |
-/* FIXME: Use the functions in dh-util.c for this. */ |
| 37 |
static void |
| 38 |
preferences_fonts_get_font_names (gboolean use_system_fonts, |
| 39 |
gchar **variable, |
| 40 |
gchar **fixed) |
| 41 |
{ |
| 42 |
- gchar *var_font_name; |
| 43 |
- gchar *fixed_font_name; |
| 44 |
- IgeConf *conf; |
| 45 |
- |
| 46 |
- conf = ige_conf_get (); |
| 47 |
+ gchar *name; |
| 48 |
+ gdouble size; |
| 49 |
|
| 50 |
- if (use_system_fonts) { |
| 51 |
-#ifdef GDK_WINDOWING_QUARTZ |
| 52 |
- var_font_name = g_strdup ("Lucida Grande 14"); |
| 53 |
- fixed_font_name = g_strdup ("Monaco 14"); |
| 54 |
-#else |
| 55 |
- ige_conf_get_string (conf, |
| 56 |
- DH_CONF_SYSTEM_VARIABLE_FONT, |
| 57 |
- &var_font_name); |
| 58 |
- ige_conf_get_string (conf, |
| 59 |
- DH_CONF_SYSTEM_FIXED_FONT, |
| 60 |
- &fixed_font_name); |
| 61 |
-#endif |
| 62 |
- } else { |
| 63 |
- ige_conf_get_string (conf, |
| 64 |
- DH_CONF_VARIABLE_FONT, |
| 65 |
- &var_font_name); |
| 66 |
- ige_conf_get_string (conf, |
| 67 |
- DH_CONF_FIXED_FONT, |
| 68 |
- &fixed_font_name); |
| 69 |
- } |
| 70 |
+ dh_util_font_get_variable (&name, &size, use_system_fonts); |
| 71 |
+ *variable = g_strdup_printf ("%s %u", name, (guint)size); |
| 72 |
+ g_free (name); |
| 73 |
|
| 74 |
- *variable = var_font_name; |
| 75 |
- *fixed = fixed_font_name; |
| 76 |
+ dh_util_font_get_fixed (&name, &size, use_system_fonts); |
| 77 |
+ *fixed = g_strdup_printf ("%s %u", name, (guint)size); |
| 78 |
+ g_free (name); |
| 79 |
} |
| 80 |
|
| 81 |
static void |
| 82 |
diff --git a/src/dh-util.c b/src/dh-util.c |
| 83 |
index 74312d2..08151a3 100644 |
| 84 |
--- a/src/dh-util.c |
| 85 |
+++ b/src/dh-util.c |
| 86 |
@@ -603,6 +603,7 @@ dh_util_font_get_variable (gchar **name, |
| 87 |
{ |
| 88 |
IgeConf *conf; |
| 89 |
gchar *name_and_size; |
| 90 |
+ GSettings *settings; |
| 91 |
|
| 92 |
conf = ige_conf_get (); |
| 93 |
|
| 94 |
@@ -610,9 +611,9 @@ dh_util_font_get_variable (gchar **name, |
| 95 |
#ifdef GDK_WINDOWING_QUARTZ |
| 96 |
name_and_size = g_strdup ("Lucida Grande 14"); |
| 97 |
#else |
| 98 |
- ige_conf_get_string (conf, |
| 99 |
- DH_CONF_SYSTEM_VARIABLE_FONT, |
| 100 |
- &name_and_size); |
| 101 |
+ settings = g_settings_new ("org.gnome.desktop.interface"); |
| 102 |
+ name_and_size = g_settings_get_string (settings, "font-name"); |
| 103 |
+ g_object_unref (settings); |
| 104 |
#endif |
| 105 |
} else { |
| 106 |
ige_conf_get_string (conf, |
| 107 |
@@ -635,6 +636,7 @@ dh_util_font_get_fixed (gchar **name, |
| 108 |
{ |
| 109 |
IgeConf *conf; |
| 110 |
gchar *name_and_size; |
| 111 |
+ GSettings *settings; |
| 112 |
|
| 113 |
conf = ige_conf_get (); |
| 114 |
|
| 115 |
@@ -642,9 +644,9 @@ dh_util_font_get_fixed (gchar **name, |
| 116 |
#ifdef GDK_WINDOWING_QUARTZ |
| 117 |
name_and_size = g_strdup ("Monaco 14"); |
| 118 |
#else |
| 119 |
- ige_conf_get_string (conf, |
| 120 |
- DH_CONF_SYSTEM_FIXED_FONT, |
| 121 |
- &name_and_size); |
| 122 |
+ settings = g_settings_new ("org.gnome.desktop.interface"); |
| 123 |
+ name_and_size = g_settings_get_string (settings, "monospace-font-name"); |
| 124 |
+ g_object_unref (settings); |
| 125 |
#endif |
| 126 |
} else { |
| 127 |
ige_conf_get_string (conf, |
| 128 |
-- |
| 129 |
1.7.8.6 |
Archives