AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Use a define for the default icon theme name

Browse Source 
We're using this name in two places, so match what we are doing
for the default theme name, and use a macro.
This commit is contained in:
Matthias Clasen 2014-07-09 21:18:18 -04:00
parent eee7057421
commit 6abcda8391
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/gtkicontheme.c
View File

@ -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);

2
gtk/gtksettings.c
View File

@ -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);

1
gtk/gtksettingsprivate.h
View File

@ -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,