Updated NEWS from 2.22 branch

svn path=/trunk/; revision=8638

NEWS

@@ -1,3 +1,55 @@
+gnome-control-center 2.22.1
+
+appearance:
+- Don't resize the font samples vertically when the window is resized
+  (Jens Granseuer) (#521823)
+- Fix warning when trying to drag an unselected item (Jens Granseuer)
+  (#523347)
+- Don't try to unref URIs if the theme package is invalid (Jens Granseuer)
+  (#524567)
+
+common:
+- Fix a crash when schemas are not properly installed (Jens Granseuer)
+  (#520744)
+- Fix error handling in the thumbnailer (Jens Granseuer) (#521009)
+- Actually check the cursor size before changing it in GConf (Jens Granseuer)
+
+keybindings:
+- Remove debugging output (Jens Granseuer)
+- Stop widget accelerators from activating while the user is entering
+  a new shortcut (Jens Granseuer) (#313228)
+- Fix category headers not appearing properly in the treeview when using
+  a non-UTF-8 locale (Bastien Nocera) (#513988)
+
+keyboard:
+- Don't crash when called for a drag with no selected items (Jens Granseuer)
+  (#523379)
+- Don't show the typing break tab if the typing monitor is not available
+  (Jens Granseuer) (#524034)
+
+sound:
+- Use new tango icon (Jaap A. Haitsma) (#523916)
+- Don't show modems in the device chooser (Jens Granseuer) (#523888)
+
+themus:
+- Handle failed thumbnailing attempts properly (Jens Granseuer)
+
+typing-break:
+- New Tango-style icons (David Prieto) (#523965)
+- Replace custom stop icon with gtk-stop stock icon (Jens Granseuer)
+
+updated translations:
+- en_GB (Philip Withnall)
+- et (Priit Laes)
+- he (Yair  Hershkovitz)
+- hu (Gabor Kelemen)
+- it (Luca Ferretti)
+- ja (Takeshi AIHANA)
+- ru (Yuri Kozlov)
+- te (Sunil Mohan Adapa)
+- tr (Baris Cicek)
+- vi (Nguyen Thaii Ngoc Duy)
+------------------------------------------------------------------------------
 gnome-control-center 2.22.0
 
 about-me:

capplets/appearance/Makefile.am

@@ -9,6 +9,8 @@ gnome_appearance_properties_SOURCES = \
 	appearance.h \
 	appearance-desktop.c \
 	appearance-desktop.h \
+	appearance-desktop-effects.c \
+	appearance-desktop-effects.h \
 	appearance-font.c \
 	appearance-font.h \
 	appearance-main.c \

capplets/appearance/appearance-desktop-effects.c

@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2007 The GNOME Foundation
+ * Written by Rodrigo Moya <rodrigo@gnome-db.org>
+ * All Rights Reserved
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "appearance.h"
+#include "wm-common.h"
+
+#include <string.h>
+#include <glib/gi18n.h>
+
+static void
+display_error (const gchar *message)
+{
+  GtkWidget *dialog;
+
+  dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
+				   GTK_MESSAGE_ERROR,
+				   GTK_BUTTONS_OK,
+				   message);
+
+  gtk_dialog_run (GTK_DIALOG (dialog));
+  gtk_widget_destroy (dialog);
+}
+
+static void
+set_busy (GtkWidget *widget, gboolean busy)
+{
+  GdkCursor *cursor;
+   
+  if (busy)
+    cursor = gdk_cursor_new (GDK_WATCH);
+  else
+    cursor = NULL;
+ 
+  gdk_window_set_cursor (widget->window, cursor);
+   
+  if (cursor)
+    gdk_cursor_unref (cursor);
+ 
+  gdk_flush ();
+}
+
+static void
+enable_desktop_effects_cb (GtkToggleButton *toggle_button, AppearanceData *data)
+{
+  GError *error = NULL;
+  gboolean toggled = gtk_toggle_button_get_active (toggle_button);
+  const gchar *cmd_line =  toggled ? "compiz --replace ccp" : "metacity --replace";
+
+  if (!g_spawn_command_line_async (cmd_line, &error)) {
+    display_error (error->message);
+    g_error_free (error);
+    gtk_toggle_button_set_active (toggle_button, !toggled);
+  } else {
+    gchar *wm_name = wm_common_get_current_window_manager ();
+
+    /* disable customize button for metacity */
+    if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->enable_effects_button))
+        && !strcmp (wm_name, "compiz"))
+      gtk_widget_show (data->customize_effects_button);
+    else
+      gtk_widget_hide (data->customize_effects_button);
+
+    g_free (wm_name);
+  }
+}
+
+static void
+customize_desktop_effects_cb (GtkButton *button, AppearanceData *data)
+{
+  GError *error = NULL;
+  gchar *wm_name;
+
+  wm_name = wm_common_get_current_window_manager ();
+
+  if (!strcmp (wm_name, "compiz")) {
+    if (!g_spawn_command_line_async ("ccsm", &error)) {
+      display_error (error->message);
+      g_error_free (error);
+    }
+  }
+
+  g_free (wm_name);
+}
+
+static void
+window_manager_changed_cb (gpointer wm_name, AppearanceData *data)
+{
+}
+
+void
+desktop_effects_init (AppearanceData *data)
+{
+  gchar *wm_name;
+
+  wm_common_register_window_manager_change ((GFunc) window_manager_changed_cb, data);
+  wm_name = wm_common_get_current_window_manager ();
+
+  /* initialize widgets */
+  data->enable_effects_button = glade_xml_get_widget (data->xml, "enable_desktop_effects");
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->enable_effects_button),
+				gtk_widget_is_composited (data->enable_effects_button));
+  g_signal_connect (G_OBJECT (data->enable_effects_button), "toggled",
+		    (GCallback) enable_desktop_effects_cb, data);
+
+  data->customize_effects_button = glade_xml_get_widget (data->xml, "customize_desktop_effects");
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->enable_effects_button))
+      && !strcmp (wm_name, "compiz"))
+    gtk_widget_show (data->customize_effects_button);
+  else
+    gtk_widget_hide (data->customize_effects_button);
+  g_signal_connect (G_OBJECT (data->customize_effects_button), "clicked",
+		    (GCallback) customize_desktop_effects_cb, data);
+
+  g_free (wm_name);
+}
+
+void
+desktop_effects_shutdown (AppearanceData *data)
+{
+}

capplets/appearance/appearance-desktop-effects.h

@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2008 The GNOME Foundation
+ * Written by Rodrigo Moya <rodrigo@gnome-db.org>
+ * All Rights Reserved
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+void desktop_effects_init (AppearanceData *data);
+void desktop_effects_shutdown (AppearanceData *data);

capplets/appearance/appearance-main.c

@@ -20,9 +20,10 @@
 
 #include "appearance.h"
 #include "appearance-desktop.h"
+#include "appearance-desktop-effects.h"
 #include "appearance-font.h"
-#include "appearance-themes.h"
 #include "appearance-style.h"
+#include "appearance-themes.h"
 #include "appearance-ui.h"
 #include "theme-installer.h"
 #include "theme-thumbnail.h"
@@ -79,6 +80,7 @@ main_window_response (GtkWidget *widget,
 
     themes_shutdown (data);
     style_shutdown (data);
+    desktop_effects_shutdown (data);
     desktop_shutdown (data);
     font_shutdown (data);
 
@@ -151,6 +153,7 @@ main (int argc, char **argv)
   themes_init (data);
   style_init (data);
   desktop_init (data, (const gchar **) wallpaper_files);
+  desktop_effects_init (data);
   g_strfreev (wallpaper_files);
   font_init (data);
   ui_init (data);

capplets/appearance/appearance.h

@@ -48,6 +48,10 @@ typedef struct {
   GtkWidget *wp_image;
   GSList *wp_uris;
 
+  /* desktop effects */
+  GtkWidget *enable_effects_button;
+  GtkWidget *customize_effects_button;
+
   /* font */
   GtkWidget *font_details;
   GSList *font_groups;