[Xfce4-commits] <xfce4-settings:master> We use a 4 space indent in the helper code.
Jérôme Guelfucci
noreply at xfce.org
Sat Jan 2 13:00:14 CET 2010
Updating branch refs/heads/master
to 5d5ec226e2a32051cff675b39dd80b35283f98e2 (commit)
from 0b997936c202fcf1ca1c3242a2ab860331d5b79c (commit)
commit 5d5ec226e2a32051cff675b39dd80b35283f98e2
Author: Nick Schermer <nick at xfce.org>
Date: Fri Nov 27 11:20:53 2009 +0100
We use a 4 space indent in the helper code.
Sorry Jerome, my bad...
xfce4-settings-helper/xfce-clipboard-manager.c | 271 ++++++++++++------------
1 files changed, 134 insertions(+), 137 deletions(-)
diff --git a/xfce4-settings-helper/xfce-clipboard-manager.c b/xfce4-settings-helper/xfce-clipboard-manager.c
index 85e98a9..c5cbf0d 100644
--- a/xfce4-settings-helper/xfce-clipboard-manager.c
+++ b/xfce4-settings-helper/xfce-clipboard-manager.c
@@ -34,20 +34,20 @@
struct _XfceClipboardManagerClass
{
- GObjectClass __parent__;
+ GObjectClass __parent__;
};
struct _XfceClipboardManager
{
- GObject __parent__;
+ GObject __parent__;
- GtkClipboard *default_clipboard;
- GtkClipboard *primary_clipboard;
+ GtkClipboard *default_clipboard;
+ GtkClipboard *primary_clipboard;
- GSList *default_cache;
- gchar *primary_cache;
+ GSList *default_cache;
+ gchar *primary_cache;
- gboolean internal_change;
+ gboolean internal_change;
};
@@ -66,13 +66,13 @@ xfce_clipboard_manager_class_init (XfceClipboardManagerClass *klass)
static void
xfce_clipboard_manager_init (XfceClipboardManager *manager)
{
- manager->default_clipboard =
- gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
- manager->primary_clipboard =
- gtk_clipboard_get (GDK_SELECTION_PRIMARY);
+ manager->default_clipboard =
+ gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+ manager->primary_clipboard =
+ gtk_clipboard_get (GDK_SELECTION_PRIMARY);
- manager->default_cache = NULL;
- manager->primary_cache = NULL;
+ manager->default_cache = NULL;
+ manager->primary_cache = NULL;
}
@@ -80,41 +80,41 @@ xfce_clipboard_manager_init (XfceClipboardManager *manager)
static void
xfce_clipboard_manager_default_store (XfceClipboardManager *manager)
{
- GtkSelectionData *selection_data;
- GdkAtom *atoms;
- gint n_atoms;
- gint i;
+ GtkSelectionData *selection_data;
+ GdkAtom *atoms;
+ gint n_atoms;
+ gint i;
- g_return_if_fail (XFCE_IS_CLIPBOARD_MANAGER (manager));
+ g_return_if_fail (XFCE_IS_CLIPBOARD_MANAGER (manager));
- if (!gtk_clipboard_wait_for_targets (manager->default_clipboard, &atoms, &n_atoms))
- return;
+ if (!gtk_clipboard_wait_for_targets (manager->default_clipboard, &atoms, &n_atoms))
+ return;
- if (manager->default_cache != NULL)
+ if (manager->default_cache != NULL)
{
- g_slist_foreach (manager->default_cache, (GFunc)gtk_selection_data_free, NULL);
- g_slist_free (manager->default_cache);
- manager->default_cache = NULL;
+ g_slist_foreach (manager->default_cache, (GFunc)gtk_selection_data_free, NULL);
+ g_slist_free (manager->default_cache);
+ manager->default_cache = NULL;
}
- for (i = 0; i < n_atoms; i++)
+ for (i = 0; i < n_atoms; i++)
{
- if (atoms[i] == gdk_atom_intern_static_string ("TARGETS") ||
- atoms[i] == gdk_atom_intern_static_string ("MULTIPLE") ||
- atoms[i] == gdk_atom_intern_static_string ("DELETE") ||
- atoms[i] == gdk_atom_intern_static_string ("INSERT_PROPERTY") ||
- atoms[i] == gdk_atom_intern_static_string ("INSERT_SELECTION") ||
- atoms[i] == gdk_atom_intern_static_string ("PIXMAP"))
+ if (atoms[i] == gdk_atom_intern_static_string ("TARGETS")
+ || atoms[i] == gdk_atom_intern_static_string ("MULTIPLE")
+ || atoms[i] == gdk_atom_intern_static_string ("DELETE")
+ || atoms[i] == gdk_atom_intern_static_string ("INSERT_PROPERTY")
+ || atoms[i] == gdk_atom_intern_static_string ("INSERT_SELECTION")
+ || atoms[i] == gdk_atom_intern_static_string ("PIXMAP"))
{
- continue;
+ continue;
}
- selection_data = gtk_clipboard_wait_for_contents (manager->default_clipboard, atoms[i]);
+ selection_data = gtk_clipboard_wait_for_contents (manager->default_clipboard, atoms[i]);
- if (selection_data == NULL)
- return;
+ if (selection_data == NULL)
+ return;
- manager->default_cache = g_slist_prepend (manager->default_cache, selection_data);
+ manager->default_cache = g_slist_prepend (manager->default_cache, selection_data);
}
}
@@ -126,31 +126,31 @@ xfce_clipboard_manager_default_get_func (GtkClipboard *clipboard,
guint info,
gpointer user_data)
{
- XfceClipboardManager *manager = XFCE_CLIPBOARD_MANAGER (user_data);
- GSList *list;
- GtkSelectionData *selection_data_cache = NULL;
+ XfceClipboardManager *manager = XFCE_CLIPBOARD_MANAGER (user_data);
+ GSList *list;
+ GtkSelectionData *selection_data_cache = NULL;
- g_return_if_fail (XFCE_IS_CLIPBOARD_MANAGER (manager));
+ g_return_if_fail (XFCE_IS_CLIPBOARD_MANAGER (manager));
- list = manager->default_cache;
+ list = manager->default_cache;
- for (; list->next != NULL; list = list->next)
+ for (; list->next != NULL; list = list->next)
{
- selection_data_cache = list->data;
+ selection_data_cache = list->data;
- if (selection_data->target == selection_data_cache->target)
- break;
+ if (selection_data->target == selection_data_cache->target)
+ break;
- selection_data_cache = NULL;
+ selection_data_cache = NULL;
}
- if (selection_data_cache == NULL)
- return;
+ if (selection_data_cache == NULL)
+ return;
- gtk_selection_data_set (selection_data, selection_data->target,
- selection_data_cache->format,
- selection_data_cache->data,
- selection_data_cache->length);
+ gtk_selection_data_set (selection_data, selection_data->target,
+ selection_data_cache->format,
+ selection_data_cache->data,
+ selection_data_cache->length);
}
@@ -159,7 +159,6 @@ static void
xfce_clipboard_manager_default_clear_func (GtkClipboard *clipboard,
gpointer user_data)
{
- return;
}
@@ -167,30 +166,29 @@ xfce_clipboard_manager_default_clear_func (GtkClipboard *clipboard,
static void
xfce_clipboard_manager_default_restore (XfceClipboardManager *manager)
{
- GtkTargetList *target_list;
- GtkTargetEntry *targets;
- gint n_targets;
- GtkSelectionData *sdata;
- GSList *list;
+ GtkTargetList *target_list;
+ GtkTargetEntry *targets;
+ gint n_targets;
+ GtkSelectionData *sdata;
+ GSList *list;
- g_return_if_fail (XFCE_IS_CLIPBOARD_MANAGER (manager));
+ g_return_if_fail (XFCE_IS_CLIPBOARD_MANAGER (manager));
- target_list = gtk_target_list_new (NULL, 0);
- list = manager->default_cache;
+ target_list = gtk_target_list_new (NULL, 0);
- for (; list->next != NULL; list = list->next)
+ for (list = manager->default_cache; list->next != NULL; list = list->next)
{
- sdata = list->data;
- gtk_target_list_add (target_list, sdata->target, 0, 0);
+ sdata = list->data;
+ gtk_target_list_add (target_list, sdata->target, 0, 0);
}
- targets = gtk_target_table_new_from_list (target_list, &n_targets);
+ targets = gtk_target_table_new_from_list (target_list, &n_targets);
- gtk_clipboard_set_with_data (manager->default_clipboard,
- targets, n_targets,
- xfce_clipboard_manager_default_get_func,
- xfce_clipboard_manager_default_clear_func,
- manager);
+ gtk_clipboard_set_with_data (manager->default_clipboard,
+ targets, n_targets,
+ xfce_clipboard_manager_default_get_func,
+ xfce_clipboard_manager_default_clear_func,
+ manager);
}
@@ -199,37 +197,37 @@ static void
xfce_clipboard_manager_default_owner_change (XfceClipboardManager *manager,
GdkEventOwnerChange *event)
{
- g_return_if_fail (XFCE_IS_CLIPBOARD_MANAGER (manager));
+ g_return_if_fail (XFCE_IS_CLIPBOARD_MANAGER (manager));
- if (event->send_event == TRUE)
- return;
+ if (event->send_event == TRUE)
+ return;
- if (event->owner != 0)
+ if (event->owner != 0)
{
- if (manager->internal_change)
+ if (manager->internal_change)
{
- manager->internal_change = FALSE;
- return;
+ manager->internal_change = FALSE;
+ return;
}
- xfce_clipboard_manager_default_store (manager);
+ xfce_clipboard_manager_default_store (manager);
}
- else
+ else
{
- /* This 'bug' happens with Mozilla applications, it means that
- * we restored the clipboard (we own it now) but somehow we are
- * being noticed twice about that fact where first the owner is
- * 0 (which is when we must restore) but then again where the
- * owner is ourself (which is what normally only happens and
- * also that means that we have to store the clipboard content
- * e.g. owner is not 0). By the second time we would store
- * ourself back with an empty clipboard... solution is to jump
- * over the first time and don't try to restore empty data. */
- if (manager->internal_change)
- return;
-
- manager->internal_change = TRUE;
- xfce_clipboard_manager_default_restore (manager);
+ /* This 'bug' happens with Mozilla applications, it means that
+ * we restored the clipboard (we own it now) but somehow we are
+ * being noticed twice about that fact where first the owner is
+ * 0 (which is when we must restore) but then again where the
+ * owner is ourself (which is what normally only happens and
+ * also that means that we have to store the clipboard content
+ * e.g. owner is not 0). By the second time we would store
+ * ourself back with an empty clipboard... solution is to jump
+ * over the first time and don't try to restore empty data. */
+ if (manager->internal_change)
+ return;
+
+ manager->internal_change = TRUE;
+ xfce_clipboard_manager_default_restore (manager);
}
}
@@ -239,29 +237,29 @@ static void
xfce_clipboard_manager_primary_owner_change (XfceClipboardManager *manager,
GdkEventOwnerChange *event)
{
- gchar *text;
+ gchar *text;
- g_return_if_fail (XFCE_IS_CLIPBOARD_MANAGER (manager));
+ g_return_if_fail (XFCE_IS_CLIPBOARD_MANAGER (manager));
- if (event->send_event == TRUE)
- return;
+ if (event->send_event == TRUE)
+ return;
- if (event->owner != 0)
+ if (event->owner != 0)
{
- text = gtk_clipboard_wait_for_text (manager->primary_clipboard);
+ text = gtk_clipboard_wait_for_text (manager->primary_clipboard);
- if (text != NULL)
+ if (text != NULL)
{
- g_free (manager->primary_cache);
- manager->primary_cache = text;
+ g_free (manager->primary_cache);
+ manager->primary_cache = text;
}
}
- else
+ else
{
- if (manager->primary_cache != NULL)
- gtk_clipboard_set_text (manager->primary_clipboard,
- manager->primary_cache,
- -1);
+ if (manager->primary_cache != NULL)
+ gtk_clipboard_set_text (manager->primary_clipboard,
+ manager->primary_cache,
+ -1);
}
}
@@ -270,8 +268,7 @@ xfce_clipboard_manager_primary_owner_change (XfceClipboardManager *manager,
XfceClipboardManager *
xfce_clipboard_manager_new (void)
{
- return XFCE_CLIPBOARD_MANAGER (g_object_new (XFCE_TYPE_CLIPBOARD_MANAGER,
- NULL));
+ return g_object_new (XFCE_TYPE_CLIPBOARD_MANAGER, NULL);
}
@@ -279,29 +276,29 @@ xfce_clipboard_manager_new (void)
gboolean
xfce_clipboard_manager_start (XfceClipboardManager *manager)
{
- g_return_val_if_fail (XFCE_IS_CLIPBOARD_MANAGER (manager), FALSE);
+ g_return_val_if_fail (XFCE_IS_CLIPBOARD_MANAGER (manager), FALSE);
- /* Check if there is a clipboard manager running */
- if (gdk_display_supports_clipboard_persistence (gdk_display_get_default ()))
+ /* Check if there is a clipboard manager running */
+ if (gdk_display_supports_clipboard_persistence (gdk_display_get_default ()))
{
- g_message ("A clipboard manager is already running.");
- return FALSE;
+ g_message ("A clipboard manager is already running.");
+ return FALSE;
}
- if (!xfce_utils_selection_owner ("CLIPBOARD_MANAGER", FALSE, NULL))
+ if (!xfce_utils_selection_owner ("CLIPBOARD_MANAGER", FALSE, NULL))
{
- g_warning ("Unable to get the clipboard manager selection.");
- return FALSE;
+ g_warning ("Unable to get the clipboard manager selection.");
+ return FALSE;
}
- g_signal_connect_swapped (manager->default_clipboard, "owner-change",
- G_CALLBACK (xfce_clipboard_manager_default_owner_change),
- manager);
- g_signal_connect_swapped (manager->primary_clipboard, "owner-change",
- G_CALLBACK (xfce_clipboard_manager_primary_owner_change),
- manager);
+ g_signal_connect_swapped (manager->default_clipboard, "owner-change",
+ G_CALLBACK (xfce_clipboard_manager_default_owner_change),
+ manager);
+ g_signal_connect_swapped (manager->primary_clipboard, "owner-change",
+ G_CALLBACK (xfce_clipboard_manager_primary_owner_change),
+ manager);
- return TRUE;
+ return TRUE;
}
@@ -309,22 +306,22 @@ xfce_clipboard_manager_start (XfceClipboardManager *manager)
void
xfce_clipboard_manager_stop (XfceClipboardManager *manager)
{
- g_return_if_fail (XFCE_IS_CLIPBOARD_MANAGER (manager));
+ g_return_if_fail (XFCE_IS_CLIPBOARD_MANAGER (manager));
- g_signal_handlers_disconnect_by_func (manager->default_clipboard,
- xfce_clipboard_manager_default_owner_change,
- manager);
- g_signal_handlers_disconnect_by_func (manager->primary_clipboard,
- xfce_clipboard_manager_primary_owner_change,
- manager);
+ g_signal_handlers_disconnect_by_func (manager->default_clipboard,
+ xfce_clipboard_manager_default_owner_change,
+ manager);
+ g_signal_handlers_disconnect_by_func (manager->primary_clipboard,
+ xfce_clipboard_manager_primary_owner_change,
+ manager);
- if (manager->default_cache != NULL)
+ if (manager->default_cache != NULL)
{
- g_slist_foreach (manager->default_cache, (GFunc)gtk_selection_data_free, NULL);
- g_slist_free (manager->default_cache);
- manager->default_cache = NULL;
+ g_slist_foreach (manager->default_cache, (GFunc)gtk_selection_data_free, NULL);
+ g_slist_free (manager->default_cache);
+ manager->default_cache = NULL;
}
- if (manager->primary_cache != NULL)
- g_free (manager->primary_cache);
+ if (manager->primary_cache != NULL)
+ g_free (manager->primary_cache);
}
More information about the Xfce4-commits
mailing list