- outdated

Changed files:
    control-center-am17.patch -> 1.3
    control-center-home-themes-fix.patch -> 1.2
    control-center-link.patch -> 1.2
    control-center-pixmaps-dirs.patch -> 1.2
    control-center-report-no-theme.patch -> 1.2
    control-center-themus-glade.patch -> 1.3

diff --git a/control-center-am17.patch b/control-center-am17.patch
deleted file mode 100644 (file)
index 3dd1396..0000000
--- a/control-center-am17.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -urN control-center-2.3.5.orig/gnome-settings-daemon/Makefile.am control-center-2.3.5/gnome-settings-daemon/Makefile.am
---- control-center-2.3.5.orig/gnome-settings-daemon/Makefile.am        Tue Aug 12 06:23:31 2003
-+++ control-center-2.3.5/gnome-settings-daemon/Makefile.am     Tue Aug 12 06:24:58 2003
-@@ -89,4 +89,4 @@
- CLEANFILES = $(BUILT_SOURCES)
- 
- EXTRA_DIST =                                          \
--      $(server_in_files)                              \
-+      $(server_in_files)                              

diff --git a/control-center-home-themes-fix.patch b/control-center-home-themes-fix.patch
deleted file mode 100644 (file)
index 3a9e1b7..0000000
--- a/control-center-home-themes-fix.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Nuard control-center-2.4.0.orig/capplets/theme-switcher/gnome-theme-installer.c control-center-2.4.0/capplets/theme-switcher/gnome-theme-installer.c
---- control-center-2.4.0.orig/capplets/theme-switcher/gnome-theme-installer.c  2003-01-16 08:40:29.000000000 +0100
-+++ control-center-2.4.0/capplets/theme-switcher/gnome-theme-installer.c       2003-11-19 23:45:37.518048240 +0100
-@@ -105,6 +105,7 @@
-       GnomeVFSURI *src_uri;
-       const gchar *raw;
-       gboolean icon_theme;
-+      gchar *temppath;
-       
-       if (response_id == GTK_RESPONSE_HELP) {
-               capplet_help (GTK_WINDOW (widget),
-@@ -133,6 +134,33 @@
-                       path = g_build_filename (g_get_home_dir (), ".icons", base, NULL);
-               else
-                       path = g_build_filename (g_get_home_dir (), ".themes", base, NULL);
-+
-+              /* To avoid the copy of /root/.themes to /root/.themes/.themes 
-+               * which causes an infinite loop. The user asks to transfer the all 
-+         * contents of a folder, to a folder under itseld. So ignore the              
-+               * situation.           
-+               */
-+              temppath = g_build_filename (filename, ".themes", NULL);
-+              if (!strcmp(temppath, path))    {
-+            GtkWidget *dialog;
-+
-+            dialog = gtk_message_dialog_new (NULL,
-+                                     GTK_DIALOG_MODAL,
-+                                     GTK_MESSAGE_ERROR,
-+                                     GTK_BUTTONS_OK,
-+                                     _("%s is the path where the theme files will be installed. This can not be selected as the source location"), filename);
-+        gtk_dialog_run (GTK_DIALOG (dialog));
-+                gtk_widget_destroy (dialog);
-+                      
-+                      g_free (base);
-+                      g_free (filename);
-+                      g_free(temppath);                       
-+                      return;
-+              }
-+              g_free(temppath);
-+                      
-+
-+
-               target = g_list_append (NULL, gnome_vfs_uri_new (path));
-               
-               dlg = file_transfer_dialog_new ();

diff --git a/control-center-link.patch b/control-center-link.patch
deleted file mode 100644 (file)
index c441b31..0000000
--- a/control-center-link.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN aaa/control-center-2.3.4/gnome-settings-daemon/Makefile.am control-center-2.3.4/gnome-settings-daemon/Makefile.am
---- aaa/control-center-2.3.4/gnome-settings-daemon/Makefile.am 2003-06-29 21:39:32.000000000 +0200
-+++ control-center-2.3.4/gnome-settings-daemon/Makefile.am     2003-08-01 01:32:46.000000000 +0200
-@@ -52,7 +52,7 @@
-       $(GNOME_SETTINGS_DAEMON_LIBS)                                   \
-       $(top_builddir)/libbackground/libbackground.la                  \
-       $(top_builddir)/libsounds/libsounds.a                           \
--      -L$(top_builddir)/libwindow-settings/ -lgnome-window-settings   \
-+      $(top_builddir)/libwindow-settings/libgnome-window-settings.la  \
-       $(XF86MISC_LIBS)
- 
- #AccessX_files = \

diff --git a/control-center-pixmaps-dirs.patch b/control-center-pixmaps-dirs.patch
deleted file mode 100644 (file)
index 3abd3d8..0000000
--- a/control-center-pixmaps-dirs.patch
+++ /dev/null
@@ -1,281 +0,0 @@
-diff -Nuard control-center-2.4.0.orig/capplets/accessibility/at-properties/Makefile.am control-center-2.4.0/capplets/accessibility/at-properties/Makefile.am
---- control-center-2.4.0.orig/capplets/accessibility/at-properties/Makefile.am 2003-06-25 19:37:32.000000000 +0200
-+++ control-center-2.4.0/capplets/accessibility/at-properties/Makefile.am      2003-11-09 01:23:35.000000000 +0100
-@@ -9,16 +9,12 @@
- 
- @INTLTOOL_DESKTOP_RULE@
- 
--iconsdir   = $(GNOMECC_ICONS_DIR)
--icons_DATA = at-enable-capplet.png
--
- desktopdir = $(GNOMECC_DESKTOP_DIR)
- Desktop_in_files = at-properties.desktop.in
- desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
- 
- pixmapdir  = $(GNOMECC_PIXMAPS_DIR)
- pixmap_DATA =                                 \
--      at-enable-capplet.png                   \
-       at-startup.png                          \
-       at-support.png
- 
-@@ -33,4 +29,4 @@
-            -DGLADEDIR=\""$(gladedir)"\" \
-            -DPIXMAPDIR=\""$(pixmapdir)"\"
- CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
--EXTRA_DIST = $(icons_DATA) $(glade_DATA) $(pixmap_DATA) $(Desktop_in_files)
-+EXTRA_DIST = $(glade_DATA) $(pixmap_DATA) $(Desktop_in_files)
-diff -Nuard control-center-2.4.0.orig/capplets/accessibility/keyboard/Makefile.am control-center-2.4.0/capplets/accessibility/keyboard/Makefile.am
---- control-center-2.4.0.orig/capplets/accessibility/keyboard/Makefile.am      2002-06-18 20:55:04.000000000 +0200
-+++ control-center-2.4.0/capplets/accessibility/keyboard/Makefile.am   2003-11-09 00:42:04.000000000 +0100
-@@ -26,8 +26,8 @@
- Gladedir   = $(GNOMECC_GLADE_DIR)
- Glade_DATA = gnome-accessibility-keyboard-properties.glade
- 
--iconsdir   = $(GNOMECC_ICONS_DIR)
--icons_DATA = accessibility-keyboard-capplet.png
-+#iconsdir   = $(GNOMECC_ICONS_DIR)
-+#icons_DATA = accessibility-keyboard-capplet.png
- 
- desktop_iconsdir = $(datadir)/pixmaps
- desktop_icons_DATA = accessibility-keyboard-capplet.png
-@@ -38,5 +38,5 @@
- 
- INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
- CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
--EXTRA_DIST = $(Glade_DATA) $(icons_DATA) $(Desktop_in_files) $(pixmap_DATA)
-+EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files) $(pixmap_DATA)
- 
-diff -Nuard control-center-2.4.0.orig/capplets/background/Makefile.am control-center-2.4.0/capplets/background/Makefile.am
---- control-center-2.4.0.orig/capplets/background/Makefile.am  2002-04-02 02:27:40.000000000 +0200
-+++ control-center-2.4.0/capplets/background/Makefile.am       2003-11-09 00:41:28.000000000 +0100
-@@ -8,8 +8,8 @@
- Gladedir   = $(GNOMECC_GLADE_DIR)
- Glade_DATA = background-properties.glade
- 
--iconsdir   = $(GNOMECC_ICONS_DIR)
--icons_DATA = background-capplet.png
-+#iconsdir   = $(GNOMECC_ICONS_DIR)
-+#icons_DATA = background-capplet.png
- 
- desktop_iconsdir = $(datadir)/pixmaps
- desktop_icons_DATA = background-capplet.png
-@@ -20,5 +20,5 @@
- 
- INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS) -I$(top_srcdir)/libbackground
- CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
--EXTRA_DIST = $(Glade_DATA) $(icons_DATA) $(Desktop_in_files)
-+EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files)
- 
-diff -Nuard control-center-2.4.0.orig/capplets/default-applications/Makefile.am control-center-2.4.0/capplets/default-applications/Makefile.am
---- control-center-2.4.0.orig/capplets/default-applications/Makefile.am        2002-04-10 08:07:58.000000000 +0200
-+++ control-center-2.4.0/capplets/default-applications/Makefile.am     2003-11-09 00:24:30.000000000 +0100
-@@ -6,8 +6,8 @@
- 
- @INTLTOOL_DESKTOP_RULE@
- 
--iconsdir   = $(GNOMECC_ICONS_DIR)
--icons_DATA = default-applications-capplet.png
-+#iconsdir   = $(GNOMECC_ICONS_DIR)
-+#icons_DATA = default-applications-capplet.png
- 
- desktop_iconsdir = $(datadir)/pixmaps
- desktop_icons_DATA = default-applications-capplet.png
-@@ -21,4 +21,4 @@
- 
- INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
- CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
--EXTRA_DIST = $(Glade_DATA) $(icons_DATA) $(Desktop_in_files) gnome-default-applications-properties-structs.c
-+EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files) gnome-default-applications-properties-structs.c
-diff -Nuard control-center-2.4.0.orig/capplets/desktop-links/Makefile.am control-center-2.4.0/capplets/desktop-links/Makefile.am
---- control-center-2.4.0.orig/capplets/desktop-links/Makefile.am       2002-12-06 11:53:21.000000000 +0100
-+++ control-center-2.4.0/capplets/desktop-links/Makefile.am    2003-11-09 01:29:07.000000000 +0100
-@@ -3,14 +3,13 @@
- 
- ## Pixmaps
- 
--pixmaps_pre = $(capplets:=-capplet.png)
--pixmaps_DATA = $(pixmaps_pre) accessibility-directory.png
--pixmapsdir = $(GNOMECC_ICONS_DIR)
--
- ##
- ##  Desktop files
- ##
- 
-+desktop_iconsdir = $(datadir)/pixmaps
-+desktop_icons_DATA = accessibility-directory.png
-+
- desktop_files = $(capplets:=.desktop)
- desktop_in_files = $(desktop_files:.desktop=.desktop.in)
- desktop_in_in_files = $(desktop_files:.desktop=.desktop.in.in)
-@@ -19,10 +18,10 @@
- desktopfiles_DATA = $(desktop_files)
- 
- CLEANFILES = $(desktop_files) $(desktop_in_files)
--EXTRA_DIST = $(desktop_in_in_files) $(groups_in_in_files) $(pixmaps_DATA)
-+EXTRA_DIST = $(desktop_in_in_files) $(groups_in_in_files)
- 
- %.desktop.in: $(srcdir)/%.desktop.in.in
--          sed s#Icon=#Icon=$(GNOMECC_ICONS_DIR)/# < $< > $@
-+          sed s#Icon=#Icon=# < $< > $@
- 
- @INTLTOOL_DESKTOP_RULE@
- 
-@@ -46,6 +45,6 @@
- Gnomecc_DATA = $(groups_files)
- 
- %.directory.in: $(srcdir)/%.directory.in.in
--          sed s#Icon=#Icon=$(pixmapsdir)/# < $< > $@
-+          sed s#Icon=#Icon=# < $< > $@
- 
- @INTLTOOL_DIRECTORY_RULE@
-diff -Nuard control-center-2.4.0.orig/capplets/display/Makefile.am control-center-2.4.0/capplets/display/Makefile.am
---- control-center-2.4.0.orig/capplets/display/Makefile.am     2003-04-23 17:01:16.000000000 +0200
-+++ control-center-2.4.0/capplets/display/Makefile.am  2003-11-09 00:28:11.000000000 +0100
-@@ -7,8 +7,8 @@
- 
- @INTLTOOL_DESKTOP_RULE@
- 
--iconsdir   = $(GNOMECC_ICONS_DIR)
--icons_DATA = display-capplet.png
-+#iconsdir   = $(GNOMECC_ICONS_DIR)
-+#icons_DATA = display-capplet.png
- 
- desktop_iconsdir = $(datadir)/pixmaps
- desktop_icons_DATA = display-capplet.png
-@@ -23,4 +23,4 @@
-            -DPIXMAPDIR=\""$(pixmapdir)"\"
- 
- CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
--EXTRA_DIST = $(Desktop_in_files) $(icons_DATA)
-+EXTRA_DIST = $(Desktop_in_files)
-diff -Nuard control-center-2.4.0.orig/capplets/font/Makefile.am control-center-2.4.0/capplets/font/Makefile.am
---- control-center-2.4.0.orig/capplets/font/Makefile.am        2002-07-24 19:36:30.000000000 +0200
-+++ control-center-2.4.0/capplets/font/Makefile.am     2003-11-09 00:29:04.000000000 +0100
-@@ -7,8 +7,8 @@
- 
- @INTLTOOL_DESKTOP_RULE@
- 
--iconsdir   = $(GNOMECC_ICONS_DIR)
--icons_DATA = font-capplet.png
-+#iconsdir   = $(GNOMECC_ICONS_DIR)
-+#icons_DATA = font-capplet.png
- 
- pixmapdir  = $(GNOMECC_PIXMAPS_DIR)
- pixmap_DATA =                                 \
-@@ -32,4 +32,4 @@
-            -DGLADEDIR=\""$(gladedir)"\" \
-            -DPIXMAPDIR=\""$(pixmapdir)"\"
- CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
--EXTRA_DIST = $(Desktop_in_files) $(icons_DATA) $(glade_DATA) $(pixmap_DATA)
-+EXTRA_DIST = $(Desktop_in_files) $(glade_DATA) $(pixmap_DATA)
-diff -Nuard control-center-2.4.0.orig/capplets/keybindings/Makefile.am control-center-2.4.0/capplets/keybindings/Makefile.am
---- control-center-2.4.0.orig/capplets/keybindings/Makefile.am 2002-08-13 20:14:39.000000000 +0200
-+++ control-center-2.4.0/capplets/keybindings/Makefile.am      2003-11-09 00:43:28.000000000 +0100
-@@ -14,8 +14,8 @@
- Gladedir   = $(GNOMECC_GLADE_DIR)
- Glade_DATA = gnome-keybinding-properties.glade
- 
--pixmapsdir = $(datadir)/pixmaps
--pixmaps_DATA = keyboard-shortcut.png
-+desktop_iconsdir = $(datadir)/pixmaps
-+desktop_icons_DATA = keyboard-shortcut.png
- 
- desktopdir = $(GNOMECC_DESKTOP_DIR)
- Desktop_in_files = keybinding.desktop.in
-@@ -23,5 +23,5 @@
- 
- INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
- CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
--EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files) $(pixmaps_DATA)
-+EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files)
- 
-diff -Nuard control-center-2.4.0.orig/capplets/keyboard/Makefile.am control-center-2.4.0/capplets/keyboard/Makefile.am
---- control-center-2.4.0.orig/capplets/keyboard/Makefile.am    2002-04-10 08:08:02.000000000 +0200
-+++ control-center-2.4.0/capplets/keyboard/Makefile.am 2003-11-09 00:45:04.000000000 +0100
-@@ -11,14 +11,13 @@
- Glade_DATA = gnome-keyboard-properties.glade
- 
- iconsdir   = $(GNOMECC_PIXMAPS_DIR)
--icons_DATA = keyboard-capplet.png     \
--      keyboard-repeat.png             \
-+icons_DATA = keyboard-repeat.png              \
-       keyboard-cursor.png             \
-       keyboard-volume.png             \
-       keyboard-bell.png
- 
--pixmapsdir = $(datadir)/pixmaps
--pixmaps_DATA = keyboard-capplet.png
-+desktop_iconsdir = $(datadir)/pixmaps
-+desktop_icons_DATA = keyboard-capplet.png
- 
- desktopdir = $(GNOMECC_DESKTOP_DIR)
- Desktop_in_files = keyboard.desktop.in
-diff -Nuard control-center-2.4.0.orig/capplets/mouse/Makefile.am control-center-2.4.0/capplets/mouse/Makefile.am
---- control-center-2.4.0.orig/capplets/mouse/Makefile.am       2003-01-08 08:04:42.000000000 +0100
-+++ control-center-2.4.0/capplets/mouse/Makefile.am    2003-11-09 00:45:23.000000000 +0100
-@@ -27,9 +27,6 @@
- Gladedir   = $(GNOMECC_GLADE_DIR)
- Glade_DATA = gnome-mouse-properties.glade
- 
--iconsdir   = $(GNOMECC_ICONS_DIR)
--icons_DATA = mouse-capplet.png
--
- desktop_iconsdir = $(datadir)/pixmaps
- desktop_icons_DATA = mouse-capplet.png
- 
-@@ -39,4 +36,4 @@
- 
- INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
- CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
--EXTRA_DIST = $(Glade_DATA) $(icons_DATA) $(Desktop_in_files) $(pixmap_DATA) $(cursorfont_DATA)
-+EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files) $(pixmap_DATA) $(cursorfont_DATA)
-diff -Nuard control-center-2.4.0.orig/capplets/ui-properties/Makefile.am control-center-2.4.0/capplets/ui-properties/Makefile.am
---- control-center-2.4.0.orig/capplets/ui-properties/Makefile.am       2002-04-10 08:08:05.000000000 +0200
-+++ control-center-2.4.0/capplets/ui-properties/Makefile.am    2003-11-09 00:46:57.000000000 +0100
-@@ -6,9 +6,6 @@
- 
- @INTLTOOL_DESKTOP_RULE@
- 
--iconsdir   = $(GNOMECC_ICONS_DIR)
--icons_DATA = behavior-capplet.png
--
- desktop_iconsdir = $(datadir)/pixmaps
- desktop_icons_DATA = behavior-capplet.png
- 
-@@ -19,4 +16,4 @@
- Glade_DATA = gnome-ui-properties.glade
- INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
- CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
--EXTRA_DIST = $(Glade_DATA) $(icons_DATA) $(Desktop_in_files)
-+EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files)
-diff -Nuard control-center-2.4.0.orig/capplets/windows/Makefile.am control-center-2.4.0/capplets/windows/Makefile.am
---- control-center-2.4.0.orig/capplets/windows/Makefile.am     2002-10-29 07:19:51.000000000 +0100
-+++ control-center-2.4.0/capplets/windows/Makefile.am  2003-11-09 00:38:50.000000000 +0100
-@@ -14,9 +14,6 @@
- gladedir   = $(GNOMECC_GLADE_DIR)
- glade_DATA = gnome-window-properties.glade
- 
--iconsdir   = $(GNOMECC_ICONS_DIR)
--icons_DATA = window-capplet.png
--
- desktop_iconsdir = $(datadir)/pixmaps
- desktop_icons_DATA = window-capplet.png
- 
-@@ -31,5 +28,5 @@
-            -DPIXMAPDIR=\""$(pixmapdir)"\"
- 
- CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
--EXTRA_DIST = $(glade_DATA) $(icons_DATA) $(Desktop_in_files) $(pixmap_DATA)
-+EXTRA_DIST = $(glade_DATA) $(Desktop_in_files) $(pixmap_DATA)
- 
-diff -Nuard control-center-2.4.0.orig/control-center/Makefile.am control-center-2.4.0/control-center/Makefile.am
---- control-center-2.4.0.orig/control-center/Makefile.am       2003-05-07 20:55:08.000000000 +0200
-+++ control-center-2.4.0/control-center/Makefile.am    2003-11-08 23:49:14.000000000 +0100
-@@ -15,7 +15,6 @@
- 
- INCLUDES =                                                    \
-       -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"  \
--      -DSETTINGS_DIR=\""$(GNOMECC_DESKTOP_DIR)"\"             \
-       -DGNOMECC_ICONS_DIR=\""$(GNOMECC_ICONS_DIR)"\"          \
-       -DPIXMAP_DIR=\""$(datadir)/pixmaps"\"                   \
-       -DART_DIR=\""$(splashdir)"\"                            \

