diff options
| author | Dave Camp <dave@ximian.com> | 2003-07-21 00:01:06 +0000 |
|---|---|---|
| committer | Dave Camp <campd@src.gnome.org> | 2003-07-21 00:01:06 +0000 |
| commit | 6ae9d542f81718d0658a60bf5cbd77b7f339dbfe (patch) | |
| tree | 6970b33e598899b531275f6f268d3a3cf5280ad1 /src | |
| parent | 013f45daceac34c00a959dfc64804d28b84eb84a (diff) | |
| download | nautilus-6ae9d542f81718d0658a60bf5cbd77b7f339dbfe.tar.gz | |
Pass the screen number when creating nautilus links, fixes #117946
2003-07-20 Dave Camp <dave@ximian.com>
* libnautilus-private/nautilus-link-desktop-file.c:
(nautilus_link_desktop_file_local_create),
(nautilus_link_desktop_file_local_create_from_gnome_entry):
* libnautilus-private/nautilus-link-desktop-file.h:
* libnautilus-private/nautilus-link.c:
(nautilus_link_local_create),
(nautilus_link_local_create_from_gnome_entry):
* libnautilus-private/nautilus-link.h:
* src/file-manager/fm-icon-view.c: (icon_view_handle_uri_list):
Pass the screen number when creating nautilus links, fixes
#117946
Diffstat (limited to 'src')
| -rw-r--r-- | src/file-manager/fm-icon-view.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c index d0ff96e29..1f53f05da 100644 --- a/src/file-manager/fm-icon-view.c +++ b/src/file-manager/fm-icon-view.c @@ -2511,6 +2511,8 @@ icon_view_handle_uri_list (NautilusIconContainer *container, const char *item_ur int n_uris; gboolean all_local; GArray *points; + GdkScreen *screen; + int screen_num; if (item_uris == NULL) { return; @@ -2549,6 +2551,9 @@ icon_view_handle_uri_list (NautilusIconContainer *container, const char *item_ur point.x = x; point.y = y; + + screen = gtk_widget_get_screen (GTK_WIDGET (view)); + screen_num = gdk_screen_get_number (screen); /* Most of what comes in here is not really URIs, but rather paths that * have a file: prefix in them. We try to sanitize the uri list as a @@ -2618,7 +2623,7 @@ icon_view_handle_uri_list (NautilusIconContainer *container, const char *item_ur if (entry != NULL) { /* FIXME: Handle name conflicts? */ - nautilus_link_local_create_from_gnome_entry (entry, container_uri, &point); + nautilus_link_local_create_from_gnome_entry (entry, container_uri, &point, screen_num); gnome_desktop_item_unref (entry); continue; @@ -2638,7 +2643,8 @@ icon_view_handle_uri_list (NautilusIconContainer *container, const char *item_ur /* FIXME: Handle name conflicts? */ nautilus_link_local_create (container_uri, link_name, NULL, uri, - &point, NAUTILUS_LINK_GENERIC); + &point, screen_num, + NAUTILUS_LINK_GENERIC); } g_free (stripped_uri); |