vinagre r277 - in branches/unstable: . src

[jwendell svn gnome org]

Author: jwendell
Date: Thu Apr  3 17:12:43 2008
New Revision: 277
URL: http://svn.gnome.org/viewvc/vinagre?rev=277&view=rev

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

	* src/vinagre-tab.c:
	Changed properties types from pointer to object;
	Use new gtk-vnc API vnc_display_force_grab() in fullscreen handling.


Modified:
   branches/unstable/ChangeLog
   branches/unstable/src/vinagre-tab.c

Modified: branches/unstable/src/vinagre-tab.c
==============================================================================
--- branches/unstable/src/vinagre-tab.c	(original)
+++ branches/unstable/src/vinagre-tab.c	Thu Apr  3 17:12:43 2008
@@ -98,13 +98,13 @@
 
   if (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN)
     {
-      vnc_display_set_pointer_grab  (VNC_DISPLAY(tab->priv->vnc), TRUE);
+      vnc_display_force_grab  (VNC_DISPLAY(tab->priv->vnc), TRUE);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (tab->priv->scroll),
 				      h, v);
     }
   else
     {
-      vnc_display_set_pointer_grab  (VNC_DISPLAY(tab->priv->vnc), FALSE);
+      vnc_display_force_grab  (VNC_DISPLAY(tab->priv->vnc), FALSE);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (tab->priv->scroll),
 				      GTK_POLICY_AUTOMATIC,
 				      GTK_POLICY_AUTOMATIC);
@@ -124,10 +124,10 @@
   switch (prop_id)
     {
       case PROP_CONN:
-        g_value_set_pointer (value, tab->priv->conn);
+        g_value_set_object (value, tab->priv->conn);
 	break;
       case PROP_WINDOW:
-        g_value_set_pointer (value, tab->priv->window);
+        g_value_set_object (value, tab->priv->window);
 	break;
       default:
 	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -146,10 +146,10 @@
   switch (prop_id)
     {
       case PROP_CONN:
-        tab->priv->conn = g_value_get_pointer (value);
+        tab->priv->conn = g_value_get_object (value);
         break;
       case PROP_WINDOW:
-        tab->priv->window = g_value_get_pointer (value);
+        tab->priv->window = g_value_get_object (value);
 	g_signal_connect (tab->priv->window,
 			  "window-state-event",
 			  G_CALLBACK (vinagre_tab_window_state_cb),
@@ -190,24 +190,26 @@
 
   g_object_class_install_property (object_class,
 				   PROP_CONN,
-				   g_param_spec_pointer ("conn",
-							 "Connection",
-							 "The connection",
-							 G_PARAM_READWRITE |
-							 G_PARAM_CONSTRUCT_ONLY |
-							 G_PARAM_STATIC_NAME |
-							 G_PARAM_STATIC_NICK |
-							 G_PARAM_STATIC_BLURB));
+				   g_param_spec_object ("conn",
+							"Connection",
+							"The connection",
+							VINAGRE_TYPE_CONNECTION,
+							G_PARAM_READWRITE |
+							G_PARAM_CONSTRUCT_ONLY |
+							G_PARAM_STATIC_NAME |
+							G_PARAM_STATIC_NICK |
+							G_PARAM_STATIC_BLURB));
   g_object_class_install_property (object_class,
 				   PROP_WINDOW,
-				   g_param_spec_pointer ("window",
-							 "Window",
-							 "The VinagreWindow",
-							 G_PARAM_READWRITE |
-							 G_PARAM_CONSTRUCT_ONLY |
-							 G_PARAM_STATIC_NAME |
-							 G_PARAM_STATIC_NICK |
-							 G_PARAM_STATIC_BLURB));
+				   g_param_spec_object ("window",
+							"Window",
+							"The VinagreWindow",
+							VINAGRE_TYPE_WINDOW,
+							G_PARAM_READWRITE |
+							G_PARAM_CONSTRUCT_ONLY |
+							G_PARAM_STATIC_NAME |
+							G_PARAM_STATIC_NICK |
+							G_PARAM_STATIC_BLURB));
 
   signals[TAB_CONNECTED] =
 		g_signal_new ("tab-connected",
@@ -534,7 +536,6 @@
 
 static void vnc_grab_cb (VncDisplay *vnc, VinagreTab *tab)
 {
-
   gtk_statusbar_pop (tab->priv->status,
 		     tab->priv->status_id);