diff --git a/control-center-report-no-theme.patch b/control-center-report-no-theme.patch
deleted file mode 100644 (file)
index dee3110..0000000
--- a/control-center-report-no-theme.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Nuard control-center-2.4.0.orig/capplets/theme-switcher/gnome-theme-installer.c control-center-2.4.0/capplets/theme-switcher/gnome-theme-installer.c
---- control-center-2.4.0.orig/capplets/theme-switcher/gnome-theme-installer.c  2003-01-16 08:40:29.000000000 +0100
-+++ control-center-2.4.0/capplets/theme-switcher/gnome-theme-installer.c       2003-11-20 00:04:11.684669168 +0100
-@@ -116,16 +116,38 @@
-       if (response_id == 0) {
-               icon_theme = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "icon_theme"));
-               raw = gtk_entry_get_text (GTK_ENTRY (gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (WID ("install_theme_picker")))));
--              if (raw == NULL || strlen (raw) <= 0)
-+              if (raw == NULL || strlen (raw) <= 0)   {
-+              GtkWidget *dialog;
-+
-+              dialog = gtk_message_dialog_new (NULL,
-+                                     GTK_DIALOG_MODAL,
-+                                     GTK_MESSAGE_ERROR,
-+                                     GTK_BUTTONS_OK,
-+                                     _("No theme file location specified to install"));
-+          gtk_dialog_run (GTK_DIALOG (dialog));
-+                  gtk_widget_destroy (dialog);                        
-                       return;
-+                      
-+              }
-+
- 
-               if (strncmp (raw, "http://", 7) && strncmp (raw, "ftp://", 6) && *raw != '/')
-                       filename = gnome_file_entry_get_full_path (GNOME_FILE_ENTRY (WID ("install_theme_picker")), TRUE);
-               else
-                       filename = g_strdup (raw);
--              if (filename == NULL)
--                      return;
-+              if (filename == NULL)   {
-+              GtkWidget *dialog;
- 
-+              dialog = gtk_message_dialog_new (NULL,
-+                                     GTK_DIALOG_MODAL,
-+                                     GTK_MESSAGE_ERROR,
-+                                     GTK_BUTTONS_OK,
-+                                     _("The theme file location specified to install is invalid"));
-+          gtk_dialog_run (GTK_DIALOG (dialog));
-+                  gtk_widget_destroy (dialog);                        
-+                      return;
-+              }
-+                      
-               src_uri = gnome_vfs_uri_new (filename);
-               base = gnome_vfs_uri_extract_short_name (src_uri);
-               src = g_list_append (NULL, src_uri);

