From 734e789b2291b94c69bec582cd1b907226bc31da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
Date: Thu, 21 Jul 2011 20:00:54 +0200
Subject: [PATCH] Use app fullscreen property instead of app.start() argument

---
 src/virt-viewer-app.c  | 16 +++++++---------
 src/virt-viewer-app.h  |  6 +++---
 src/virt-viewer-main.c |  3 ++-
 src/virt-viewer.c      |  6 +++---
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/virt-viewer-app.c b/src/virt-viewer-app.c
index 5ff20c1..ca6f02e 100644
--- a/src/virt-viewer-app.c
+++ b/src/virt-viewer-app.c
@@ -935,26 +935,24 @@ virt_viewer_app_dispose (GObject *object)
 }
 
 static gboolean
-virt_viewer_app_default_start(VirtViewerApp *self, gboolean fullscreen)
+virt_viewer_app_default_start(VirtViewerApp *self)
 {
 	VirtViewerAppPrivate *priv;
 	GtkWindow *win;
 	priv = self->priv;
 
 	win = virt_viewer_window_get_window(priv->main_window);
-	if (win) {
-		if (fullscreen)
-			gtk_window_fullscreen(win);
-		gtk_widget_show_all(GTK_WIDGET(win));
-	} else {
+	if (win)
+		gtk_widget_show(GTK_WIDGET(win));
+	else {
 		gtk_box_pack_end(GTK_BOX(priv->container), priv->main_notebook, TRUE, TRUE, 0);
-		gtk_widget_show_all(GTK_WIDGET(priv->main_notebook));
+		gtk_widget_show(GTK_WIDGET(priv->main_notebook));
 	}
 
 	return TRUE;
 }
 
-gboolean virt_viewer_app_start(VirtViewerApp *self, gboolean fullscreen)
+gboolean virt_viewer_app_start(VirtViewerApp *self)
 {
 	VirtViewerAppClass *klass;
 
@@ -963,7 +961,7 @@ gboolean virt_viewer_app_start(VirtViewerApp *self, gboolean fullscreen)
 
 	g_return_val_if_fail(!self->priv->started, TRUE);
 
-	self->priv->started = klass->start(self, fullscreen);
+	self->priv->started = klass->start(self);
 	return self->priv->started;
 }
 
diff --git a/src/virt-viewer-app.h b/src/virt-viewer-app.h
index 8b999b5..1058877 100644
--- a/src/virt-viewer-app.h
+++ b/src/virt-viewer-app.h
@@ -46,17 +46,17 @@ typedef struct {
 typedef struct {
         GObjectClass parent_class;
 
-        gboolean (*start) (VirtViewerApp *self, gboolean fullscreen);
+        gboolean (*start) (VirtViewerApp *self);
         int (*initial_connect) (VirtViewerApp *self);
         void (*deactivated) (VirtViewerApp *self);
 } VirtViewerAppClass;
 
 GType virt_viewer_app_get_type (void);
 
+void virt_viewer_app_set_debug(gboolean debug);
+gboolean virt_viewer_app_start(VirtViewerApp *app);
 void virt_viewer_app_quit(VirtViewerApp *self);
 VirtViewerWindow* virt_viewer_app_get_main_window(VirtViewerApp *self);
-void virt_viewer_app_set_debug(gboolean debug);
-gboolean virt_viewer_app_start(VirtViewerApp *app, gboolean fullscreen);
 void virt_viewer_app_trace(VirtViewerApp *self, const char *fmt, ...);
 void virt_viewer_app_simple_message_dialog(VirtViewerApp *self, const char *fmt, ...);
 gboolean virt_viewer_app_is_active(VirtViewerApp *app);
diff --git a/src/virt-viewer-main.c b/src/virt-viewer-main.c
index 64b3793..78d8d19 100644
--- a/src/virt-viewer-main.c
+++ b/src/virt-viewer-main.c
@@ -114,7 +114,8 @@ int main(int argc, char **argv)
 	if (viewer == NULL)
 		goto cleanup;
 
-	if (!virt_viewer_app_start(VIRT_VIEWER_APP(viewer), fullscreen))
+	g_object_set(viewer, "fullscreen", fullscreen, NULL);
+	if (!virt_viewer_app_start(VIRT_VIEWER_APP(viewer)))
 		goto cleanup;
 
 	gtk_main();
diff --git a/src/virt-viewer.c b/src/virt-viewer.c
index 0e7c652..94f2a08 100644
--- a/src/virt-viewer.c
+++ b/src/virt-viewer.c
@@ -61,7 +61,7 @@ G_DEFINE_TYPE (VirtViewer, virt_viewer, VIRT_VIEWER_TYPE_APP)
 
 static int virt_viewer_initial_connect(VirtViewerApp *self);
 static void virt_viewer_deactivated(VirtViewerApp *self);
-static gboolean virt_viewer_start(VirtViewerApp *self, gboolean fullscreen);
+static gboolean virt_viewer_start(VirtViewerApp *self);
 
 static void
 virt_viewer_get_property (GObject *object, guint property_id,
@@ -462,7 +462,7 @@ virt_viewer_error_func (void *data G_GNUC_UNUSED,
 }
 
 static gboolean
-virt_viewer_start(VirtViewerApp *app, gboolean fullscreen)
+virt_viewer_start(VirtViewerApp *app)
 {
 	VirtViewer *self = VIRT_VIEWER(app);
 	VirtViewerPrivate *priv = self->priv;
@@ -508,7 +508,7 @@ virt_viewer_start(VirtViewerApp *app, gboolean fullscreen)
 		virt_viewer_app_start_reconnect_poll(app);
 	}
 
-	return VIRT_VIEWER_APP_CLASS(virt_viewer_parent_class)->start(app, fullscreen);
+	return VIRT_VIEWER_APP_CLASS(virt_viewer_parent_class)->start(app);
 }
 
 VirtViewer *