diff options
| author | Alban Crequy <alban.crequy@collabora.co.uk> | 2008-11-10 11:37:11 +0000 |
|---|---|---|
| committer | Alban Crequy <alban.crequy@collabora.co.uk> | 2008-11-10 11:37:11 +0000 |
| commit | f6f52aed0f61f249d628654cc1628bcbd453c3b9 (patch) | |
| tree | e104d47e05993bb0f70230d722be5b524967e106 /src/tube-stream.c | |
| parent | dadffcc97eba8c64737f9db7f329914a3fd504f8 (diff) | |
| parent | 02086999c31dab06fccaea225c5052316e10bbef (diff) | |
| download | telepathy-salut-f6f52aed0f61f249d628654cc1628bcbd453c3b9.tar.gz | |
Merge branch 'tubes-requestotron-without-new-specs' into tubes-requestotron-without-new-specs-with-gibber-listener-2
Conflicts:
src/salut-connection.c
Diffstat (limited to 'src/tube-stream.c')
| -rw-r--r-- | src/tube-stream.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/src/tube-stream.c b/src/tube-stream.c index f3db7715..846a3302 100644 --- a/src/tube-stream.c +++ b/src/tube-stream.c @@ -1261,10 +1261,7 @@ salut_tube_stream_class_init (SalutTubeStreamClass *salut_tube_stream_class) "address of the local service", 0, NUM_TP_SOCKET_ADDRESS_TYPES - 1, TP_SOCKET_ADDRESS_TYPE_UNIX, - G_PARAM_READWRITE | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); g_object_class_install_property (object_class, PROP_ADDRESS_TYPE, param_spec); @@ -1273,10 +1270,7 @@ salut_tube_stream_class_init (SalutTubeStreamClass *salut_tube_stream_class) "address", "The listening address of the local service, as indicated by the " "address-type", - G_PARAM_READWRITE | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); g_object_class_install_property (object_class, PROP_ADDRESS, param_spec); param_spec = g_param_spec_uint ( @@ -1286,10 +1280,7 @@ salut_tube_stream_class_init (SalutTubeStreamClass *salut_tube_stream_class) "the local service applies to the local socket", 0, NUM_TP_SOCKET_ACCESS_CONTROLS - 1, TP_SOCKET_ACCESS_CONTROL_LOCALHOST, - G_PARAM_READWRITE | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); g_object_class_install_property (object_class, PROP_ACCESS_CONTROL, param_spec); @@ -1298,10 +1289,7 @@ salut_tube_stream_class_init (SalutTubeStreamClass *salut_tube_stream_class) "access control param", "A parameter for the access control type, to be interpreted as specified" "in the documentation for the Socket_Access_Control enum.", - G_PARAM_READWRITE | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); g_object_class_install_property (object_class, PROP_ACCESS_CONTROL_PARAM, param_spec); |