gnome-settings-daemon r118 - in trunk: . plugins/clipboard

[jensg svn gnome org]

Author: jensg
Date: Fri Feb  8 17:16:58 2008
New Revision: 118
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=118&view=rev

Log:
2008-02-08  Jens Granseuer  <jensgr gmx net>

	* plugins/clipboard/gsd-clipboard-manager.c:
	(gsd_kbd_a11y_error_quark), (gsd_clipboard_manager_start): make sure
	we return a GError if initialization fails


Modified:
   trunk/ChangeLog
   trunk/plugins/clipboard/gsd-clipboard-manager.c

Modified: trunk/plugins/clipboard/gsd-clipboard-manager.c
==============================================================================
--- trunk/plugins/clipboard/gsd-clipboard-manager.c	(original)
+++ trunk/plugins/clipboard/gsd-clipboard-manager.c	Fri Feb  8 17:16:58 2008
@@ -81,8 +81,11 @@
         int         offset;
 } IncrConversion;
 
+#define GSD_CLIPBOARD_ERROR gsd_clipboard_error_quark ()
+
 enum {
-        PROP_0,
+        GSD_CLIPBOARD_ERROR_RUNNING,
+        GSD_CLIPBOARD_ERROR_FAILED
 };
 
 static void     gsd_clipboard_manager_class_init  (GsdClipboardManagerClass *klass);
@@ -99,6 +102,11 @@
 
 static gpointer manager_object = NULL;
 
+static GQuark
+gsd_kbd_a11y_error_quark (void)
+{
+        return g_quark_from_static_string ("gsd-kbd-a11y-error-quark");
+}
 
 /* We need to use reference counting for the target data, since we may
  * need to keep the data around after loosing the CLIPBOARD ownership
@@ -861,6 +869,9 @@
 
         /* check if there is a clipboard manager running */
         if (XGetSelectionOwner (manager->priv->display, XA_CLIPBOARD_MANAGER)) {
+        	g_set_error (error, GSD_CLIPBOARD_ERROR,
+        	             GSD_CLIPBOARD_ERROR_RUNNING,
+        	             "Clipboard manager is already running.");
                 return FALSE;
         }
 
@@ -917,6 +928,9 @@
                                             NULL);
                 /* FIXME: manager->priv->terminate (manager->priv->cb_data); */
 
+        	g_set_error (error, GSD_CLIPBOARD_ERROR,
+        	             GSD_CLIPBOARD_ERROR_FAILED,
+        	             "Failed to claim selection.");
                 return FALSE;
         }