diff options
| -rw-r--r-- | docs/reference/libindicate-decl.txt | 411 | ||||
| -rw-r--r-- | libindicate/server.c | 4 | ||||
| -rw-r--r-- | tests/im-client.c | 7 |
3 files changed, 13 insertions, 409 deletions
diff --git a/docs/reference/libindicate-decl.txt b/docs/reference/libindicate-decl.txt index 6e0c490..fce431d 100644 --- a/docs/reference/libindicate-decl.txt +++ b/docs/reference/libindicate-decl.txt @@ -216,8 +216,8 @@ struct _IndicateListenerClass { void (* indicator_removed) (IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * type); void (* indicator_modified) (IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * type, gchar * property); - void (* server_added) (IndicateListenerServer * server); - void (* server_removed) (IndicateListenerServer * server); + void (* server_added) (IndicateListenerServer * server, gchar * type); + void (* server_removed) (IndicateListenerServer * server, gchar * type); }; </STRUCT> @@ -246,201 +246,6 @@ IndicateListener * listener,IndicateListenerServer * server,IndicateListenerIndi <RETURNS>void </RETURNS> IndicateListener * listener,IndicateListenerServer * server,IndicateListenerIndicator * indicator </FUNCTION> -<FUNCTION> -<NAME>indicate_listener_marshal_VOID__UINT_STRING</NAME> -<RETURNS>void </RETURNS> -GClosure *closure,GValue *return_value,guint n_param_values,const GValue *param_values,gpointer invocation_hint,gpointer marshal_data -</FUNCTION> -<FUNCTION> -<NAME>indicate_listener_marshal_VOID__POINTER_POINTER_STRING</NAME> -<RETURNS>void </RETURNS> -GClosure *closure,GValue *return_value,guint n_param_values,const GValue *param_values,gpointer invocation_hint,gpointer marshal_data -</FUNCTION> -<FUNCTION> -<NAME>indicate_listener_marshal_VOID__POINTER_POINTER_STRING_STRING</NAME> -<RETURNS>void </RETURNS> -GClosure *closure,GValue *return_value,guint n_param_values,const GValue *param_values,gpointer invocation_hint,gpointer marshal_data -</FUNCTION> -<FUNCTION> -<NAME>org_freedesktop_indicator_get_desktop</NAME> -<RETURNS>gboolean </RETURNS> -DBusGProxy *proxy, char ** OUT_desktop_file_uri, GError **error){return dbus_g_proxy_call (proxy, "GetDesktop", error, G_TYPE_INVALID, G_TYPE_STRING, OUT_desktop_file_uri, G_TYPE_INVALID -</FUNCTION> -<USER_FUNCTION> -<NAME>org_freedesktop_indicator_get_desktop_reply</NAME> -<RETURNS>void </RETURNS> -DBusGProxy *proxy, char * OUT_desktop_file_uri, GError *error, gpointer userdata -</USER_FUNCTION> -<FUNCTION> -<NAME>org_freedesktop_indicator_get_desktop_async</NAME> -<RETURNS>DBusGProxyCall *</RETURNS> -DBusGProxy *proxy, org_freedesktop_indicator_get_desktop_reply callback, gpointer userdata){DBusGAsyncData *stuff;stuff = g_new (DBusGAsyncData, 1 -</FUNCTION> -<FUNCTION> -<NAME>dbus_g_proxy_begin_call</NAME> -<RETURNS>return </RETURNS> -proxy, "GetDesktop", org_freedesktop_indicator_get_desktop_async_callback, stuff, g_free, G_TYPE_INVALID -</FUNCTION> -<FUNCTION> -<NAME>org_freedesktop_indicator_get_indicator_count</NAME> -<RETURNS>gboolean </RETURNS> -DBusGProxy *proxy, guint* OUT_indicator_count, GError **error){return dbus_g_proxy_call (proxy, "GetIndicatorCount", error, G_TYPE_INVALID, G_TYPE_UINT, OUT_indicator_count, G_TYPE_INVALID -</FUNCTION> -<USER_FUNCTION> -<NAME>org_freedesktop_indicator_get_indicator_count_reply</NAME> -<RETURNS>void </RETURNS> -DBusGProxy *proxy, guint OUT_indicator_count, GError *error, gpointer userdata -</USER_FUNCTION> -<FUNCTION> -<NAME>org_freedesktop_indicator_get_indicator_count_async</NAME> -<RETURNS>DBusGProxyCall *</RETURNS> -DBusGProxy *proxy, org_freedesktop_indicator_get_indicator_count_reply callback, gpointer userdata){DBusGAsyncData *stuff;stuff = g_new (DBusGAsyncData, 1 -</FUNCTION> -<FUNCTION> -<NAME>dbus_g_proxy_begin_call</NAME> -<RETURNS>return </RETURNS> -proxy, "GetIndicatorCount", org_freedesktop_indicator_get_indicator_count_async_callback, stuff, g_free, G_TYPE_INVALID -</FUNCTION> -<FUNCTION> -<NAME>org_freedesktop_indicator_get_indicator_count_by_type</NAME> -<RETURNS>gboolean </RETURNS> -DBusGProxy *proxy, const char * IN_type, guint* OUT_indicator_count, GError **error){return dbus_g_proxy_call (proxy, "GetIndicatorCountByType", error, G_TYPE_STRING, IN_type, G_TYPE_INVALID, G_TYPE_UINT, OUT_indicator_count, G_TYPE_INVALID -</FUNCTION> -<USER_FUNCTION> -<NAME>org_freedesktop_indicator_get_indicator_count_by_type_reply</NAME> -<RETURNS>void </RETURNS> -DBusGProxy *proxy, guint OUT_indicator_count, GError *error, gpointer userdata -</USER_FUNCTION> -<FUNCTION> -<NAME>org_freedesktop_indicator_get_indicator_count_by_type_async</NAME> -<RETURNS>DBusGProxyCall *</RETURNS> -DBusGProxy *proxy, const char * IN_type, org_freedesktop_indicator_get_indicator_count_by_type_reply callback, gpointer userdata){DBusGAsyncData *stuff;stuff = g_new (DBusGAsyncData, 1 -</FUNCTION> -<FUNCTION> -<NAME>dbus_g_proxy_begin_call</NAME> -<RETURNS>return </RETURNS> -proxy, "GetIndicatorCountByType", org_freedesktop_indicator_get_indicator_count_by_type_async_callback, stuff, g_free, G_TYPE_STRING, IN_type, G_TYPE_INVALID -</FUNCTION> -<FUNCTION> -<NAME>org_freedesktop_indicator_get_indicator_list</NAME> -<RETURNS>gboolean </RETURNS> -DBusGProxy *proxy, GArray** OUT_indicators, GError **error){return dbus_g_proxy_call (proxy, "GetIndicatorList", error, G_TYPE_INVALID, dbus_g_type_get_collection ("GArray", G_TYPE_INT), OUT_indicators, G_TYPE_INVALID -</FUNCTION> -<USER_FUNCTION> -<NAME>org_freedesktop_indicator_get_indicator_list_reply</NAME> -<RETURNS>void </RETURNS> -DBusGProxy *proxy, GArray *OUT_indicators, GError *error, gpointer userdata -</USER_FUNCTION> -<FUNCTION> -<NAME>org_freedesktop_indicator_get_indicator_list_async</NAME> -<RETURNS>DBusGProxyCall *</RETURNS> -DBusGProxy *proxy, org_freedesktop_indicator_get_indicator_list_reply callback, gpointer userdata){DBusGAsyncData *stuff;stuff = g_new (DBusGAsyncData, 1 -</FUNCTION> -<FUNCTION> -<NAME>dbus_g_proxy_begin_call</NAME> -<RETURNS>return </RETURNS> -proxy, "GetIndicatorList", org_freedesktop_indicator_get_indicator_list_async_callback, stuff, g_free, G_TYPE_INVALID -</FUNCTION> -<FUNCTION> -<NAME>org_freedesktop_indicator_get_indicator_list_by_type</NAME> -<RETURNS>gboolean </RETURNS> -DBusGProxy *proxy, const char * IN_type, GArray** OUT_indicators, GError **error){return dbus_g_proxy_call (proxy, "GetIndicatorListByType", error, G_TYPE_STRING, IN_type, G_TYPE_INVALID, dbus_g_type_get_collection ("GArray", G_TYPE_INT), OUT_indicators, G_TYPE_INVALID -</FUNCTION> -<USER_FUNCTION> -<NAME>org_freedesktop_indicator_get_indicator_list_by_type_reply</NAME> -<RETURNS>void </RETURNS> -DBusGProxy *proxy, GArray *OUT_indicators, GError *error, gpointer userdata -</USER_FUNCTION> -<FUNCTION> -<NAME>org_freedesktop_indicator_get_indicator_list_by_type_async</NAME> -<RETURNS>DBusGProxyCall *</RETURNS> -DBusGProxy *proxy, const char * IN_type, org_freedesktop_indicator_get_indicator_list_by_type_reply callback, gpointer userdata){DBusGAsyncData *stuff;stuff = g_new (DBusGAsyncData, 1 -</FUNCTION> -<FUNCTION> -<NAME>dbus_g_proxy_begin_call</NAME> -<RETURNS>return </RETURNS> -proxy, "GetIndicatorListByType", org_freedesktop_indicator_get_indicator_list_by_type_async_callback, stuff, g_free, G_TYPE_STRING, IN_type, G_TYPE_INVALID -</FUNCTION> -<FUNCTION> -<NAME>org_freedesktop_indicator_get_indicator_property</NAME> -<RETURNS>gboolean </RETURNS> -DBusGProxy *proxy, const guint IN_id, const char * IN_property, char ** OUT_value, GError **error){return dbus_g_proxy_call (proxy, "GetIndicatorProperty", error, G_TYPE_UINT, IN_id, G_TYPE_STRING, IN_property, G_TYPE_INVALID, G_TYPE_STRING, OUT_value, G_TYPE_INVALID -</FUNCTION> -<USER_FUNCTION> -<NAME>org_freedesktop_indicator_get_indicator_property_reply</NAME> -<RETURNS>void </RETURNS> -DBusGProxy *proxy, char * OUT_value, GError *error, gpointer userdata -</USER_FUNCTION> -<FUNCTION> -<NAME>org_freedesktop_indicator_get_indicator_property_async</NAME> -<RETURNS>DBusGProxyCall *</RETURNS> -DBusGProxy *proxy, const guint IN_id, const char * IN_property, org_freedesktop_indicator_get_indicator_property_reply callback, gpointer userdata){DBusGAsyncData *stuff;stuff = g_new (DBusGAsyncData, 1 -</FUNCTION> -<FUNCTION> -<NAME>dbus_g_proxy_begin_call</NAME> -<RETURNS>return </RETURNS> -proxy, "GetIndicatorProperty", org_freedesktop_indicator_get_indicator_property_async_callback, stuff, g_free, G_TYPE_UINT, IN_id, G_TYPE_STRING, IN_property, G_TYPE_INVALID -</FUNCTION> -<FUNCTION> -<NAME>org_freedesktop_indicator_get_indicator_property_group</NAME> -<RETURNS>gboolean </RETURNS> -DBusGProxy *proxy, const guint IN_id, const char ** IN_properties, char *** OUT_values, GError **error){return dbus_g_proxy_call (proxy, "GetIndicatorPropertyGroup", error, G_TYPE_UINT, IN_id, G_TYPE_STRV, IN_properties, G_TYPE_INVALID, G_TYPE_STRV, OUT_values, G_TYPE_INVALID -</FUNCTION> -<USER_FUNCTION> -<NAME>org_freedesktop_indicator_get_indicator_property_group_reply</NAME> -<RETURNS>void </RETURNS> -DBusGProxy *proxy, char * *OUT_values, GError *error, gpointer userdata -</USER_FUNCTION> -<FUNCTION> -<NAME>org_freedesktop_indicator_get_indicator_property_group_async</NAME> -<RETURNS>DBusGProxyCall *</RETURNS> -DBusGProxy *proxy, const guint IN_id, const char ** IN_properties, org_freedesktop_indicator_get_indicator_property_group_reply callback, gpointer userdata){DBusGAsyncData *stuff;stuff = g_new (DBusGAsyncData, 1 -</FUNCTION> -<FUNCTION> -<NAME>dbus_g_proxy_begin_call</NAME> -<RETURNS>return </RETURNS> -proxy, "GetIndicatorPropertyGroup", org_freedesktop_indicator_get_indicator_property_group_async_callback, stuff, g_free, G_TYPE_UINT, IN_id, G_TYPE_STRV, IN_properties, G_TYPE_INVALID -</FUNCTION> -<FUNCTION> -<NAME>org_freedesktop_indicator_get_indicator_properties</NAME> -<RETURNS>gboolean </RETURNS> -DBusGProxy *proxy, const guint IN_id, char *** OUT_properties, GError **error){return dbus_g_proxy_call (proxy, "GetIndicatorProperties", error, G_TYPE_UINT, IN_id, G_TYPE_INVALID, G_TYPE_STRV, OUT_properties, G_TYPE_INVALID -</FUNCTION> -<USER_FUNCTION> -<NAME>org_freedesktop_indicator_get_indicator_properties_reply</NAME> -<RETURNS>void </RETURNS> -DBusGProxy *proxy, char * *OUT_properties, GError *error, gpointer userdata -</USER_FUNCTION> -<FUNCTION> -<NAME>org_freedesktop_indicator_get_indicator_properties_async</NAME> -<RETURNS>DBusGProxyCall *</RETURNS> -DBusGProxy *proxy, const guint IN_id, org_freedesktop_indicator_get_indicator_properties_reply callback, gpointer userdata){DBusGAsyncData *stuff;stuff = g_new (DBusGAsyncData, 1 -</FUNCTION> -<FUNCTION> -<NAME>dbus_g_proxy_begin_call</NAME> -<RETURNS>return </RETURNS> -proxy, "GetIndicatorProperties", org_freedesktop_indicator_get_indicator_properties_async_callback, stuff, g_free, G_TYPE_UINT, IN_id, G_TYPE_INVALID -</FUNCTION> -<FUNCTION> -<NAME>org_freedesktop_indicator_show_indicator_to_user</NAME> -<RETURNS>gboolean </RETURNS> -DBusGProxy *proxy, const guint IN_id, GError **error){return dbus_g_proxy_call (proxy, "ShowIndicatorToUser", error, G_TYPE_UINT, IN_id, G_TYPE_INVALID, G_TYPE_INVALID -</FUNCTION> -<USER_FUNCTION> -<NAME>org_freedesktop_indicator_show_indicator_to_user_reply</NAME> -<RETURNS>void </RETURNS> -DBusGProxy *proxy, GError *error, gpointer userdata -</USER_FUNCTION> -<FUNCTION> -<NAME>org_freedesktop_indicator_show_indicator_to_user_async</NAME> -<RETURNS>DBusGProxyCall *</RETURNS> -DBusGProxy *proxy, const guint IN_id, org_freedesktop_indicator_show_indicator_to_user_reply callback, gpointer userdata){DBusGAsyncData *stuff;stuff = g_new (DBusGAsyncData, 1 -</FUNCTION> -<FUNCTION> -<NAME>dbus_g_proxy_begin_call</NAME> -<RETURNS>return </RETURNS> -proxy, "ShowIndicatorToUser", org_freedesktop_indicator_show_indicator_to_user_async_callback, stuff, g_free, G_TYPE_UINT, IN_id, G_TYPE_INVALID -</FUNCTION> <MACRO> <NAME>INDICATE_TYPE_SERVER</NAME> #define INDICATE_TYPE_SERVER (indicate_server_get_type ()) @@ -487,9 +292,10 @@ struct _IndicateServerClass { void (* indicator_added) (IndicateServer * server, guint id, gchar * type); void (* indicator_removed) (IndicateServer * server, guint id, gchar * type); void (* indicator_modified) (IndicateServer * server, guint id, gchar * property); + void (* server_show) (IndicateServer * server, gchar * type); + void (* server_hide) (IndicateServer * server, gchar * type); /* Virtual Functions */ - gboolean (*get_desktop) (IndicateServer * server, gchar ** desktop_path, GError **error); gboolean (*get_indicator_count) (IndicateServer * server, guint * count, GError **error); gboolean (*get_indicator_count_by_type) (IndicateServer * server, gchar * type, guint * count, GError **error); gboolean (*get_indicator_list) (IndicateServer * server, GArray ** indicators, GError ** error); @@ -558,11 +364,6 @@ void IndicateServer * server </FUNCTION> <FUNCTION> -<NAME>indicate_server_get_desktop</NAME> -<RETURNS>gboolean </RETURNS> -IndicateServer * server, gchar ** desktop_path, GError **error -</FUNCTION> -<FUNCTION> <NAME>indicate_server_get_indicator_count</NAME> <RETURNS>gboolean </RETURNS> IndicateServer * server, guint * count, GError **error @@ -671,207 +472,3 @@ void <RETURNS>IndicateIndicatorMessage *</RETURNS> void </FUNCTION> -<MACRO> -<NAME>g_marshal_value_peek_boolean</NAME> -#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) -</MACRO> -<MACRO> -<NAME>g_marshal_value_peek_char</NAME> -#define g_marshal_value_peek_char(v) g_value_get_char (v) -</MACRO> -<MACRO> -<NAME>g_marshal_value_peek_uchar</NAME> -#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) -</MACRO> -<MACRO> -<NAME>g_marshal_value_peek_int</NAME> -#define g_marshal_value_peek_int(v) g_value_get_int (v) -</MACRO> -<MACRO> -<NAME>g_marshal_value_peek_uint</NAME> -#define g_marshal_value_peek_uint(v) g_value_get_uint (v) -</MACRO> -<MACRO> -<NAME>g_marshal_value_peek_long</NAME> -#define g_marshal_value_peek_long(v) g_value_get_long (v) -</MACRO> -<MACRO> -<NAME>g_marshal_value_peek_ulong</NAME> -#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v) -</MACRO> -<MACRO> -<NAME>g_marshal_value_peek_int64</NAME> -#define g_marshal_value_peek_int64(v) g_value_get_int64 (v) -</MACRO> -<MACRO> -<NAME>g_marshal_value_peek_uint64</NAME> -#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v) -</MACRO> -<MACRO> -<NAME>g_marshal_value_peek_enum</NAME> -#define g_marshal_value_peek_enum(v) g_value_get_enum (v) -</MACRO> -<MACRO> -<NAME>g_marshal_value_peek_flags</NAME> -#define g_marshal_value_peek_flags(v) g_value_get_flags (v) -</MACRO> -<MACRO> -<NAME>g_marshal_value_peek_float</NAME> -#define g_marshal_value_peek_float(v) g_value_get_float (v) -</MACRO> -<MACRO> -<NAME>g_marshal_value_peek_double</NAME> -#define g_marshal_value_peek_double(v) g_value_get_double (v) -</MACRO> -<MACRO> -<NAME>g_marshal_value_peek_string</NAME> -#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v) -</MACRO> -<MACRO> -<NAME>g_marshal_value_peek_param</NAME> -#define g_marshal_value_peek_param(v) g_value_get_param (v) -</MACRO> -<MACRO> -<NAME>g_marshal_value_peek_boxed</NAME> -#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v) -</MACRO> -<MACRO> -<NAME>g_marshal_value_peek_pointer</NAME> -#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v) -</MACRO> -<MACRO> -<NAME>g_marshal_value_peek_object</NAME> -#define g_marshal_value_peek_object(v) g_value_get_object (v) -</MACRO> -<MACRO> -<NAME>g_marshal_value_peek_boolean</NAME> -#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int -</MACRO> -<MACRO> -<NAME>g_marshal_value_peek_char</NAME> -#define g_marshal_value_peek_char(v) (v)->data[0].v_int -</MACRO> -<MACRO> -<NAME>g_marshal_value_peek_uchar</NAME> -#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint -</MACRO> -<MACRO> -<NAME>g_marshal_value_peek_int</NAME> -#define g_marshal_value_peek_int(v) (v)->data[0].v_int -</MACRO> -<MACRO> -<NAME>g_marshal_value_peek_uint</NAME> -#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint -</MACRO> -<MACRO> -<NAME>g_marshal_value_peek_long</NAME> -#define g_marshal_value_peek_long(v) (v)->data[0].v_long -</MACRO> -<MACRO> -<NAME>g_marshal_value_peek_ulong</NAME> -#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong -</MACRO> -<MACRO> -<NAME>g_marshal_value_peek_int64</NAME> -#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64 -</MACRO> -<MACRO> -<NAME>g_marshal_value_peek_uint64</NAME> -#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64 -</MACRO> -<MACRO> -<NAME>g_marshal_value_peek_enum</NAME> -#define g_marshal_value_peek_enum(v) (v)->data[0].v_long -</MACRO> -<MACRO> -<NAME>g_marshal_value_peek_flags</NAME> -#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong -</MACRO> -<MACRO> -<NAME>g_marshal_value_peek_float</NAME> -#define g_marshal_value_peek_float(v) (v)->data[0].v_float -</MACRO> -<MACRO> -<NAME>g_marshal_value_peek_double</NAME> -#define g_marshal_value_peek_double(v) (v)->data[0].v_double -</MACRO> -<MACRO> -<NAME>g_marshal_value_peek_string</NAME> -#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer -</MACRO> -<MACRO> -<NAME>g_marshal_value_peek_param</NAME> -#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer -</MACRO> -<MACRO> -<NAME>g_marshal_value_peek_boxed</NAME> -#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer -</MACRO> -<MACRO> -<NAME>g_marshal_value_peek_pointer</NAME> -#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer -</MACRO> -<MACRO> -<NAME>g_marshal_value_peek_object</NAME> -#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer -</MACRO> -<FUNCTION> -<NAME>dbus_glib_marshal_indicate_server_BOOLEAN__UINT_STRING_POINTER_POINTER</NAME> -<RETURNS>void </RETURNS> -GClosure *closure,GValue *return_value,guint n_param_values,const GValue *param_values,gpointer invocation_hint,gpointer marshal_data -</FUNCTION> -<FUNCTION> -<NAME>dbus_glib_marshal_indicate_server_BOOLEAN__UINT_STRING_POINTER_POINTER</NAME> -<RETURNS>void </RETURNS> -GClosure *closure,GValue *return_value G_GNUC_UNUSED,guint n_param_values,const GValue *param_values,gpointer invocation_hint G_GNUC_UNUSED,gpointer marshal_data){typedef gboolean (*GMarshalFunc_BOOLEAN__UINT_STRING_POINTER_POINTER) (gpointer data1,guint arg_1,gpointer arg_2,gpointer arg_3,gpointer arg_4,gpointer data2 -</FUNCTION> -<FUNCTION> -<NAME>dbus_glib_marshal_indicate_server_BOOLEAN__POINTER_POINTER</NAME> -<RETURNS>void </RETURNS> -GClosure *closure,GValue *return_value,guint n_param_values,const GValue *param_values,gpointer invocation_hint,gpointer marshal_data -</FUNCTION> -<FUNCTION> -<NAME>dbus_glib_marshal_indicate_server_BOOLEAN__POINTER_POINTER</NAME> -<RETURNS>void </RETURNS> -GClosure *closure,GValue *return_value G_GNUC_UNUSED,guint n_param_values,const GValue *param_values,gpointer invocation_hint G_GNUC_UNUSED,gpointer marshal_data){typedef gboolean (*GMarshalFunc_BOOLEAN__POINTER_POINTER) (gpointer data1,gpointer arg_1,gpointer arg_2,gpointer data2 -</FUNCTION> -<FUNCTION> -<NAME>dbus_glib_marshal_indicate_server_BOOLEAN__UINT_BOXED_POINTER_POINTER</NAME> -<RETURNS>void </RETURNS> -GClosure *closure,GValue *return_value,guint n_param_values,const GValue *param_values,gpointer invocation_hint,gpointer marshal_data -</FUNCTION> -<FUNCTION> -<NAME>dbus_glib_marshal_indicate_server_BOOLEAN__UINT_BOXED_POINTER_POINTER</NAME> -<RETURNS>void </RETURNS> -GClosure *closure,GValue *return_value G_GNUC_UNUSED,guint n_param_values,const GValue *param_values,gpointer invocation_hint G_GNUC_UNUSED,gpointer marshal_data){typedef gboolean (*GMarshalFunc_BOOLEAN__UINT_BOXED_POINTER_POINTER) (gpointer data1,guint arg_1,gpointer arg_2,gpointer arg_3,gpointer arg_4,gpointer data2 -</FUNCTION> -<FUNCTION> -<NAME>dbus_glib_marshal_indicate_server_BOOLEAN__STRING_POINTER_POINTER</NAME> -<RETURNS>void </RETURNS> -GClosure *closure,GValue *return_value,guint n_param_values,const GValue *param_values,gpointer invocation_hint,gpointer marshal_data -</FUNCTION> -<FUNCTION> -<NAME>dbus_glib_marshal_indicate_server_BOOLEAN__STRING_POINTER_POINTER</NAME> -<RETURNS>void </RETURNS> -GClosure *closure,GValue *return_value G_GNUC_UNUSED,guint n_param_values,const GValue *param_values,gpointer invocation_hint G_GNUC_UNUSED,gpointer marshal_data){typedef gboolean (*GMarshalFunc_BOOLEAN__STRING_POINTER_POINTER) (gpointer data1,gpointer arg_1,gpointer arg_2,gpointer arg_3,gpointer data2 -</FUNCTION> -<FUNCTION> -<NAME>dbus_glib_marshal_indicate_server_BOOLEAN__UINT_POINTER_POINTER</NAME> -<RETURNS>void </RETURNS> -GClosure *closure,GValue *return_value,guint n_param_values,const GValue *param_values,gpointer invocation_hint,gpointer marshal_data -</FUNCTION> -<FUNCTION> -<NAME>dbus_glib_marshal_indicate_server_BOOLEAN__UINT_POINTER_POINTER</NAME> -<RETURNS>void </RETURNS> -GClosure *closure,GValue *return_value G_GNUC_UNUSED,guint n_param_values,const GValue *param_values,gpointer invocation_hint G_GNUC_UNUSED,gpointer marshal_data){typedef gboolean (*GMarshalFunc_BOOLEAN__UINT_POINTER_POINTER) (gpointer data1,guint arg_1,gpointer arg_2,gpointer arg_3,gpointer data2 -</FUNCTION> -<FUNCTION> -<NAME>dbus_glib_marshal_indicate_server_BOOLEAN__UINT_POINTER</NAME> -<RETURNS>void </RETURNS> -GClosure *closure,GValue *return_value,guint n_param_values,const GValue *param_values,gpointer invocation_hint,gpointer marshal_data -</FUNCTION> -<FUNCTION> -<NAME>dbus_glib_marshal_indicate_server_BOOLEAN__UINT_POINTER</NAME> -<RETURNS>void </RETURNS> -GClosure *closure,GValue *return_value G_GNUC_UNUSED,guint n_param_values,const GValue *param_values,gpointer invocation_hint G_GNUC_UNUSED,gpointer marshal_data){typedef gboolean (*GMarshalFunc_BOOLEAN__UINT_POINTER) (gpointer data1,guint arg_1,gpointer arg_2,gpointer data2 -</FUNCTION> diff --git a/libindicate/server.c b/libindicate/server.c index 6139fd0..f5bd0bb 100644 --- a/libindicate/server.c +++ b/libindicate/server.c @@ -175,7 +175,7 @@ indicate_server_finalize (GObject * obj) IndicateServerPrivate * priv = INDICATE_SERVER_GET_PRIVATE(server); /* TODO: This probably shouldn't be as far down as finalize, but it's fine here. */ - g_signal_emit(server, signals[SERVER_HIDE], 0, "", TRUE); + g_signal_emit(server, signals[SERVER_HIDE], 0, priv->type ? priv->type : "", TRUE); if (priv->path) { g_free(priv->path); @@ -270,7 +270,7 @@ indicate_server_show (IndicateServer * server) G_OBJECT(server)); priv->visible = TRUE; - g_signal_emit(server, signals[SERVER_SHOW], 0, "", TRUE); + g_signal_emit(server, signals[SERVER_SHOW], 0, priv->type ? priv->type : "", TRUE); return; } diff --git a/tests/im-client.c b/tests/im-client.c index 9e6bc77..b6e4f09 100644 --- a/tests/im-client.c +++ b/tests/im-client.c @@ -1,5 +1,6 @@ #include <glib.h> +#include "libindicate/server.h" #include "libindicate/indicator-message.h" static void @@ -13,6 +14,12 @@ main (int argc, char ** argv) { g_type_init(); + IndicateServer * server = indicate_server_ref_default(); + GValue value = {0}; + g_value_init(&value, G_TYPE_STRING); + g_value_set_static_string(&value, "message"); + g_object_set_property(G_OBJECT(server), "type", &value); + IndicateIndicatorMessage * indicator; indicator = indicate_indicator_message_new(); |