[evince] shell: removes multi-screen support
- From: Giselle Reis <gisellemnr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evince] shell: removes multi-screen support
- Date: Fri, 29 Aug 2014 17:45:09 +0000 (UTC)
commit 6756cfb83137cdf9ba95918be1b339ecc38a0bd3
Author: Giselle Machado <gisellemnr src gnome org>
Date: Mon Aug 4 18:23:55 2014 +0200
shell: removes multi-screen support
Display-screen relation in GTK 3.10 is 1:1
(see https://mail.gnome.org/archives/gtk-list/2013-September/msg00021.html)
Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=701883
shell/ev-application.c | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
---
diff --git a/shell/ev-application.c b/shell/ev-application.c
index af3dcab..d0f1a52 100644
--- a/shell/ev-application.c
+++ b/shell/ev-application.c
@@ -385,9 +385,6 @@ on_register_uri_cb (GObject *source_object,
g_variant_builder_add (&builder, "{sv}",
"display",
g_variant_new_string (gdk_display_get_name (gdk_screen_get_display
(data->screen))));
- g_variant_builder_add (&builder, "{sv}",
- "screen",
- g_variant_new_int32 (gdk_screen_get_number (data->screen)));
if (data->dest) {
switch (ev_link_dest_get_dest_type (data->dest)) {
case EV_LINK_DEST_TYPE_PAGE_LABEL:
@@ -740,7 +737,6 @@ handle_reload_cb (EvEvinceApplication *object,
const gchar *key;
GVariant *value;
GdkDisplay *display = NULL;
- int screen_number = 0;
EvLinkDest *dest = NULL;
EvWindowRunMode mode = EV_WINDOW_MODE_NORMAL;
const gchar *search_string = NULL;
@@ -751,8 +747,6 @@ handle_reload_cb (EvEvinceApplication *object,
while (g_variant_iter_loop (&iter, "{&sv}", &key, &value)) {
if (strcmp (key, "display") == 0 && g_variant_classify (value) == G_VARIANT_CLASS_STRING) {
display = ev_display_open_if_needed (g_variant_get_string (value, NULL));
- } else if (strcmp (key, "screen") == 0 && g_variant_classify (value) ==
G_VARIANT_CLASS_INT32) {
- screen_number = g_variant_get_int32 (value);
} else if (strcmp (key, "mode") == 0 && g_variant_classify (value) ==
G_VARIANT_CLASS_UINT32) {
mode = g_variant_get_uint32 (value);
} else if (strcmp (key, "page-label") == 0 && g_variant_classify (value) ==
G_VARIANT_CLASS_STRING) {
@@ -766,10 +760,8 @@ handle_reload_cb (EvEvinceApplication *object,
}
}
- if (display != NULL &&
- screen_number >= 0 &&
- screen_number < gdk_display_get_n_screens (display))
- screen = gdk_display_get_screen (display, screen_number);
+ if (display != NULL)
+ screen = gdk_display_get_default_screen (display);
else
screen = gdk_screen_get_default ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]