summaryrefslogtreecommitdiff
path: root/capplets
diff options
context:
space:
mode:
Diffstat (limited to 'capplets')
-rw-r--r--capplets/accessibility/keyboard/ChangeLog4
-rw-r--r--capplets/background/ChangeLog4
-rw-r--r--capplets/common/ChangeLog4
-rw-r--r--capplets/default-applications/ChangeLog4
-rw-r--r--capplets/desktop-links/ChangeLog4
-rw-r--r--capplets/desktop-links/Makefile.am4
-rw-r--r--capplets/file-types/ChangeLog4
-rw-r--r--capplets/font/ChangeLog4
-rw-r--r--capplets/keybindings/ChangeLog4
-rw-r--r--capplets/keyboard/ChangeLog4
-rw-r--r--capplets/mime-type/ChangeLog4
-rw-r--r--capplets/mouse/ChangeLog4
-rw-r--r--capplets/network/ChangeLog4
-rw-r--r--capplets/rollback/ChangeLog4
-rw-r--r--capplets/sound/ChangeLog4
-rw-r--r--capplets/theme-switcher/ChangeLog9
-rw-r--r--capplets/theme-switcher/theme-switcher.c35
-rw-r--r--capplets/ui-properties/ChangeLog4
-rw-r--r--capplets/url-properties/ChangeLog4
-rw-r--r--capplets/windows/ChangeLog4
-rw-r--r--capplets/windows/Makefile.am2
-rw-r--r--capplets/wm-properties/ChangeLog4
22 files changed, 117 insertions, 5 deletions
diff --git a/capplets/accessibility/keyboard/ChangeLog b/capplets/accessibility/keyboard/ChangeLog
index 42c1d1e3c..74a972a6f 100644
--- a/capplets/accessibility/keyboard/ChangeLog
+++ b/capplets/accessibility/keyboard/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-21 Jody Goldberg <jody@gnome.org>
+
+ * Release 2.1.0
+
2002-08-19 Ross Burton <ross@burtonini.com>
* accessibility-keyboard.desktop.in: Fix the desktop file so that
diff --git a/capplets/background/ChangeLog b/capplets/background/ChangeLog
index fe5eb1bf5..f9005607d 100644
--- a/capplets/background/ChangeLog
+++ b/capplets/background/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-21 Jody Goldberg <jody@gnome.org>
+
+ * Release 2.1.0
+
2002-08-19 Ross Burton <ross@burtonini.com>
* background.desktop.in: Fix the desktop file so that it
diff --git a/capplets/common/ChangeLog b/capplets/common/ChangeLog
index b913e7d6b..203013bee 100644
--- a/capplets/common/ChangeLog
+++ b/capplets/common/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-21 Jody Goldberg <jody@gnome.org>
+
+ * Release 2.1.0
+
2002-07-16 Jody Goldberg <jody@gnome.org>
* gconf-property-editor.c (gconf_value_int_to_float) : add a peditor
diff --git a/capplets/default-applications/ChangeLog b/capplets/default-applications/ChangeLog
index 72312a4fa..3bde6db91 100644
--- a/capplets/default-applications/ChangeLog
+++ b/capplets/default-applications/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-21 Jody Goldberg <jody@gnome.org>
+
+ * Release 2.1.0
+
2002-08-19 Ross Burton <ross@burtonini.com>
* default-applications.desktop.in: Fix the desktop file so that it
diff --git a/capplets/desktop-links/ChangeLog b/capplets/desktop-links/ChangeLog
index 3910f0fb1..6a87a145a 100644
--- a/capplets/desktop-links/ChangeLog
+++ b/capplets/desktop-links/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-21 Jody Goldberg <jody@gnome.org>
+
+ * Release 2.1.0
+
2002-06-17 Jody Goldberg <jody@gnome.org>
* Release 2.0.0
diff --git a/capplets/desktop-links/Makefile.am b/capplets/desktop-links/Makefile.am
index d024fe9a8..b7f8800e6 100644
--- a/capplets/desktop-links/Makefile.am
+++ b/capplets/desktop-links/Makefile.am
@@ -21,7 +21,7 @@ desktopfiles_DATA = $(desktop_files)
CLEANFILES = $(desktop_files) $(desktop_in_files)
EXTRA_DIST = $(desktop_in_in_files) $(groups_in_in_files) $(pixmaps_DATA)
-$(desktop_in_files): %.desktop.in: %.desktop.in.in
+%.desktop.in: $(srcdir)/%.desktop.in.in
sed s#Icon=#Icon=$(GNOMECC_ICONS_DIR)/# < $< > $@
@INTLTOOL_DESKTOP_RULE@
@@ -45,7 +45,7 @@ groups_in_in_files = $(groups_files:.directory=.directory.in.in)
Gnomeccdir = $(datadir)/gnome/vfolders
Gnomecc_DATA = $(groups_files)
-$(groups_in_files): %.directory.in: %.directory.in.in
+%.directory.in: $(srcdir)/%.directory.in.in
sed s#Icon=#Icon=$(pixmapsdir)/# < $< > $@
@INTLTOOL_DIRECTORY_RULE@
diff --git a/capplets/file-types/ChangeLog b/capplets/file-types/ChangeLog
index a0e4a5162..aa7a2d61f 100644
--- a/capplets/file-types/ChangeLog
+++ b/capplets/file-types/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-21 Jody Goldberg <jody@gnome.org>
+
+ * Release 2.1.0
+
2002-08-19 Ross Burton <ross@burtonini.com>
* file-types.desktop.in: Fix the desktop file so that it
diff --git a/capplets/font/ChangeLog b/capplets/font/ChangeLog
index 135c99c82..46842cb07 100644
--- a/capplets/font/ChangeLog
+++ b/capplets/font/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-21 Jody Goldberg <jody@gnome.org>
+
+ * Release 2.1.0
+
2002-08-19 Ross Burton <ross@burtonini.com>
* font-properties.desktop.in: Fix the desktop file so that it
diff --git a/capplets/keybindings/ChangeLog b/capplets/keybindings/ChangeLog
index 9a4a35c6d..1d5602ed8 100644
--- a/capplets/keybindings/ChangeLog
+++ b/capplets/keybindings/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-21 Jody Goldberg <jody@gnome.org>
+
+ * Release 2.1.0
+
Mon Aug 19 17:54:07 2002 Jonathan Blandford <jrb@redhat.com>
* gnome-keybinding-properties.c (metacity_key_list): fix bindings
diff --git a/capplets/keyboard/ChangeLog b/capplets/keyboard/ChangeLog
index d9ad23abf..dd1e33d87 100644
--- a/capplets/keyboard/ChangeLog
+++ b/capplets/keyboard/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-21 Jody Goldberg <jody@gnome.org>
+
+ * Release 2.1.0
+
2002-08-19 Ross Burton <ross@burtonini.com>
* keyboard.desktop.in: Fix the desktop file so that it validates.
diff --git a/capplets/mime-type/ChangeLog b/capplets/mime-type/ChangeLog
index 5ba808fcb..2751a2287 100644
--- a/capplets/mime-type/ChangeLog
+++ b/capplets/mime-type/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-21 Jody Goldberg <jody@gnome.org>
+
+ * Release 2.1.0
+
2002-06-17 Jody Goldberg <jody@gnome.org>
* Release 2.0.0
diff --git a/capplets/mouse/ChangeLog b/capplets/mouse/ChangeLog
index 8ab1d443d..a7d05753a 100644
--- a/capplets/mouse/ChangeLog
+++ b/capplets/mouse/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-21 Jody Goldberg <jody@gnome.org>
+
+ * Release 2.1.0
+
2002-08-19 Ross Burton <ross@burtonini.com>
* mouse.desktop.in: Fix the desktop file so that it validates.
diff --git a/capplets/network/ChangeLog b/capplets/network/ChangeLog
index 8206a8420..a1b83e4a0 100644
--- a/capplets/network/ChangeLog
+++ b/capplets/network/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-21 Jody Goldberg <jody@gnome.org>
+
+ * Release 2.1.0
+
2002-08-19 Ross Burton <ross@burtonini.com>
* gnome-network-preferences.desktop.in: Fix the desktop file so
diff --git a/capplets/rollback/ChangeLog b/capplets/rollback/ChangeLog
index 298559eb0..a6a703b12 100644
--- a/capplets/rollback/ChangeLog
+++ b/capplets/rollback/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-21 Jody Goldberg <jody@gnome.org>
+
+ * Release 2.1.0
+
2002-06-17 Jody Goldberg <jody@gnome.org>
* Release 2.0.0
diff --git a/capplets/sound/ChangeLog b/capplets/sound/ChangeLog
index cf421f6da..7a964f4e3 100644
--- a/capplets/sound/ChangeLog
+++ b/capplets/sound/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-21 Jody Goldberg <jody@gnome.org>
+
+ * Release 2.1.0
+
2002-08-19 Ross Burton <ross@burtonini.com>
* sound.desktop.in: Fix the desktop file so that it validates.
diff --git a/capplets/theme-switcher/ChangeLog b/capplets/theme-switcher/ChangeLog
index 90ece487d..533e41d12 100644
--- a/capplets/theme-switcher/ChangeLog
+++ b/capplets/theme-switcher/ChangeLog
@@ -1,3 +1,12 @@
+2002-08-21 Jody Goldberg <jody@gnome.org>
+
+ * Release 2.1.0
+
+2002-08-01 Christophe Fergeau <teuf@users.sourceforge.net>
+
+ * theme-switcher.c : correctly deal with bzip2
+ compressed theme files
+
2002-08-19 Ross Burton <ross@burtonini.com>
* gtk-theme-selector.desktop.in: Fix the desktop file so that it
diff --git a/capplets/theme-switcher/theme-switcher.c b/capplets/theme-switcher/theme-switcher.c
index 937a8e0ef..244d244c3 100644
--- a/capplets/theme-switcher/theme-switcher.c
+++ b/capplets/theme-switcher/theme-switcher.c
@@ -451,7 +451,7 @@ transfer_cancel_cb (GtkWidget *dlg, gchar *path)
* see bugzilla.gnome.org #86141 for details
*/
static gboolean
-transfer_done_idle_cb (gpointer data)
+transfer_done_targz_idle_cb (gpointer data)
{
int status;
gchar *command;
@@ -496,12 +496,43 @@ window_show_manage_themes (GtkWidget *button, gpointer data)
g_free (command);
}
+
+/* this works around problems when doing fork/exec in a threaded app
+ * with some locks being held/waited on in different threads.
+ *
+ * we do the idle callback so that the async xfer has finished and
+ * cleaned up its vfs job. otherwise it seems the slave thread gets
+ * woken up and it removes itself from the job queue before it is
+ * supposed to. very strange.
+ *
+ * see bugzilla.gnome.org #86141 for details
+ */
+static gboolean
+transfer_done_tarbz2_idle_cb (gpointer data)
+{
+ int status;
+ gchar *command;
+ gchar *path = data;
+
+ /* this should be something more clever and nonblocking */
+ command = g_strdup_printf ("sh -c 'bzip2 -d -c < \"%s\" | tar xf - -C \"%s/.themes\"'",
+ path, g_get_home_dir ());
+ if (g_spawn_command_line_sync (command, NULL, NULL, &status, NULL) && status == 0)
+ gnome_vfs_unlink (path);
+ g_free (command);
+ g_free (path);
+
+ return FALSE;
+}
+
static void
transfer_done_cb (GtkWidget *dlg, gchar *path)
{
int len = strlen (path);
if (path && len > 7 && !strcmp (path + len - 7, ".tar.gz"))
- g_idle_add (transfer_done_idle_cb, path);
+ g_idle_add (transfer_done_targz_idle_cb, path);
+ if (path && len > 8 && !strcmp (path + len - 8, ".tar.bz2"))
+ g_idle_add (transfer_done_tarbz2_idle_cb, path);
gtk_widget_destroy (dlg);
}
diff --git a/capplets/ui-properties/ChangeLog b/capplets/ui-properties/ChangeLog
index 5cc624dba..c943cf142 100644
--- a/capplets/ui-properties/ChangeLog
+++ b/capplets/ui-properties/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-21 Jody Goldberg <jody@gnome.org>
+
+ * Release 2.1.0
+
2002-08-19 Ross Burton <ross@burtonini.com>
* behavior.desktop.in: Fix the desktop file so that it validates.
diff --git a/capplets/url-properties/ChangeLog b/capplets/url-properties/ChangeLog
index 4ee0601c0..dd29cd057 100644
--- a/capplets/url-properties/ChangeLog
+++ b/capplets/url-properties/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-21 Jody Goldberg <jody@gnome.org>
+
+ * Release 2.1.0
+
2002-06-17 Jody Goldberg <jody@gnome.org>
* Release 2.0.0
diff --git a/capplets/windows/ChangeLog b/capplets/windows/ChangeLog
index 878fc8a72..2518b3afd 100644
--- a/capplets/windows/ChangeLog
+++ b/capplets/windows/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-21 Jody Goldberg <jody@gnome.org>
+
+ * Release 2.1.0
+
2002-08-19 Ross Burton <ross@burtonini.com>
* window-properties.desktop.in: Fix the desktop file so it
diff --git a/capplets/windows/Makefile.am b/capplets/windows/Makefile.am
index 81798bd47..92370e78d 100644
--- a/capplets/windows/Makefile.am
+++ b/capplets/windows/Makefile.am
@@ -41,7 +41,7 @@ Desktop_in_files = window-properties.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) \
- -I $(top_builddir)/libwindow-settings \
+ -I $(top_srcdir)/libwindow-settings \
-DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(libdir)/window-manager-settings"\" \
-DMETACITY_THEME_DIR=\""$(datadir)/metacity/themes"\"
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
diff --git a/capplets/wm-properties/ChangeLog b/capplets/wm-properties/ChangeLog
index 409a5e5ce..01b051aa4 100644
--- a/capplets/wm-properties/ChangeLog
+++ b/capplets/wm-properties/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-21 Jody Goldberg <jody@gnome.org>
+
+ * Release 2.1.0
+
2002-06-17 Jody Goldberg <jody@gnome.org>
* Release 2.0.0
View Lorry Controller Status