diff options
| author | Ted Gould <ted@canonical.com> | 2009-02-10 15:30:45 -0600 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2009-02-10 15:30:45 -0600 |
| commit | 8bfb5a1b6475f00cb503c794de585f4817c10163 (patch) | |
| tree | 2606334686227b9059a7160f263d849c967ce6ee /libindicate | |
| parent | 0fcfc2be936f31c531c5f6ddea00fbc8bc083523 (diff) | |
| download | libayatana-indicator-8bfb5a1b6475f00cb503c794de585f4817c10163.tar.gz libayatana-indicator-8bfb5a1b6475f00cb503c794de585f4817c10163.tar.bz2 libayatana-indicator-8bfb5a1b6475f00cb503c794de585f4817c10163.zip | |
Avoiding a conflict with GObject's get_type function.
Diffstat (limited to 'libindicate')
| -rw-r--r-- | libindicate/listener.c | 4 | ||||
| -rw-r--r-- | libindicate/listener.h | 36 |
2 files changed, 20 insertions, 20 deletions
diff --git a/libindicate/listener.c b/libindicate/listener.c index 44f4377..ae948e3 100644 --- a/libindicate/listener.c +++ b/libindicate/listener.c @@ -647,7 +647,7 @@ indicate_listener_display (IndicateListener * listener, IndicateListenerServer * } void -indicate_listener_get_type (IndicateListener * listener, IndicateListenerServer * server, indicate_listener_get_type_cb callback, gpointer data) +indicate_listener_server_get_type (IndicateListener * listener, IndicateListenerServer * server, indicate_listener_get_type_cb callback, gpointer data) { @@ -655,7 +655,7 @@ indicate_listener_get_type (IndicateListener * listener, IndicateListenerServer } void -indicate_listener_get_desktop (IndicateListener * listener, IndicateListenerServer * server, indicate_listener_get_desktop_cb callback, gpointer data) +indicate_listener_server_get_desktop (IndicateListener * listener, IndicateListenerServer * server, indicate_listener_get_desktop_cb callback, gpointer data) { diff --git a/libindicate/listener.h b/libindicate/listener.h index 3bcad00..44855bd 100644 --- a/libindicate/listener.h +++ b/libindicate/listener.h @@ -55,24 +55,24 @@ typedef void (*indicate_listener_get_type_cb) (IndicateListener * listener, Indi typedef void (*indicate_listener_get_desktop_cb) (IndicateListener * listener, IndicateListenerServer * server, gchar * desktop, gpointer data); /* Create a new listener */ -IndicateListener * indicate_listener_new (void); -void indicate_listener_get_property (IndicateListener * listener, - IndicateListenerServer * server, - IndicateListenerIndicator * indicator, - gchar * property, - indicate_listener_get_property_cb callback, - gpointer data); -void indicate_listener_display (IndicateListener * listener, - IndicateListenerServer * server, - IndicateListenerIndicator * indicator); -void indicate_listener_get_type (IndicateListener * listener, - IndicateListenerServer * server, - indicate_listener_get_type_cb callback, - gpointer data); -void indicate_listener_get_desktop (IndicateListener * listener, - IndicateListenerServer * server, - indicate_listener_get_desktop_cb callback, - gpointer data); +IndicateListener * indicate_listener_new (void); +void indicate_listener_get_property (IndicateListener * listener, + IndicateListenerServer * server, + IndicateListenerIndicator * indicator, + gchar * property, + indicate_listener_get_property_cb callback, + gpointer data); +void indicate_listener_display (IndicateListener * listener, + IndicateListenerServer * server, + IndicateListenerIndicator * indicator); +void indicate_listener_server_get_type (IndicateListener * listener, + IndicateListenerServer * server, + indicate_listener_get_type_cb callback, + gpointer data); +void indicate_listener_server_get_desktop (IndicateListener * listener, + IndicateListenerServer * server, + indicate_listener_get_desktop_cb callback, + gpointer data); |