diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-06-29 05:42:42 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2003-06-29 05:42:42 +0800 |
commit | 7c02bb3b48154d073b2a7d117721ffb52170935a (patch) | |
tree | c9821c4e9ad84467bf59ca8801a1e9f69b9d5ec8 /sysutils/gnome-control-center/files | |
parent | 3406ce259a4555846d57ed8c72195b718ed58730 (diff) | |
download | marcuscom-ports-7c02bb3b48154d073b2a7d117721ffb52170935a.tar marcuscom-ports-7c02bb3b48154d073b2a7d117721ffb52170935a.tar.gz marcuscom-ports-7c02bb3b48154d073b2a7d117721ffb52170935a.tar.bz2 marcuscom-ports-7c02bb3b48154d073b2a7d117721ffb52170935a.tar.lz marcuscom-ports-7c02bb3b48154d073b2a7d117721ffb52170935a.tar.xz marcuscom-ports-7c02bb3b48154d073b2a7d117721ffb52170935a.tar.zst marcuscom-ports-7c02bb3b48154d073b2a7d117721ffb52170935a.zip |
Update to 2.3.3.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@930 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils/gnome-control-center/files')
-rw-r--r-- | sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-xrdb.c | 19 | ||||
-rw-r--r-- | sysutils/gnome-control-center/files/patch-vfs_methods_themus_theme-method.c | 14 |
2 files changed, 2 insertions, 31 deletions
diff --git a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-xrdb.c b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-xrdb.c deleted file mode 100644 index 169ae0cbf..000000000 --- a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-xrdb.c +++ /dev/null @@ -1,19 +0,0 @@ ---- gnome-settings-daemon/gnome-settings-xrdb.c.orig Fri May 9 11:55:44 2003 -+++ gnome-settings-daemon/gnome-settings-xrdb.c Fri May 9 11:55:58 2003 -@@ -251,6 +251,7 @@ - append_xresources (GString *string, GError **error) - { - const char* home_path; -+ char *xresources; - - g_return_if_fail (string != NULL); - -@@ -259,7 +260,7 @@ - g_warning (_("Cannot determine user's home directory")); - return; - } -- char *xresources = g_build_filename (home_path, USER_X_RESOURCES, NULL); -+ xresources = g_build_filename (home_path, USER_X_RESOURCES, NULL); - if (g_file_test (xresources, G_FILE_TEST_EXISTS)) { - append_file (xresources, string, error); - if (*error) { diff --git a/sysutils/gnome-control-center/files/patch-vfs_methods_themus_theme-method.c b/sysutils/gnome-control-center/files/patch-vfs_methods_themus_theme-method.c index 45a72ff27..a9add20e2 100644 --- a/sysutils/gnome-control-center/files/patch-vfs_methods_themus_theme-method.c +++ b/sysutils/gnome-control-center/files/patch-vfs_methods_themus_theme-method.c @@ -1,5 +1,5 @@ ---- vfs-methods/themus/theme-method.c.orig Thu May 22 01:42:21 2003 -+++ vfs-methods/themus/theme-method.c Thu May 22 01:44:13 2003 +--- vfs-methods/themus/theme-method.c.orig Fri Jun 13 07:52:44 2003 ++++ vfs-methods/themus/theme-method.c Sat Jun 28 12:50:39 2003 @@ -19,6 +19,7 @@ #include <string.h> @@ -8,13 +8,3 @@ #include <sys/stat.h> #include <sys/types.h> -@@ -528,8 +529,8 @@ - return GNOME_VFS_OK; - } - else { -- g_free (path); - GnomeThemeMetaInfo *theme; -+ g_free (path); - - theme = theme_meta_info_find (uri); - if (theme) |