[Pkg-telepathy-commits] ./packages/unstable/telepathy-mission-control r65: merge

[Sjoerd Simons]

------------------------------------------------------------
revno: 65
committer: Sjoerd Simons <sjoerd at luon.net>
branch nick: telepathy-mission-control
timestamp: Sat 2008-01-05 21:39:19 +0100
message:
  merge
modified:
  patches/add_signals_to_proxy.patch
    ------------------------------------------------------------
    revno: 62.1.1
    committer: Sjoerd Simons <sjoerd at luon.net>
    branch nick: telepathy-mission-control
    timestamp: Sat 2008-01-05 21:38:24 +0100
    message:
      Add the complete patch
    modified:
      patches/add_signals_to_proxy.patch
-------------- next part --------------
=== modified file 'patches/add_signals_to_proxy.patch'
--- a/patches/add_signals_to_proxy.patch	2008-01-05 18:58:05 +0000
+++ b/patches/add_signals_to_proxy.patch	2008-01-05 20:38:24 +0000
@@ -2,16 +2,43 @@
 ===================================================================
 --- libmissioncontrol/mission-control.c	(revision 219)
 +++ libmissioncontrol/mission-control.c	(working copy)
-@@ -358,6 +358,12 @@
+@@ -208,6 +208,14 @@
+     dbus_g_object_register_marshaller
+ 	(mission_control_signals_marshal_VOID__STRING_UINT, G_TYPE_NONE,
+ 	 G_TYPE_STRING, G_TYPE_UINT, G_TYPE_INVALID);
++    /* Register the AccountPresenceChanged signal */
++    dbus_g_object_register_marshaller
++	(mission_control_signals_marshal_VOID__UINT_UINT_STRING_UINT_STRING, G_TYPE_NONE,
++	 G_TYPE_UINT, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_INVALID);
++    /* Register the PresenceChanged signal */
++    dbus_g_object_register_marshaller
++	(mission_control_signals_marshal_VOID__UINT_STRING, G_TYPE_NONE,
++	 G_TYPE_UINT, G_TYPE_STRING, G_TYPE_INVALID);
+ }
+ 
+ static void
+@@ -358,6 +366,13 @@
  			     G_TYPE_STRING, G_TYPE_UINT, G_TYPE_INVALID);
      dbus_g_proxy_add_signal (DBUS_G_PROXY (mc_obj), "StatusActual",
  			     G_TYPE_UINT, G_TYPE_UINT, G_TYPE_INVALID);
 +    dbus_g_proxy_add_signal (DBUS_G_PROXY (mc_obj), "AccountPresenceChanged",
-+           G_TYPE_UINT, G_TYPE_UINT, G_TYPE_STRING,
-+           G_TYPE_UINT, G_TYPE_STRING,G_TYPE_INVALID);
++			     G_TYPE_UINT, G_TYPE_UINT, G_TYPE_STRING,
++			     G_TYPE_UINT, G_TYPE_STRING,G_TYPE_INVALID);
 +    dbus_g_proxy_add_signal (DBUS_G_PROXY (mc_obj), "PresenceChanged",
-+          G_TYPE_UINT, G_TYPE_STRING, G_TYPE_INVALID);
++			     G_TYPE_UINT, G_TYPE_STRING, G_TYPE_INVALID);
++
 +
      return mc_obj;
  }
  
+Index: libmissioncontrol/mission-control-signals-marshal.list
+===================================================================
+--- libmissioncontrol/mission-control-signals-marshal.list	(revision 219)
++++ libmissioncontrol/mission-control-signals-marshal.list	(working copy)
+@@ -3,3 +3,6 @@
+ VOID:UINT,UINT
+ VOID:UINT,STRING,UINT
+ VOID:UINT
++VOID:UINT,UINT,STRING,UINT,STRING
++VOID:UINT,STRING
++