diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-05-21 06:20:52 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-05-21 06:20:52 +0800 |
commit | bd4381ec281d1ae7139b00ddb348a44854b45c5f (patch) | |
tree | 44cbc4461d065051a67715b4d6368fa479d57c49 /sysutils/gnome-control-center/files | |
parent | a60effaf1962d22db68305acf84161df9c0c12b6 (diff) | |
download | marcuscom-ports-bd4381ec281d1ae7139b00ddb348a44854b45c5f.tar marcuscom-ports-bd4381ec281d1ae7139b00ddb348a44854b45c5f.tar.gz marcuscom-ports-bd4381ec281d1ae7139b00ddb348a44854b45c5f.tar.bz2 marcuscom-ports-bd4381ec281d1ae7139b00ddb348a44854b45c5f.tar.lz marcuscom-ports-bd4381ec281d1ae7139b00ddb348a44854b45c5f.tar.xz marcuscom-ports-bd4381ec281d1ae7139b00ddb348a44854b45c5f.tar.zst marcuscom-ports-bd4381ec281d1ae7139b00ddb348a44854b45c5f.zip |
Update to 2.23.2.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@10970 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils/gnome-control-center/files')
-rw-r--r-- | sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c b/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c index ac875d14d..d0e21a6c3 100644 --- a/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c +++ b/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c @@ -1,20 +1,20 @@ ---- capplets/common/gnome-theme-info.c.orig 2007-10-30 18:58:26.000000000 -0400 -+++ capplets/common/gnome-theme-info.c 2007-11-01 08:43:25.067405773 -0400 -@@ -661,7 +661,7 @@ - theme_info->thumbnail = gdk_pixbuf_new_from_file (filename, NULL); - g_free (filename); - -- theme_info->path = g_build_filename (GNOMECC_DATA_DIR, builtins[i][0], NULL); -+ theme_info->name = g_build_filename (INSTALL_PREFIX, "share", builtins[i][0], NULL); - theme_info->name = g_strdup (theme_info->path); - - if (!strcmp (theme_info->path, cursor_font)) -@@ -1922,7 +1922,7 @@ - gnome_vfs_uri_unref (top_theme_dir_uri); +--- capplets/common/gnome-theme-info.c.orig 2008-05-17 12:46:59.000000000 -0400 ++++ capplets/common/gnome-theme-info.c 2008-05-20 18:10:50.000000000 -0400 +@@ -1843,7 +1843,7 @@ gnome_theme_init () + g_object_unref (top_theme_dir); /* The weird /usr/share/icons */ -- top_theme_dir_uri = gnome_vfs_uri_new ("/usr/share/icons"); -+ top_theme_dir_uri = gnome_vfs_uri_new ("%%LOCALBASE%%/lib/X11/icons"); - if (!gnome_vfs_uri_exists (top_theme_dir_uri)) - gnome_vfs_make_directory_for_uri (top_theme_dir_uri, 0775); - add_top_icon_theme_dir_monitor (top_theme_dir_uri, &real_monitor_not_added, 2, NULL); +- top_theme_dir = g_file_new_for_path ("/usr/share/icons"); ++ top_theme_dir = g_file_new_for_path ("%%LOCALBASE%%/lib/X11/icons"); + add_top_icon_theme_dir_monitor (top_theme_dir, 2, NULL); + g_object_unref (top_theme_dir); + +@@ -1857,7 +1857,7 @@ gnome_theme_init () + #ifdef XCURSOR_ICONDIR + /* if there's a separate xcursors dir, add that as well */ + if (strcmp (XCURSOR_ICONDIR, top_theme_dir_string) && +- strcmp (XCURSOR_ICONDIR, "/usr/share/icons")) { ++ strcmp (XCURSOR_ICONDIR, "%%LOCALBASE%%/lib/X11/icons")) { + top_theme_dir = g_file_new_for_path (XCURSOR_ICONDIR); + if (g_file_query_exists (top_theme_dir, NULL)) + add_top_icon_theme_dir_monitor (top_theme_dir, 1, NULL); |