[gtk+] Use a define for the default icon theme name
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Use a define for the default icon theme name
- Date: Thu, 10 Jul 2014 01:20:07 +0000 (UTC)
commit 6abcda8391b6d49791f763f3a7d623bc152cd912
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Jul 9 21:18:18 2014 -0400
Use a define for the default icon theme name
We're using this name in two places, so match what we are doing
for the default theme name, and use a macro.
gtk/gtkicontheme.c | 4 ++--
gtk/gtksettings.c | 2 +-
gtk/gtksettingsprivate.h | 1 +
3 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index c0dbff8..bf69dd8 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -44,7 +44,7 @@
#include "gtkintl.h"
#include "gtkmain.h"
#include "deprecated/gtknumerableiconprivate.h"
-#include "gtksettings.h"
+#include "gtksettingsprivate.h"
#include "gtkprivate.h"
#undef GDK_DEPRECATED
@@ -1348,7 +1348,7 @@ load_themes (GtkIconTheme *icon_theme)
* and gnome is a pragmatic solution to prevent missing icons in
* GTK+ applications when run under, e.g. KDE.
*/
- insert_theme (icon_theme, "Adwaita");
+ insert_theme (icon_theme, DEFAULT_ICON_THEME);
insert_theme (icon_theme, "gnome");
insert_theme (icon_theme, FALLBACK_ICON_THEME);
priv->themes = g_list_reverse (priv->themes);
diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 361334a..7804ae0 100644
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -449,7 +449,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
g_param_spec_string ("gtk-icon-theme-name",
P_("Icon Theme Name"),
P_("Name of icon theme to use"),
- "Adwaita",
+ DEFAULT_ICON_THEME,
GTK_PARAM_READWRITE),
NULL);
g_assert (result == PROP_ICON_THEME_NAME);
diff --git a/gtk/gtksettingsprivate.h b/gtk/gtksettingsprivate.h
index 71ba4a8..d44e722 100644
--- a/gtk/gtksettingsprivate.h
+++ b/gtk/gtksettingsprivate.h
@@ -24,6 +24,7 @@
G_BEGIN_DECLS
#define DEFAULT_THEME_NAME "Adwaita"
+#define DEFAULT_ICON_THEME "Adwaita"
void _gtk_settings_set_property_value_from_rc (GtkSettings *settings,
const gchar *name,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]