diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2011-04-06 14:29:04 +0200 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2011-04-08 13:29:59 +0200 |
| commit | 33a8beb089b6bd3b906fbfb2e6ec8c6f82c7e6f8 (patch) | |
| tree | 2c5204c9f38cf5dacd6179a868c077ceedf592e1 /gtk | |
| parent | 30c7b085d04e7e3b33a9e2283994532d94cd616a (diff) | |
gtk/spicy: only show window when we receive the mark
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/spicy.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/gtk/spicy.c b/gtk/spicy.c index bfa635d..3023a7c 100644 --- a/gtk/spicy.c +++ b/gtk/spicy.c @@ -994,8 +994,6 @@ static spice_window *create_spice_window(spice_connection *conn, int id, SpiceCh if (fullscreen) gtk_window_fullscreen(GTK_WINDOW(win->toplevel)); - gtk_widget_show_all(win->toplevel); - restore_configuration(win); /* init toggle actions */ @@ -1150,6 +1148,16 @@ static void inputs_modifiers(SpiceChannel *channel, gpointer data) m & SPICE_KEYBOARD_MODIFIER_FLAGS_NUM_LOCK ? _("NUM") : ""); } +static void display_mark(SpiceChannel *channel, gint mark, spice_window *win) +{ + g_return_if_fail(win != NULL); + g_return_if_fail(win->toplevel != NULL); + + if (mark == TRUE) { + gtk_widget_show_all(win->toplevel); + } +} + static void channel_new(SpiceSession *s, SpiceChannel *channel, gpointer data) { spice_connection *conn = data; @@ -1157,6 +1165,7 @@ static void channel_new(SpiceSession *s, SpiceChannel *channel, gpointer data) g_object_get(channel, "channel-id", &id, NULL); conn->channels++; + SPICE_DEBUG("new channel (#%d)", id); if (SPICE_IS_MAIN_CHANNEL(channel)) { SPICE_DEBUG("new main channel"); @@ -1177,6 +1186,8 @@ static void channel_new(SpiceSession *s, SpiceChannel *channel, gpointer data) return; SPICE_DEBUG("new display channel (#%d)", id); conn->wins[id] = create_spice_window(conn, id, channel); + g_signal_connect(channel, "display-mark", + G_CALLBACK(display_mark), conn->wins[id]); } if (SPICE_IS_INPUTS_CHANNEL(channel)) { |