[Pkg-telepathy-commits] ./packages/unstable/telepathy-sofiasip r42: Commit forgotten changes: Add 00_override_properties.patch and upload to unstable

[Sjoerd Simons]

------------------------------------------------------------
revno: 42
committer: Sjoerd Simons <sjoerd at luon.net>
branch nick: telepathy-sofiasip
timestamp: Sat 2008-03-08 17:40:36 +0100
message:
  Commit forgotten changes: Add 00_override_properties.patch and upload to unstable
added:
  patches/00_override_properties.patch
modified:
  changelog
-------------- next part --------------
=== modified file 'changelog'
--- a/changelog	2008-02-09 14:24:15 +0000
+++ b/changelog	2008-03-08 16:40:36 +0000
@@ -1,8 +1,12 @@
 telepathy-sofiasip (0.5.3-1) unstable; urgency=low
 
   * New upstream release
+  * debian/patches/00_override_properties.patch
+    - Override TpChannel properties instead of redefining them in child
+      classes. Prevents an assertion failure because the property flags were
+      incompatible in the redefine.
 
- -- Sjoerd Simons <sjoerd at debian.org>  Sat, 09 Feb 2008 15:23:48 +0100
+ -- Sjoerd Simons <sjoerd at debian.org>  Sat, 09 Feb 2008 16:12:58 +0100
 
 telepathy-sofiasip (0.5.1-1) unstable; urgency=low
 

=== added file 'patches/00_override_properties.patch'
--- a/patches/00_override_properties.patch	1970-01-01 00:00:00 +0000
+++ b/patches/00_override_properties.patch	2008-03-08 16:40:36 +0000
@@ -0,0 +1,79 @@
+Sat Feb  9 15:56:14 CET 2008  Sjoerd Simons <sjoerd at luon.net>
+  * Override channel-type and object-path properties instead of redefining them
+diff -rN -u old-telepathy-sofiasip/src/sip-media-channel.c new-telepathy-sofiasip/src/sip-media-channel.c
+--- old-telepathy-sofiasip/src/sip-media-channel.c	2008-02-09 16:01:57.000000000 +0100
++++ new-telepathy-sofiasip/src/sip-media-channel.c	2008-02-09 16:01:57.000000000 +0100
+@@ -222,6 +222,10 @@
+   g_object_class_override_property (object_class, PROP_HANDLE_TYPE,
+       "handle-type");
+   g_object_class_override_property (object_class, PROP_HANDLE, "handle");
++  g_object_class_override_property (object_class, PROP_OBJECT_PATH,
++      "object-path");
++  g_object_class_override_property (object_class, PROP_CHANNEL_TYPE,
++      "channel-type");
+ 
+   tp_properties_mixin_class_init (object_class,
+       G_STRUCT_OFFSET (SIPMediaChannelClass, properties_class),
+@@ -247,25 +251,6 @@
+                                     G_PARAM_STATIC_BLURB);
+   g_object_class_install_property (object_class, PROP_FACTORY, param_spec);
+ 
+-  param_spec = g_param_spec_string ("object-path", "D-Bus object path",
+-                                    "The D-Bus object path used for this "
+-                                    "object on the bus.",
+-                                    NULL,
+-                                    G_PARAM_CONSTRUCT_ONLY |
+-                                    G_PARAM_READWRITE |
+-                                    G_PARAM_STATIC_NAME |
+-                                    G_PARAM_STATIC_BLURB);
+-  g_object_class_install_property (object_class, PROP_OBJECT_PATH, param_spec);
+-
+-  param_spec = g_param_spec_string ("channel-type", "Telepathy channel type",
+-                                    "The D-Bus interface representing the "
+-                                    "type of this channel.",
+-                                    NULL,
+-                                    G_PARAM_READABLE |
+-                                    G_PARAM_STATIC_NAME |
+-                                    G_PARAM_STATIC_BLURB);
+-  g_object_class_install_property (object_class, PROP_CHANNEL_TYPE, param_spec);
+-
+   param_spec = g_param_spec_string ("nat-traversal", "NAT traversal mechanism",
+                                     "A string representing the type of NAT "
+                                     "traversal that should be performed for "
+diff -rN -u old-telepathy-sofiasip/src/sip-text-channel.c new-telepathy-sofiasip/src/sip-text-channel.c
+--- old-telepathy-sofiasip/src/sip-text-channel.c	2008-02-09 16:01:57.000000000 +0100
++++ new-telepathy-sofiasip/src/sip-text-channel.c	2008-02-09 16:01:57.000000000 +0100
+@@ -211,28 +211,13 @@
+ 				   G_PARAM_STATIC_BLURB);
+   g_object_class_install_property(object_class, PROP_CONNECTION, param_spec);
+ 
+-  param_spec = g_param_spec_string("object-path", "D-Bus object path",
+-				   "The D-Bus object path used for this "
+-				   "object on the bus.",
+-				   NULL,
+-				   G_PARAM_CONSTRUCT_ONLY |
+-				   G_PARAM_READWRITE |
+-				   G_PARAM_STATIC_NAME |
+-				   G_PARAM_STATIC_BLURB);
+-  g_object_class_install_property(object_class, PROP_OBJECT_PATH, param_spec);
+-
+-  param_spec = g_param_spec_string("channel-type", "Telepathy channel type",
+-				   "The D-Bus interface representing the "
+-				   "type of this channel.",
+-				   NULL,
+-				   G_PARAM_READABLE |
+-				   G_PARAM_STATIC_NAME |
+-				   G_PARAM_STATIC_BLURB);
+-  g_object_class_install_property(object_class, PROP_CHANNEL_TYPE, param_spec);
+-
+   g_object_class_override_property (object_class, PROP_HANDLE_TYPE,
+       "handle-type");
+   g_object_class_override_property (object_class, PROP_HANDLE, "handle");
++  g_object_class_override_property (object_class, PROP_OBJECT_PATH,
++      "object-path");
++  g_object_class_override_property (object_class, PROP_CHANNEL_TYPE,
++      "channel-type");
+ }
+ 
+ static
+