vinagre r311 - in trunk: . data src

[jwendell svn gnome org]

Author: jwendell
Date: Wed Apr 30 17:44:33 2008
New Revision: 311
URL: http://svn.gnome.org/viewvc/vinagre?rev=311&view=rev

Log:
2008-04-30  Jonh Wendell <jwendell gnome org>

	* src/vinagre-prefs-manager.[ch],
	* src/vinagre-tab.c,
	* data/vinagre.schemas.in: Added a gconf key (shared_flag) to tell
	whether to share the desktop with other clients.


Modified:
   trunk/ChangeLog
   trunk/data/vinagre.schemas.in
   trunk/src/vinagre-prefs-manager.c
   trunk/src/vinagre-prefs-manager.h
   trunk/src/vinagre-tab.c

Modified: trunk/data/vinagre.schemas.in
==============================================================================
--- trunk/data/vinagre.schemas.in	(original)
+++ trunk/data/vinagre.schemas.in	Wed Apr 30 17:44:33 2008
@@ -13,30 +13,41 @@
 			</locale>
 		</schema>
 
-        <schema>
-            <key>/schemas/desktop/gnome/url-handlers/vnc/needs_terminal</key>
-            <applyto>/desktop/gnome/url-handlers/vnc/needs_terminal</applyto>
-            <owner>vinagre</owner>
-            <type>bool</type>
-            <default>false</default>
-            <locale name="C">
-                <short></short>
-                <long></long>
-            </locale>
-        </schema>
+		<schema>
+			<key>/schemas/desktop/gnome/url-handlers/vnc/needs_terminal</key>
+			<applyto>/desktop/gnome/url-handlers/vnc/needs_terminal</applyto>
+			<owner>vinagre</owner>
+			<type>bool</type>
+			<default>false</default>
+			<locale name="C">
+				<short></short>
+				<long></long>
+			</locale>
+		</schema>
 
+		<schema>
+			<key>/schemas/desktop/gnome/url-handlers/vnc/enabled</key>
+			<applyto>/desktop/gnome/url-handlers/vnc/enabled</applyto>
+			<owner>vinagre</owner>
+			<type>bool</type>
+			<default>true</default>
+			<locale name="C">
+				<short></short>
+				<long></long>
+			</locale>
+		</schema>
 
-        <schema>
-            <key>/schemas/desktop/gnome/url-handlers/vnc/enabled</key>
-            <applyto>/desktop/gnome/url-handlers/vnc/enabled</applyto>
-            <owner>vinagre</owner>
-            <type>bool</type>
-            <default>true</default>
-            <locale name="C">
-                <short></short>
-                <long></long>
-            </locale>
-        </schema>
+		<schema>
+			<key>/schemas/apps/vinagre/shared_flag</key>
+			<applyto>/apps/vinagre/shared_flag</applyto>
+			<owner>vinagre</owner>
+			<type>bool</type>
+			<default>true</default>
+			<locale name="C">
+				<short>Whether we should leave other clients connected</short>
+				<long>When connecting to a host, the client can say to the server to leave others clients connected or to drop the existent connections. Set the value to true to share the desktop with the others clients.</long>
+			</locale>
+		</schema>
 
 	</schemalist>
 </gconfschemafile>

Modified: trunk/src/vinagre-prefs-manager.c
==============================================================================
--- trunk/src/vinagre-prefs-manager.c	(original)
+++ trunk/src/vinagre-prefs-manager.c	Wed Apr 30 17:44:33 2008
@@ -2,7 +2,7 @@
  * vinagre-prefs-manager.c
  * This file is part of vinagre
  *
- * Copyright (C) 2007 - Jonh Wendell <wendell bani com br>
+ * Copyright (C) 2007,2008 - Jonh Wendell <wendell bani com br>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -248,6 +248,11 @@
 		  VPM_SIDE_PANE_VISIBLE,
 		  VPM_DEFAULT_SIDE_PANE_VISIBLE)
 
+/* Shared flag */
+DEFINE_BOOL_PREF (shared_flag,
+		  VPM_SHARED_FLAG,
+		  VPM_DEFAULT_SHARED_FLAG)
+
 /* Window state */
 gint
 vinagre_prefs_manager_get_window_state (void)
@@ -520,3 +525,4 @@
       return def;
     }
 }
+/* vim: ts=8 */

Modified: trunk/src/vinagre-prefs-manager.h
==============================================================================
--- trunk/src/vinagre-prefs-manager.h	(original)
+++ trunk/src/vinagre-prefs-manager.h	Wed Apr 30 17:44:33 2008
@@ -2,7 +2,7 @@
  * vinagre-prefs-manager.h
  * This file is part of vinagre
  *
- * Copyright (C) 2007  Jonh Wendell <wendell bani com br>
+ * Copyright (C) 2007,2008  Jonh Wendell <wendell bani com br>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -37,6 +37,8 @@
 #define VPM_WINDOW_HEIGHT		VINAGRE_BASE_KEY "/window_height"
 #define VPM_SIDE_PANEL_SIZE		VINAGRE_BASE_KEY "/side_panel_size"
 
+#define VPM_SHARED_FLAG			VINAGRE_BASE_KEY "/shared_flag"
+
 /* Fallback default values. Keep in sync with vinagre.schemas */
 
 #define VPM_DEFAULT_TOOLBAR_VISIBLE	1 /* TRUE */
@@ -48,6 +50,8 @@
 #define VPM_DEFAULT_WINDOW_HEIGHT	500
 #define VPM_DEFAULT_SIDE_PANEL_SIZE	200
 
+#define VPM_DEFAULT_SHARED_FLAG		1 /* TRUE */
+
 /** LIFE CYCLE MANAGEMENT FUNCTIONS **/
 
 gboolean		 vinagre_prefs_manager_init (void);
@@ -84,4 +88,10 @@
 gint	 	 vinagre_prefs_manager_get_side_panel_size	(void);
 void 		 vinagre_prefs_manager_set_side_panel_size	(gint ps);
 
+/* Shared flag */
+gboolean	vinagre_prefs_manager_get_shared_flag		(void);
+void		vinagre_prefs_manager_set_shared_flag		(gboolean sf);
+
 #endif  /* __VINAGRE_PREFS_MANAGER_H__ */
+
+/* vim: ts=8 */

Modified: trunk/src/vinagre-tab.c
==============================================================================
--- trunk/src/vinagre-tab.c	(original)
+++ trunk/src/vinagre-tab.c	Wed Apr 30 17:44:33 2008
@@ -31,6 +31,7 @@
 #include "vinagre-notebook.h"
 #include "vinagre-tab.h"
 #include "vinagre-utils.h"
+#include "vinagre-prefs-manager.h"
 
 #define VINAGRE_TAB_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), VINAGRE_TYPE_TAB, VinagreTabPrivate))
 
@@ -604,6 +605,9 @@
   viewport = gtk_bin_get_child (GTK_BIN (tab->priv->scroll));
   gtk_viewport_set_shadow_type(GTK_VIEWPORT (viewport), GTK_SHADOW_NONE);
 
+  vnc_display_set_shared_flag (VNC_DISPLAY (tab->priv->vnc),
+			       vinagre_prefs_manager_get_shared_flag ());
+
   g_signal_connect (tab->priv->vnc,
 		    "vnc-connected",
 		    G_CALLBACK (vnc_connected_cb),