[Xfce4-commits] <xfce4-panel:devel> Rename Iface to Interface to match G_IMPLEMENT_INTERFACE.
Nick Schermer
noreply at xfce.org
Sun Jan 3 12:38:06 CET 2010
Updating branch refs/heads/devel
to 36116f17c65a0e8df732d9781daf02b377db72a0 (commit)
from cd0f2cae59adb416a4c3c89ca7984fb0c1d2f8ce (commit)
commit 36116f17c65a0e8df732d9781daf02b377db72a0
Author: Nick Schermer <nick at xfce.org>
Date: Wed Dec 30 18:13:35 2009 +0100
Rename Iface to Interface to match G_IMPLEMENT_INTERFACE.
libxfce4panel/xfce-panel-plugin-provider.c | 47 ++++++------
libxfce4panel/xfce-panel-plugin-provider.h | 14 ++--
libxfce4panel/xfce-panel-plugin.c | 80 ++++++++++----------
panel/panel-plugin-external-46.c | 88 +++++++++++-----------
panel/panel-plugin-external.c | 110 ++++++++++++++--------------
5 files changed, 171 insertions(+), 168 deletions(-)
diff --git a/libxfce4panel/xfce-panel-plugin-provider.c b/libxfce4panel/xfce-panel-plugin-provider.c
index 36757d0..089d224 100644
--- a/libxfce4panel/xfce-panel-plugin-provider.c
+++ b/libxfce4panel/xfce-panel-plugin-provider.c
@@ -37,8 +37,7 @@ enum
-static void xfce_panel_plugin_provider_class_init (gpointer klass,
- gpointer klass_data);
+static void xfce_panel_plugin_provider_default_init (XfcePanelPluginProviderInterface *klass);
@@ -49,25 +48,29 @@ static guint provider_signals[LAST_SIGNAL];
GType
xfce_panel_plugin_provider_get_type (void)
{
- static GType type = 0;
+ static volatile gsize type__volatile = 0;
+ GType type;
- if (G_UNLIKELY (type == 0))
+ if (g_once_init_enter (&type__volatile))
{
type = g_type_register_static_simple (G_TYPE_INTERFACE,
g_intern_static_string ("XfcePanelPluginProvider"),
- sizeof (XfcePanelPluginProviderIface),
- xfce_panel_plugin_provider_class_init,
- 0, NULL, 0);
+ sizeof (XfcePanelPluginProviderInterface),
+ (GClassInitFunc) xfce_panel_plugin_provider_default_init,
+ 0,
+ NULL,
+ 0);
+
+ g_once_init_leave (&type__volatile, type);
}
- return type;
+ return type__volatile;
}
static void
-xfce_panel_plugin_provider_class_init (gpointer klass,
- gpointer klass_data)
+xfce_panel_plugin_provider_default_init (XfcePanelPluginProviderInterface *klass)
{
provider_signals[PROVIDER_SIGNAL] =
g_signal_new (g_intern_static_string ("provider-signal"),
@@ -85,7 +88,7 @@ xfce_panel_plugin_provider_get_name (XfcePanelPluginProvider *provider)
{
panel_return_val_if_fail (XFCE_IS_PANEL_PLUGIN_PROVIDER (provider), NULL);
- return (*XFCE_PANEL_PLUGIN_PROVIDER_GET_IFACE (provider)->get_name) (provider);
+ return (*XFCE_PANEL_PLUGIN_PROVIDER_GET_INTERFACE (provider)->get_name) (provider);
}
@@ -95,7 +98,7 @@ xfce_panel_plugin_provider_get_unique_id (XfcePanelPluginProvider *provider)
{
panel_return_val_if_fail (XFCE_IS_PANEL_PLUGIN_PROVIDER (provider), -1);
- return (*XFCE_PANEL_PLUGIN_PROVIDER_GET_IFACE (provider)->get_unique_id) (provider);
+ return (*XFCE_PANEL_PLUGIN_PROVIDER_GET_INTERFACE (provider)->get_unique_id) (provider);
}
@@ -106,7 +109,7 @@ xfce_panel_plugin_provider_set_size (XfcePanelPluginProvider *provider,
{
panel_return_if_fail (XFCE_IS_PANEL_PLUGIN_PROVIDER (provider));
- (*XFCE_PANEL_PLUGIN_PROVIDER_GET_IFACE (provider)->set_size) (provider, size);
+ (*XFCE_PANEL_PLUGIN_PROVIDER_GET_INTERFACE (provider)->set_size) (provider, size);
}
@@ -117,7 +120,7 @@ xfce_panel_plugin_provider_set_orientation (XfcePanelPluginProvider *provider,
{
panel_return_if_fail (XFCE_IS_PANEL_PLUGIN_PROVIDER (provider));
- (*XFCE_PANEL_PLUGIN_PROVIDER_GET_IFACE (provider)->set_orientation) (provider, orientation);
+ (*XFCE_PANEL_PLUGIN_PROVIDER_GET_INTERFACE (provider)->set_orientation) (provider, orientation);
}
@@ -128,7 +131,7 @@ xfce_panel_plugin_provider_set_screen_position (XfcePanelPluginProvider *provide
{
panel_return_if_fail (XFCE_IS_PANEL_PLUGIN_PROVIDER (provider));
- (*XFCE_PANEL_PLUGIN_PROVIDER_GET_IFACE (provider)->set_screen_position) (provider, screen_position);
+ (*XFCE_PANEL_PLUGIN_PROVIDER_GET_INTERFACE (provider)->set_screen_position) (provider, screen_position);
}
@@ -138,7 +141,7 @@ xfce_panel_plugin_provider_save (XfcePanelPluginProvider *provider)
{
panel_return_if_fail (XFCE_IS_PANEL_PLUGIN_PROVIDER (provider));
- (*XFCE_PANEL_PLUGIN_PROVIDER_GET_IFACE (provider)->save) (provider);
+ (*XFCE_PANEL_PLUGIN_PROVIDER_GET_INTERFACE (provider)->save) (provider);
}
@@ -160,7 +163,7 @@ xfce_panel_plugin_provider_get_show_configure (XfcePanelPluginProvider *provider
{
panel_return_val_if_fail (XFCE_IS_PANEL_PLUGIN_PROVIDER (provider), FALSE);
- return (*XFCE_PANEL_PLUGIN_PROVIDER_GET_IFACE (provider)->get_show_configure) (provider);
+ return (*XFCE_PANEL_PLUGIN_PROVIDER_GET_INTERFACE (provider)->get_show_configure) (provider);
}
@@ -170,7 +173,7 @@ xfce_panel_plugin_provider_show_configure (XfcePanelPluginProvider *provider)
{
panel_return_if_fail (XFCE_IS_PANEL_PLUGIN_PROVIDER (provider));
- (*XFCE_PANEL_PLUGIN_PROVIDER_GET_IFACE (provider)->show_configure) (provider);
+ (*XFCE_PANEL_PLUGIN_PROVIDER_GET_INTERFACE (provider)->show_configure) (provider);
}
@@ -180,7 +183,7 @@ xfce_panel_plugin_provider_get_show_about (XfcePanelPluginProvider *provider)
{
panel_return_val_if_fail (XFCE_IS_PANEL_PLUGIN_PROVIDER (provider), FALSE);
- return (*XFCE_PANEL_PLUGIN_PROVIDER_GET_IFACE (provider)->get_show_about) (provider);
+ return (*XFCE_PANEL_PLUGIN_PROVIDER_GET_INTERFACE (provider)->get_show_about) (provider);
}
@@ -190,7 +193,7 @@ xfce_panel_plugin_provider_show_about (XfcePanelPluginProvider *provider)
{
panel_return_if_fail (XFCE_IS_PANEL_PLUGIN_PROVIDER (provider));
- (*XFCE_PANEL_PLUGIN_PROVIDER_GET_IFACE (provider)->show_about) (provider);
+ (*XFCE_PANEL_PLUGIN_PROVIDER_GET_INTERFACE (provider)->show_about) (provider);
}
@@ -200,7 +203,7 @@ xfce_panel_plugin_provider_remove (XfcePanelPluginProvider *provider)
{
panel_return_if_fail (XFCE_IS_PANEL_PLUGIN_PROVIDER (provider));
- (*XFCE_PANEL_PLUGIN_PROVIDER_GET_IFACE (provider)->remove) (provider);
+ (*XFCE_PANEL_PLUGIN_PROVIDER_GET_INTERFACE (provider)->remove) (provider);
}
@@ -214,7 +217,7 @@ xfce_panel_plugin_provider_remote_event (XfcePanelPluginProvider *provider,
panel_return_val_if_fail (name != NULL, TRUE);
panel_return_val_if_fail (value == NULL || G_IS_VALUE (value), TRUE);
- return (*XFCE_PANEL_PLUGIN_PROVIDER_GET_IFACE (provider)->remote_event) (provider, name, value);
+ return (*XFCE_PANEL_PLUGIN_PROVIDER_GET_INTERFACE (provider)->remote_event) (provider, name, value);
}
diff --git a/libxfce4panel/xfce-panel-plugin-provider.h b/libxfce4panel/xfce-panel-plugin-provider.h
index ff43504..f84f665 100644
--- a/libxfce4panel/xfce-panel-plugin-provider.h
+++ b/libxfce4panel/xfce-panel-plugin-provider.h
@@ -24,13 +24,13 @@
G_BEGIN_DECLS
-typedef struct _XfcePanelPluginProviderIface XfcePanelPluginProviderIface;
-typedef struct _XfcePanelPluginProvider XfcePanelPluginProvider;
+typedef struct _XfcePanelPluginProviderInterface XfcePanelPluginProviderInterface;
+typedef struct _XfcePanelPluginProvider XfcePanelPluginProvider;
-#define XFCE_TYPE_PANEL_PLUGIN_PROVIDER (xfce_panel_plugin_provider_get_type ())
-#define XFCE_PANEL_PLUGIN_PROVIDER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), XFCE_TYPE_PANEL_PLUGIN_PROVIDER, XfcePanelPluginProvider))
-#define XFCE_IS_PANEL_PLUGIN_PROVIDER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), XFCE_TYPE_PANEL_PLUGIN_PROVIDER))
-#define XFCE_PANEL_PLUGIN_PROVIDER_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), XFCE_TYPE_PANEL_PLUGIN_PROVIDER, XfcePanelPluginProviderIface))
+#define XFCE_TYPE_PANEL_PLUGIN_PROVIDER (xfce_panel_plugin_provider_get_type ())
+#define XFCE_PANEL_PLUGIN_PROVIDER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), XFCE_TYPE_PANEL_PLUGIN_PROVIDER, XfcePanelPluginProvider))
+#define XFCE_IS_PANEL_PLUGIN_PROVIDER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), XFCE_TYPE_PANEL_PLUGIN_PROVIDER))
+#define XFCE_PANEL_PLUGIN_PROVIDER_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), XFCE_TYPE_PANEL_PLUGIN_PROVIDER, XfcePanelPluginProviderInterface))
/* plugin module functions */
typedef GtkWidget *(*PluginConstructFunc) (const gchar *name,
@@ -42,7 +42,7 @@ typedef GtkWidget *(*PluginConstructFunc) (const gchar *name,
typedef GType (*PluginInitFunc) (GTypeModule *module,
gboolean *make_resident);
-struct _XfcePanelPluginProviderIface
+struct _XfcePanelPluginProviderInterface
{
/*< private >*/
GTypeInterface __parent__;
diff --git a/libxfce4panel/xfce-panel-plugin.c b/libxfce4panel/xfce-panel-plugin.c
index 2cf37a9..a2d6a40 100644
--- a/libxfce4panel/xfce-panel-plugin.c
+++ b/libxfce4panel/xfce-panel-plugin.c
@@ -59,45 +59,45 @@ typedef gint (*ProviderToPluginInt) (XfcePanelPluginProvider *provider)
-static void xfce_panel_plugin_provider_init (XfcePanelPluginProviderIface *iface);
-static void xfce_panel_plugin_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
-static void xfce_panel_plugin_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
-static void xfce_panel_plugin_dispose (GObject *object);
-static void xfce_panel_plugin_finalize (GObject *object);
-static void xfce_panel_plugin_realize (GtkWidget *widget);
-static gboolean xfce_panel_plugin_button_press_event (GtkWidget *widget,
- GdkEventButton *event);
-static void xfce_panel_plugin_menu_move (XfcePanelPlugin *plugin);
-static void xfce_panel_plugin_menu_remove (XfcePanelPlugin *plugin);
-static void xfce_panel_plugin_menu_add_items (XfcePanelPlugin *plugin);
-static void xfce_panel_plugin_menu_panel_preferences (XfcePanelPlugin *plugin);
-static GtkMenu *xfce_panel_plugin_menu_get (XfcePanelPlugin *plugin);
-static inline gchar *xfce_panel_plugin_relative_filename (XfcePanelPlugin *plugin);
-static void xfce_panel_plugin_unregister_menu (GtkMenu *menu,
- XfcePanelPlugin *plugin);
-static void xfce_panel_plugin_set_size (XfcePanelPluginProvider *provider,
- gint size);
-static void xfce_panel_plugin_set_orientation (XfcePanelPluginProvider *provider,
- GtkOrientation orientation);
-static void xfce_panel_plugin_set_screen_position (XfcePanelPluginProvider *provider,
- XfceScreenPosition screen_position);
-static void xfce_panel_plugin_save (XfcePanelPluginProvider *provider);
-static gboolean xfce_panel_plugin_get_show_configure (XfcePanelPluginProvider *provider);
-static void xfce_panel_plugin_show_configure (XfcePanelPluginProvider *provider);
-static gboolean xfce_panel_plugin_get_show_about (XfcePanelPluginProvider *provider);
-static void xfce_panel_plugin_show_about (XfcePanelPluginProvider *provider);
-static void xfce_panel_plugin_remove (XfcePanelPluginProvider *provider);
-static gboolean xfce_panel_plugin_remote_event (XfcePanelPluginProvider *provider,
- const gchar *name,
- const GValue *value);
-static void xfce_panel_plugin_take_window_notify (gpointer data,
- GObject *where_the_object_was);
+static void xfce_panel_plugin_provider_init (XfcePanelPluginProviderInterface *iface);
+static void xfce_panel_plugin_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
+static void xfce_panel_plugin_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void xfce_panel_plugin_dispose (GObject *object);
+static void xfce_panel_plugin_finalize (GObject *object);
+static void xfce_panel_plugin_realize (GtkWidget *widget);
+static gboolean xfce_panel_plugin_button_press_event (GtkWidget *widget,
+ GdkEventButton *event);
+static void xfce_panel_plugin_menu_move (XfcePanelPlugin *plugin);
+static void xfce_panel_plugin_menu_remove (XfcePanelPlugin *plugin);
+static void xfce_panel_plugin_menu_add_items (XfcePanelPlugin *plugin);
+static void xfce_panel_plugin_menu_panel_preferences (XfcePanelPlugin *plugin);
+static GtkMenu *xfce_panel_plugin_menu_get (XfcePanelPlugin *plugin);
+static inline gchar *xfce_panel_plugin_relative_filename (XfcePanelPlugin *plugin);
+static void xfce_panel_plugin_unregister_menu (GtkMenu *menu,
+ XfcePanelPlugin *plugin);
+static void xfce_panel_plugin_set_size (XfcePanelPluginProvider *provider,
+ gint size);
+static void xfce_panel_plugin_set_orientation (XfcePanelPluginProvider *provider,
+ GtkOrientation orientation);
+static void xfce_panel_plugin_set_screen_position (XfcePanelPluginProvider *provider,
+ XfceScreenPosition screen_position);
+static void xfce_panel_plugin_save (XfcePanelPluginProvider *provider);
+static gboolean xfce_panel_plugin_get_show_configure (XfcePanelPluginProvider *provider);
+static void xfce_panel_plugin_show_configure (XfcePanelPluginProvider *provider);
+static gboolean xfce_panel_plugin_get_show_about (XfcePanelPluginProvider *provider);
+static void xfce_panel_plugin_show_about (XfcePanelPluginProvider *provider);
+static void xfce_panel_plugin_remove (XfcePanelPluginProvider *provider);
+static gboolean xfce_panel_plugin_remote_event (XfcePanelPluginProvider *provider,
+ const gchar *name,
+ const GValue *value);
+static void xfce_panel_plugin_take_window_notify (gpointer data,
+ GObject *where_the_object_was);
@@ -566,7 +566,7 @@ xfce_panel_plugin_init (XfcePanelPlugin *plugin)
static void
-xfce_panel_plugin_provider_init (XfcePanelPluginProviderIface *iface)
+xfce_panel_plugin_provider_init (XfcePanelPluginProviderInterface *iface)
{
iface->get_name = (ProviderToPluginChar) xfce_panel_plugin_get_name;
iface->get_unique_id = (ProviderToPluginInt) xfce_panel_plugin_get_unique_id;
diff --git a/panel/panel-plugin-external-46.c b/panel/panel-plugin-external-46.c
index 2b390cc..05a9b1b 100644
--- a/panel/panel-plugin-external-46.c
+++ b/panel/panel-plugin-external-46.c
@@ -47,49 +47,49 @@
-static void panel_plugin_external_46_provider_init (XfcePanelPluginProviderIface *iface);
-static void panel_plugin_external_46_finalize (GObject *object);
-static void panel_plugin_external_46_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
-static void panel_plugin_external_46_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
-static void panel_plugin_external_46_realize (GtkWidget *widget);
-static gboolean panel_plugin_external_46_client_event (GtkWidget *widget,
- GdkEventClient *event);
-static gboolean panel_plugin_external_46_plug_removed (GtkSocket *socket);
-static void panel_plugin_external_46_plug_added (GtkSocket *socket);
-static void panel_plugin_external_46_send_client_event (PanelPluginExternal46 *external,
- gint message,
- gint value);
-static void panel_plugin_external_46_queue_add (PanelPluginExternal46 *external,
- gint message,
- gint value);
-static const gchar *panel_plugin_external_46_get_name (XfcePanelPluginProvider *provider);
-static gint panel_plugin_external_46_get_unique_id (XfcePanelPluginProvider *provider);
-static void panel_plugin_external_46_set_size (XfcePanelPluginProvider *provider,
- gint size);
-static void panel_plugin_external_46_set_orientation (XfcePanelPluginProvider *provider,
- GtkOrientation orientation);
-static void panel_plugin_external_46_set_screen_position (XfcePanelPluginProvider *provider,
- XfceScreenPosition screen_position);
-static void panel_plugin_external_46_save (XfcePanelPluginProvider *provider);
-static gboolean panel_plugin_external_46_get_show_configure (XfcePanelPluginProvider *provider);
-static void panel_plugin_external_46_show_configure (XfcePanelPluginProvider *provider);
-static gboolean panel_plugin_external_46_get_show_about (XfcePanelPluginProvider *provider);
-static void panel_plugin_external_46_show_about (XfcePanelPluginProvider *provider);
-static void panel_plugin_external_46_remove (XfcePanelPluginProvider *provider);
-static gboolean panel_plugin_external_46_remote_event (XfcePanelPluginProvider *provider,
- const gchar *name,
- const GValue *value);
-static void panel_plugin_external_46_set_sensitive (PanelPluginExternal46 *external);
-static void panel_plugin_external_46_child_watch (GPid pid,
- gint status,
- gpointer user_data);
-static void panel_plugin_external_46_child_watch_destroyed (gpointer user_data);
+static void panel_plugin_external_46_provider_init (XfcePanelPluginProviderInterface *iface);
+static void panel_plugin_external_46_finalize (GObject *object);
+static void panel_plugin_external_46_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
+static void panel_plugin_external_46_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void panel_plugin_external_46_realize (GtkWidget *widget);
+static gboolean panel_plugin_external_46_client_event (GtkWidget *widget,
+ GdkEventClient *event);
+static gboolean panel_plugin_external_46_plug_removed (GtkSocket *socket);
+static void panel_plugin_external_46_plug_added (GtkSocket *socket);
+static void panel_plugin_external_46_send_client_event (PanelPluginExternal46 *external,
+ gint message,
+ gint value);
+static void panel_plugin_external_46_queue_add (PanelPluginExternal46 *external,
+ gint message,
+ gint value);
+static const gchar *panel_plugin_external_46_get_name (XfcePanelPluginProvider *provider);
+static gint panel_plugin_external_46_get_unique_id (XfcePanelPluginProvider *provider);
+static void panel_plugin_external_46_set_size (XfcePanelPluginProvider *provider,
+ gint size);
+static void panel_plugin_external_46_set_orientation (XfcePanelPluginProvider *provider,
+ GtkOrientation orientation);
+static void panel_plugin_external_46_set_screen_position (XfcePanelPluginProvider *provider,
+ XfceScreenPosition screen_position);
+static void panel_plugin_external_46_save (XfcePanelPluginProvider *provider);
+static gboolean panel_plugin_external_46_get_show_configure (XfcePanelPluginProvider *provider);
+static void panel_plugin_external_46_show_configure (XfcePanelPluginProvider *provider);
+static gboolean panel_plugin_external_46_get_show_about (XfcePanelPluginProvider *provider);
+static void panel_plugin_external_46_show_about (XfcePanelPluginProvider *provider);
+static void panel_plugin_external_46_remove (XfcePanelPluginProvider *provider);
+static gboolean panel_plugin_external_46_remote_event (XfcePanelPluginProvider *provider,
+ const gchar *name,
+ const GValue *value);
+static void panel_plugin_external_46_set_sensitive (PanelPluginExternal46 *external);
+static void panel_plugin_external_46_child_watch (GPid pid,
+ gint status,
+ gpointer user_data);
+static void panel_plugin_external_46_child_watch_destroyed (gpointer user_data);
@@ -225,7 +225,7 @@ panel_plugin_external_46_init (PanelPluginExternal46 *external)
static void
-panel_plugin_external_46_provider_init (XfcePanelPluginProviderIface *iface)
+panel_plugin_external_46_provider_init (XfcePanelPluginProviderInterface *iface)
{
iface->get_name = panel_plugin_external_46_get_name;
iface->get_unique_id = panel_plugin_external_46_get_unique_id;
diff --git a/panel/panel-plugin-external.c b/panel/panel-plugin-external.c
index 22b00a3..ac397e0 100644
--- a/panel/panel-plugin-external.c
+++ b/panel/panel-plugin-external.c
@@ -49,60 +49,60 @@
-static void panel_plugin_external_provider_init (XfcePanelPluginProviderIface *iface);
-static GObject *panel_plugin_external_constructor (GType type,
- guint n_construct_params,
- GObjectConstructParam *construct_params);
-static void panel_plugin_external_finalize (GObject *object);
-static void panel_plugin_external_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
-static void panel_plugin_external_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
-static void panel_plugin_external_realize (GtkWidget *widget);
-static gboolean panel_plugin_external_plug_removed (GtkSocket *socket);
-static void panel_plugin_external_plug_added (GtkSocket *socket);
-static gboolean panel_plugin_external_dbus_reply (PanelPluginExternal *external,
- guint reply_id,
- const GValue *value,
- GError **error);
-static gboolean panel_plugin_external_dbus_provider_signal (PanelPluginExternal *external,
- XfcePanelPluginProviderSignal provider_signal,
- GError **error);
-static void panel_plugin_external_dbus_set (PanelPluginExternal *external,
- gboolean force);
-static void panel_plugin_external_queue_add (PanelPluginExternal *external,
- gboolean force,
- const gchar *property,
- const GValue *value);
-static void panel_plugin_external_queue_add_noop (PanelPluginExternal *external,
- gboolean force,
- const gchar *property);
-static const gchar *panel_plugin_external_get_name (XfcePanelPluginProvider *provider);
-static gint panel_plugin_external_get_unique_id (XfcePanelPluginProvider *provider);
-static void panel_plugin_external_set_size (XfcePanelPluginProvider *provider,
- gint size);
-static void panel_plugin_external_set_orientation (XfcePanelPluginProvider *provider,
- GtkOrientation orientation);
-static void panel_plugin_external_set_screen_position (XfcePanelPluginProvider *provider,
- XfceScreenPosition screen_position);
-static void panel_plugin_external_save (XfcePanelPluginProvider *provider);
-static gboolean panel_plugin_external_get_show_configure (XfcePanelPluginProvider *provider);
-static void panel_plugin_external_show_configure (XfcePanelPluginProvider *provider);
-static gboolean panel_plugin_external_get_show_about (XfcePanelPluginProvider *provider);
-static void panel_plugin_external_show_about (XfcePanelPluginProvider *provider);
-static void panel_plugin_external_remove (XfcePanelPluginProvider *provider);
-static gboolean panel_plugin_external_remote_event (XfcePanelPluginProvider *provider,
- const gchar *name,
- const GValue *value);
-static void panel_plugin_external_set_sensitive (PanelPluginExternal *external);
-static void panel_plugin_external_child_watch (GPid pid,
- gint status,
- gpointer user_data);
-static void panel_plugin_external_child_watch_destroyed (gpointer user_data);
+static void panel_plugin_external_provider_init (XfcePanelPluginProviderInterface *iface);
+static GObject *panel_plugin_external_constructor (GType type,
+ guint n_construct_params,
+ GObjectConstructParam *construct_params);
+static void panel_plugin_external_finalize (GObject *object);
+static void panel_plugin_external_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
+static void panel_plugin_external_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void panel_plugin_external_realize (GtkWidget *widget);
+static gboolean panel_plugin_external_plug_removed (GtkSocket *socket);
+static void panel_plugin_external_plug_added (GtkSocket *socket);
+static gboolean panel_plugin_external_dbus_reply (PanelPluginExternal *external,
+ guint reply_id,
+ const GValue *value,
+ GError **error);
+static gboolean panel_plugin_external_dbus_provider_signal (PanelPluginExternal *external,
+ XfcePanelPluginProviderSignal provider_signal,
+ GError **error);
+static void panel_plugin_external_dbus_set (PanelPluginExternal *external,
+ gboolean force);
+static void panel_plugin_external_queue_add (PanelPluginExternal *external,
+ gboolean force,
+ const gchar *property,
+ const GValue *value);
+static void panel_plugin_external_queue_add_noop (PanelPluginExternal *external,
+ gboolean force,
+ const gchar *property);
+static const gchar *panel_plugin_external_get_name (XfcePanelPluginProvider *provider);
+static gint panel_plugin_external_get_unique_id (XfcePanelPluginProvider *provider);
+static void panel_plugin_external_set_size (XfcePanelPluginProvider *provider,
+ gint size);
+static void panel_plugin_external_set_orientation (XfcePanelPluginProvider *provider,
+ GtkOrientation orientation);
+static void panel_plugin_external_set_screen_position (XfcePanelPluginProvider *provider,
+ XfceScreenPosition screen_position);
+static void panel_plugin_external_save (XfcePanelPluginProvider *provider);
+static gboolean panel_plugin_external_get_show_configure (XfcePanelPluginProvider *provider);
+static void panel_plugin_external_show_configure (XfcePanelPluginProvider *provider);
+static gboolean panel_plugin_external_get_show_about (XfcePanelPluginProvider *provider);
+static void panel_plugin_external_show_about (XfcePanelPluginProvider *provider);
+static void panel_plugin_external_remove (XfcePanelPluginProvider *provider);
+static gboolean panel_plugin_external_remote_event (XfcePanelPluginProvider *provider,
+ const gchar *name,
+ const GValue *value);
+static void panel_plugin_external_set_sensitive (PanelPluginExternal *external);
+static void panel_plugin_external_child_watch (GPid pid,
+ gint status,
+ gpointer user_data);
+static void panel_plugin_external_child_watch_destroyed (gpointer user_data);
@@ -252,7 +252,7 @@ panel_plugin_external_init (PanelPluginExternal *external)
static void
-panel_plugin_external_provider_init (XfcePanelPluginProviderIface *iface)
+panel_plugin_external_provider_init (XfcePanelPluginProviderInterface *iface)
{
iface->get_name = panel_plugin_external_get_name;
iface->get_unique_id = panel_plugin_external_get_unique_id;
More information about the Xfce4-commits
mailing list