applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

forgot this

Browse source
This commit is contained in:
Jonathan Blandford 2002-11-14 22:26:09 +00:00
parent 5527e656d6
commit ea7ff3f5c3
3 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
capplets/common/gnome-theme-info.c
View file

@ -37,8 +37,8 @@ GList *callbacks = NULL;
const gchar *gtk2_suffix = "gtk-2.0";
const gchar *key_suffix = "gtk-2.0-key";
const gchar *metacity_suffix = "metacity-1";
const gchar *icon_theme_file = "index.theme";
const gchar *meta_theme_file = "index.theme";
const gchar *icon_theme_file_id = "index.theme";
const gchar *meta_theme_file_id = "index.theme";
static GnomeThemeMetaInfo *
read_meta_theme (const gchar *theme_name,
@ -54,6 +54,7 @@ read_meta_theme (const gchar *theme_name,
meta_theme_info = gnome_theme_meta_info_new ();
meta_theme_info->path = g_strdup (meta_theme_file);
meta_theme_info->name = g_strdup (theme_name);
str = gnome_desktop_item_get_string (meta_theme_ditem, GNOME_DESKTOP_ITEM_NAME);
if (str == NULL)
@ -138,12 +139,12 @@ update_theme_dir (const gchar *theme_dir)
gboolean has_metacity = FALSE;
gchar *tmp;
tmp = g_build_filename (theme_dir, meta_theme_file, NULL);
tmp = g_build_filename (theme_dir, meta_theme_file_id, NULL);
if (g_file_test (tmp, G_FILE_TEST_IS_REGULAR))
{
GnomeThemeMetaInfo *meta_theme_info;
meta_theme_info = read_meta_theme (tmp, strrchr (theme_dir, '/'));
meta_theme_info = read_meta_theme (strrchr (theme_dir, '/')+1, tmp);
if (meta_theme_info != NULL)
g_hash_table_insert (meta_theme_hash, meta_theme_info->name, meta_theme_info);
}
@ -227,7 +228,7 @@ update_icon_theme_dir (const gchar *theme_dir)
gboolean changed = FALSE;
gchar *tmp;
tmp = g_build_filename (theme_dir, icon_theme_file, NULL);
tmp = g_build_filename (theme_dir, icon_theme_file_id, NULL);
if (g_file_test (tmp, G_FILE_TEST_IS_REGULAR))
{
icon_theme_info = read_icon_theme (tmp);
@ -587,6 +588,7 @@ void
gnome_theme_meta_info_free (GnomeThemeMetaInfo *meta_theme_info)
{
g_free (meta_theme_info->path);
g_free (meta_theme_info->readable_name);
g_free (meta_theme_info->name);
g_free (meta_theme_info->comment);
g_free (meta_theme_info->application_font);

12
capplets/theme-switcher/gnome-theme-manager.c
View file

@ -863,15 +863,23 @@ setup_tree_view (GtkTreeView *tree_view,
{
GtkTreeModel *model;
GtkTreeSelection *selection;
GtkCellRenderer *renderer;
renderer = g_object_new (GTK_TYPE_CELL_RENDERER_PIXBUF,
"xpad", 4,
"ypad", 4,
NULL);
gtk_tree_view_insert_column_with_attributes (tree_view,
-1, NULL,
gtk_cell_renderer_pixbuf_new (),
renderer,
"pixbuf", PIXBUF_COLUMN,
NULL);
renderer = gtk_cell_renderer_text_new ();
gtk_tree_view_insert_column_with_attributes (tree_view,
-1, NULL,
gtk_cell_renderer_text_new (),
renderer,
"markup", THEME_NAME_COLUMN,
NULL);

4
configure.in
View file

@ -59,6 +59,7 @@ PKG_CHECK_MODULES(OLD_CAPPLET, libgnomeui-2.0 libglade-2.0)
PKG_CHECK_MODULES(GNOME, libgnomeui-2.0)
PKG_CHECK_MODULES(VFS_CAPPLET, $COMMON_MODULES gnome-vfs-module-2.0 gnome-vfs-2.0)
PKG_CHECK_MODULES(SOUND_CAPPLET, esound)
PKG_CHECK_MODULES(METACITY, libmetacity-private)
dnl
dnl Check for Xft version 2; we build in extra functionality to the font capplet
@ -170,6 +171,9 @@ AC_SUBST(FONT_CAPPLET_LIBS)
AC_SUBST(GNOMECC_CFLAGS)
AC_SUBST(GNOMECC_LIBS)
AC_SUBST(METACITY_CFLAGS)
AC_SUBST(METACITY_LIBS)
dnl ==============================================
dnl End: Define the main variables
dnl ==============================================