[nautilus/gnome-2-32: 103/283] Move the clipboard callbacks to NautilusClipboardMonitor.
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/gnome-2-32: 103/283] Move the clipboard callbacks to NautilusClipboardMonitor.
- Date: Thu, 12 Aug 2010 11:12:41 +0000 (UTC)
commit 008ac58a8f5a7728a8815922e7060b5e83186d00
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Thu May 20 11:32:00 2010 +0200
Move the clipboard callbacks to NautilusClipboardMonitor.
libnautilus-private/nautilus-clipboard-monitor.c | 104 ++++++++++++++++++++++
libnautilus-private/nautilus-clipboard-monitor.h | 9 ++
src/file-manager/fm-directory-view.c | 103 +---------------------
3 files changed, 114 insertions(+), 102 deletions(-)
---
diff --git a/libnautilus-private/nautilus-clipboard-monitor.c b/libnautilus-private/nautilus-clipboard-monitor.c
index 5db5d29..e800d6d 100644
--- a/libnautilus-private/nautilus-clipboard-monitor.c
+++ b/libnautilus-private/nautilus-clipboard-monitor.c
@@ -57,6 +57,7 @@ struct NautilusClipboardMonitorDetails {
};
static guint signals[LAST_SIGNAL];
+static GdkAtom copied_files_atom;
G_DEFINE_TYPE (NautilusClipboardMonitor, nautilus_clipboard_monitor, G_TYPE_OBJECT);
@@ -163,6 +164,8 @@ nautilus_clipboard_monitor_class_init (NautilusClipboardMonitorClass *klass)
object_class = G_OBJECT_CLASS (klass);
object_class->finalize = clipboard_monitor_finalize;
+ copied_files_atom = gdk_atom_intern ("x-special/gnome-copied-files", FALSE);
+
signals[CLIPBOARD_CHANGED] =
g_signal_new ("clipboard_changed",
G_TYPE_FROM_CLASS (klass),
@@ -205,3 +208,104 @@ nautilus_clipboard_monitor_get_clipboard_info (NautilusClipboardMonitor *monitor
{
return monitor->details->info;
}
+
+void
+nautilus_clear_clipboard_callback (GtkClipboard *clipboard,
+ gpointer user_data)
+{
+ nautilus_clipboard_monitor_set_clipboard_info
+ (nautilus_clipboard_monitor_get (), NULL);
+}
+
+static char *
+convert_file_list_to_string (NautilusClipboardInfo *info,
+ gboolean format_for_text,
+ gsize *len)
+{
+ GString *uris;
+ char *uri, *tmp;
+ GFile *f;
+ guint i;
+ GList *l;
+
+ if (format_for_text) {
+ uris = g_string_new (NULL);
+ } else {
+ uris = g_string_new (info->cut ? "cut" : "copy");
+ }
+
+ for (i = 0, l = info->files; l != NULL; l = l->next, i++) {
+ uri = nautilus_file_get_uri (l->data);
+
+ if (format_for_text) {
+ f = g_file_new_for_uri (uri);
+ tmp = g_file_get_parse_name (f);
+ g_object_unref (f);
+
+ if (tmp != NULL) {
+ g_string_append (uris, tmp);
+ g_free (tmp);
+ } else {
+ g_string_append (uris, uri);
+ }
+
+ /* skip newline for last element */
+ if (i + 1 < g_list_length (info->files)) {
+ g_string_append_c (uris, '\n');
+ }
+ } else {
+ g_string_append_c (uris, '\n');
+ g_string_append (uris, uri);
+ }
+
+ g_free (uri);
+ }
+
+ *len = uris->len;
+ return g_string_free (uris, FALSE);
+}
+
+void
+nautilus_get_clipboard_callback (GtkClipboard *clipboard,
+ GtkSelectionData *selection_data,
+ guint info,
+ gpointer user_data)
+{
+ char **uris;
+ GList *l;
+ int i;
+ NautilusClipboardInfo *clipboard_info;
+
+ clipboard_info =
+ nautilus_clipboard_monitor_get_clipboard_info (nautilus_clipboard_monitor_get ());
+
+ if (gtk_targets_include_uri (&selection_data->target, 1)) {
+ uris = g_malloc ((g_list_length (clipboard_info->files) + 1) * sizeof (char *));
+ i = 0;
+
+ for (l = clipboard_info->files; l != NULL; l = l->next) {
+ uris[i] = nautilus_file_get_uri (l->data);
+ i++;
+ }
+
+ uris[i] = NULL;
+
+ gtk_selection_data_set_uris (selection_data, uris);
+
+ g_strfreev (uris);
+ } else if (gtk_targets_include_text (&selection_data->target, 1)) {
+ char *str;
+ gsize len;
+
+ str = convert_file_list_to_string (clipboard_info, TRUE, &len);
+ gtk_selection_data_set_text (selection_data, str, len);
+ g_free (str);
+ } else if (selection_data->target == copied_files_atom) {
+ char *str;
+ gsize len;
+
+ str = convert_file_list_to_string (clipboard_info, FALSE, &len);
+ gtk_selection_data_set (selection_data, copied_files_atom, 8, str, len);
+ g_free (str);
+ }
+}
diff --git a/libnautilus-private/nautilus-clipboard-monitor.h b/libnautilus-private/nautilus-clipboard-monitor.h
index cc79259..e56e418 100644
--- a/libnautilus-private/nautilus-clipboard-monitor.h
+++ b/libnautilus-private/nautilus-clipboard-monitor.h
@@ -69,5 +69,14 @@ void nautilus_clipboard_monitor_set_clipboard_info (NautilusClipboardMonitor *mo
NautilusClipboardInfo * nautilus_clipboard_monitor_get_clipboard_info (NautilusClipboardMonitor *monitor);
void nautilus_clipboard_monitor_emit_changed (void);
+void nautilus_clear_clipboard_callback (GtkClipboard *clipboard,
+ gpointer user_data);
+void nautilus_get_clipboard_callback (GtkClipboard *clipboard,
+ GtkSelectionData *selection_data,
+ guint info,
+ gpointer user_data);
+
+
+
#endif /* NAUTILUS_CLIPBOARD_MONITOR_H */
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index b4f10ba..24b24a9 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -5752,107 +5752,6 @@ create_popup_menu (FMDirectoryView *view, const char *popup_path)
return GTK_MENU (menu);
}
-
-static char *
-convert_file_list_to_string (NautilusClipboardInfo *info,
- gboolean format_for_text,
- gsize *len)
-{
- GString *uris;
- char *uri, *tmp;
- GFile *f;
- guint i;
- GList *l;
-
- if (format_for_text) {
- uris = g_string_new (NULL);
- } else {
- uris = g_string_new (info->cut ? "cut" : "copy");
- }
-
- for (i = 0, l = info->files; l != NULL; l = l->next, i++) {
- uri = nautilus_file_get_uri (l->data);
-
- if (format_for_text) {
- f = g_file_new_for_uri (uri);
- tmp = g_file_get_parse_name (f);
- g_object_unref (f);
-
- if (tmp != NULL) {
- g_string_append (uris, tmp);
- g_free (tmp);
- } else {
- g_string_append (uris, uri);
- }
-
- /* skip newline for last element */
- if (i + 1 < g_list_length (info->files)) {
- g_string_append_c (uris, '\n');
- }
- } else {
- g_string_append_c (uris, '\n');
- g_string_append (uris, uri);
- }
-
- g_free (uri);
- }
-
- *len = uris->len;
- return g_string_free (uris, FALSE);
-}
-
-static void
-get_clipboard_callback (GtkClipboard *clipboard,
- GtkSelectionData *selection_data,
- guint info,
- gpointer user_data)
-{
- char **uris;
- GList *l;
- int i;
- NautilusClipboardInfo *clipboard_info;
-
- clipboard_info =
- nautilus_clipboard_monitor_get_clipboard_info (nautilus_clipboard_monitor_get ());
-
- if (gtk_targets_include_uri (&selection_data->target, 1)) {
- uris = g_malloc ((g_list_length (clipboard_info->files) + 1) * sizeof (char *));
- i = 0;
-
- for (l = clipboard_info->files; l != NULL; l = l->next) {
- uris[i] = nautilus_file_get_uri (l->data);
- i++;
- }
-
- uris[i] = NULL;
-
- gtk_selection_data_set_uris (selection_data, uris);
-
- g_strfreev (uris);
- } else if (gtk_targets_include_text (&selection_data->target, 1)) {
- char *str;
- gsize len;
-
- str = convert_file_list_to_string (clipboard_info, TRUE, &len);
- gtk_selection_data_set_text (selection_data, str, len);
- g_free (str);
- } else if (selection_data->target == copied_files_atom) {
- char *str;
- gsize len;
-
- str = convert_file_list_to_string (clipboard_info, FALSE, &len);
- gtk_selection_data_set (selection_data, copied_files_atom, 8, str, len);
- g_free (str);
- }
-}
-
-static void
-clear_clipboard_callback (GtkClipboard *clipboard,
- gpointer user_data)
-{
- nautilus_clipboard_monitor_set_clipboard_info (nautilus_clipboard_monitor_get (),
- NULL);
-}
static void
copy_or_cut_files (FMDirectoryView *view,
@@ -5879,7 +5778,7 @@ copy_or_cut_files (FMDirectoryView *view,
gtk_clipboard_set_with_data (nautilus_clipboard_get (GTK_WIDGET (view)),
targets, n_targets,
- get_clipboard_callback, clear_clipboard_callback,
+ nautilus_get_clipboard_callback, nautilus_clear_clipboard_callback,
NULL);
gtk_target_table_free (targets, n_targets);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]