summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-10-24 16:31:11 +0200
committerinfirit <[email protected]>2014-10-24 16:36:19 +0200
commit49e91bc9093010e269816da1df763a0374dbc515 (patch)
treecc62723c60743e4df53286c0bc9a9f13c645ef1b
parentbbdef45fbb7c7addea5a3be99fbebf823d83192d (diff)
downloadmarco-49e91bc9093010e269816da1df763a0374dbc515.tar.bz2
marco-49e91bc9093010e269816da1df763a0374dbc515.tar.xz
Update meta_show_dialog for gtk's removal of --screen
gtk3 no longer has the --screen command-line argument, which metacity was passing to zenity. Use --display (with an explicitly-specified screen number) instead. Author: Dan Winship Bug: https://bugzilla.gnome.org/show_bug.cgi?id=687938 Based on metacity commit: 8d19afdcccaec28a5512b0a707d8238b9dd4e2f3
-rw-r--r--src/core/delete.c4
-rw-r--r--src/core/session.c2
-rw-r--r--src/core/util.c8
-rw-r--r--src/include/util.h4
4 files changed, 8 insertions, 10 deletions
diff --git a/src/core/delete.c b/src/core/delete.c
index 42360a5a..a93a2ac7 100644
--- a/src/core/delete.c
+++ b/src/core/delete.c
@@ -105,8 +105,8 @@ delete_ping_timeout_func (MetaDisplay *display,
dialog_pid =
meta_show_dialog ("--question",
- window_content, 0,
- window->screen->number,
+ window_content, NULL,
+ window->screen->screen_name,
_("_Wait"), _("_Force Quit"), window->xwindow,
NULL, NULL);
diff --git a/src/core/session.c b/src/core/session.c
index 80bf9a0d..495ac950 100644
--- a/src/core/session.c
+++ b/src/core/session.c
@@ -1809,7 +1809,7 @@ warn_about_lame_clients_and_finish_interact (gboolean shutdown)
"and will have to be restarted manually next time "
"you log in."),
"240",
- meta_screen_get_screen_number (meta_get_display()->active_screen),
+ meta_get_display()->active_screen->screen_name,
NULL, NULL,
None,
columns,
diff --git a/src/core/util.c b/src/core/util.c
index b3239976..1cb7793c 100644
--- a/src/core/util.c
+++ b/src/core/util.c
@@ -542,7 +542,7 @@ GPid
meta_show_dialog (const char *type,
const char *message,
const char *timeout,
- const gint screen_number,
+ const char *display,
const char *ok_text,
const char *cancel_text,
const int transient_for,
@@ -550,7 +550,6 @@ meta_show_dialog (const char *type,
GSList *entries)
{
GError *error = NULL;
- char *screen_number_text = g_strdup_printf("%d", screen_number);
GSList *tmp;
int i=0;
GPid child_pid;
@@ -561,8 +560,8 @@ meta_show_dialog (const char *type,
argvl[i++] = "zenity";
argvl[i++] = type;
- argvl[i++] = "--screen";
- argvl[i++] = screen_number_text;
+ argvl[i++] = "--display";
+ argvl[i++] = display;
argvl[i++] = "--class";
argvl[i++] = "marco-dialog";
argvl[i++] = "--title";
@@ -627,7 +626,6 @@ meta_show_dialog (const char *type,
unsetenv ("WINDOWID");
g_free (argvl);
- g_free (screen_number_text);
if (error)
{
diff --git a/src/include/util.h b/src/include/util.h
index b4e95be0..ba6a2754 100644
--- a/src/include/util.h
+++ b/src/include/util.h
@@ -99,9 +99,9 @@ char* meta_g_utf8_strndup (const gchar *src, gsize n);
void meta_free_gslist_and_elements (GSList *list_to_deep_free);
GPid meta_show_dialog (const char *type,
- const char *title,
const char *message,
- gint timeout,
+ const char *timeout,
+ const char *display,
const char *ok_text,
const char *cancel_text,
const int transient_for,