diff --git a/control-center-themus-glade.patch b/control-center-themus-glade.patch
deleted file mode 100644 (file)
index 74950e0..0000000
--- a/control-center-themus-glade.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -Nuard control-center-2.4.0.orig/vfs-methods/themus/Makefile.am control-center-2.4.0/vfs-methods/themus/Makefile.am
---- control-center-2.4.0.orig/vfs-methods/themus/Makefile.am   2003-08-28 01:01:56.000000000 +0200
-+++ control-center-2.4.0/vfs-methods/themus/Makefile.am        2003-11-11 01:55:19.000000000 +0100
-@@ -2,6 +2,7 @@
-   $(THEMUS_THUMBNAILER_CFLAGS) \
-   $(THEMUS_COMPONENT_CFLAGS) \
-   -I$(top_srcdir)/capplets/common \
-+  -DGNOMECC_GLADE_DIR=\"$(GNOMECC_GLADE_DIR)\" \
-   -DDIRECTORY_DIR=\"$(vfsdirectorydir)\" \
-   -DDATA_DIR=\"$(datadir)/themus\"
- 
-@@ -39,7 +40,8 @@
-       themus-properties-view.h \
-       themus-properties-main.c
- 
--pkgdata_DATA = apply-font.glade
-+Gladedir   = $(GNOMECC_GLADE_DIR)
-+Glade_DATA = apply-font.glade
- 
- @INTLTOOL_DIRECTORY_RULE@
- 
-@@ -78,6 +80,7 @@
- @INTLTOOL_SCHEMAS_RULE@
- 
- EXTRA_DIST = \
-+  $(Glade_DATA) \
-   apply-font.glade \
-   theme-method.directory.in \
-   theme-method.conf \
-diff -Nuard control-center-2.4.0.orig/vfs-methods/themus/themus-theme-applier.c control-center-2.4.0/vfs-methods/themus/themus-theme-applier.c
---- control-center-2.4.0.orig/vfs-methods/themus/themus-theme-applier.c        2003-07-24 23:06:38.000000000 +0200
-+++ control-center-2.4.0/vfs-methods/themus/themus-theme-applier.c     2003-11-11 01:56:31.000000000 +0100
-@@ -69,7 +69,7 @@
-               if (theme->application_font)
-               {
-                       glade_init ();
--                      font_xml = glade_xml_new (DATA_DIR "/apply-font.glade",
-+                      font_xml = glade_xml_new (GNOMECC_GLADE_DIR "/apply-font.glade",
-                                                               NULL, NULL);
-                       if (font_xml)
-                       {