diff options
| author | Robert Carr <racarr@ender> | 2009-01-13 06:43:38 -0500 |
|---|---|---|
| committer | Robert Carr <racarr@ender> | 2009-01-13 06:43:38 -0500 |
| commit | 27a71bbaac3902093a9c1d1fecfadf670c3f2fb8 (patch) | |
| tree | 48cd7ae49fa0bfecf2122f71f914eee9e3afe94d | |
| parent | 544dec8a4c8c8689530bf5eefcc81500812ad73a (diff) | |
| download | libayatana-indicator-27a71bbaac3902093a9c1d1fecfadf670c3f2fb8.tar.gz libayatana-indicator-27a71bbaac3902093a9c1d1fecfadf670c3f2fb8.tar.bz2 libayatana-indicator-27a71bbaac3902093a9c1d1fecfadf670c3f2fb8.zip | |
Use G_BEGIN/END_DECLS, and put the GOBject *_get_type functions in the
header file (needed by introspection, but also the normal GLib style).
| -rw-r--r-- | libindicate/indicator.h | 5 | ||||
| -rw-r--r-- | libindicate/server.h | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/libindicate/indicator.h b/libindicate/indicator.h index 3c8efc8..2a15e3b 100644 --- a/libindicate/indicator.h +++ b/libindicate/indicator.h @@ -5,6 +5,8 @@ #include <glib.h> #include <glib-object.h> +G_BEGIN_DECLS + /* Boilerplate */ #define INDICATE_TYPE_INDICATOR (indicate_indicator_get_type ()) #define INDICATE_INDICATOR(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), INDICATE_TYPE_INDICATOR, IndicateIndicator)) @@ -43,6 +45,8 @@ struct _IndicateIndicatorClass { const gchar * (*get_type) (IndicateIndicator * indicator); }; +GType indicate_indicator_get_type(void) G_GNUC_CONST; + IndicateIndicator * indicate_indicator_new (void); /* Should these just be GObject properties? */ @@ -61,6 +65,7 @@ guint indicate_indicator_get_id (IndicateIndicator * indicator); * subclass and exported through this pretty function */ const gchar * indicate_indicator_get_indicator_type (IndicateIndicator * indicator); +G_END_DECLS #endif /* INDICATE_INDICATOR_H_INCLUDED__ */ diff --git a/libindicate/server.h b/libindicate/server.h index 486252c..ef00846 100644 --- a/libindicate/server.h +++ b/libindicate/server.h @@ -5,6 +5,8 @@ #include <glib.h> #include <glib-object.h> +G_BEGIN_DECLS + /* Boilerplate */ #define INDICATE_TYPE_SERVER (indicate_server_get_type ()) #define INDICATE_SERVER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), INDICATE_TYPE_SERVER, IndicateServer)) @@ -48,6 +50,8 @@ struct _IndicateServerClass { gboolean (*show_indicator_to_user) (IndicateServer * server, guint id, GError ** error); }; +GType indicate_server_get_type (void) G_GNUC_CONST; + /* Create a new server */ IndicateServer * indicate_server_new (void); @@ -82,6 +86,7 @@ gboolean indicate_server_get_indicator_property_group (IndicateServer * server, gboolean indicate_server_get_indicator_properties (IndicateServer * server, guint id, gchar *** properties, GError **error); gboolean indicate_server_show_indicator_to_user (IndicateServer * server, guint id, GError ** error); +G_END_DECLS #endif /* INDICATE_INDICATOR_H_INCLUDED__ */ |