[Xfce4-commits] <xfce4-panel:devel> Some more wrapper code cleanups.
Nick Schermer
nick at xfce.org
Tue Aug 11 20:28:09 CEST 2009
Updating branch refs/heads/devel
to c45a844319cb49c46c6fd17f5f3cf157aa4666ae (commit)
from e6b11e57f1e8460bb4c646bb725c5e722ff84149 (commit)
commit c45a844319cb49c46c6fd17f5f3cf157aa4666ae
Author: Nick Schermer <nick at xfce.org>
Date: Sun Feb 22 12:47:07 2009 +0100
Some more wrapper code cleanups.
wrapper/main.c | 36 ++++++++++++++++++------------------
wrapper/wrapper-plug.c | 9 +++++----
2 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/wrapper/main.c b/wrapper/main.c
index d820708..39c8eda 100644
--- a/wrapper/main.c
+++ b/wrapper/main.c
@@ -94,17 +94,17 @@ dbus_gproxy_property_changed (DBusGProxy *dbus_gproxy,
switch (property)
{
case PROPERTY_CHANGED_PROVIDER_SIZE:
- xfce_panel_plugin_provider_set_size (provider,
+ xfce_panel_plugin_provider_set_size (provider,
g_value_get_int (value));
break;
case PROPERTY_CHANGED_PROVIDER_ORIENTATION:
- xfce_panel_plugin_provider_set_orientation (provider,
+ xfce_panel_plugin_provider_set_orientation (provider,
g_value_get_uint (value));
break;
case PROPERTY_CHANGED_PROVIDER_SCREEN_POSITION:
- xfce_panel_plugin_provider_set_screen_position (provider,
+ xfce_panel_plugin_provider_set_screen_position (provider,
g_value_get_uint (value));
break;
@@ -125,7 +125,7 @@ dbus_gproxy_property_changed (DBusGProxy *dbus_gproxy,
break;
case PROPERTY_CHANGED_WRAPPER_SET_SENSITIVE:
- gtk_widget_set_sensitive (GTK_WIDGET (provider),
+ gtk_widget_set_sensitive (GTK_WIDGET (provider),
g_value_get_boolean (value));
break;
@@ -154,7 +154,7 @@ dbus_gproxy_provider_signal (XfcePanelPluginProvider *provider,
panel_return_if_fail (opt_unique_id == xfce_panel_plugin_provider_get_unique_id (provider));
/* send the provider signal to the panel */
- if (!wrapper_dbus_client_provider_signal (dbus_gproxy, opt_unique_id,
+ if (!wrapper_dbus_client_provider_signal (dbus_gproxy, opt_unique_id,
provider_signal, &error))
{
g_critical ("DBus error: %s", error->message);
@@ -220,11 +220,11 @@ main (gint argc, gchar **argv)
g_thread_init (NULL);
/* initialize gtk */
- if (!gtk_init_with_args (&argc, &argv, _("[ARGUMENTS...]"),
+ if (!gtk_init_with_args (&argc, &argv, _("[ARGUMENTS...]"),
option_entries, (gchar *) GETTEXT_PACKAGE, &error))
{
/* print error */
- g_critical ("Failed to initialize GTK+: %s",
+ g_critical ("Failed to initialize GTK+: %s",
error ? error->message : "Unable to open display");
/* cleanup */
@@ -261,7 +261,7 @@ main (gint argc, gchar **argv)
#if defined(HAVE_SYS_PRCTL_H) && defined(PR_SET_NAME)
/* change the process name to something that makes sence */
- g_snprintf (process_name, sizeof (process_name), "panel-%s-%d",
+ g_snprintf (process_name, sizeof (process_name), "panel-%s-%d",
wrapper_name, opt_unique_id);
if (prctl (PR_SET_NAME, (gulong) process_name, 0, 0, 0) == -1)
g_critical ("Failed to set the process name to \"%s\".", process_name);
@@ -293,7 +293,7 @@ main (gint argc, gchar **argv)
"',member='NameOwnerChanged'", NULL);
/* get the dbus proxy for the plugin interface */
- dbus_gproxy = dbus_g_proxy_new_for_name (dbus_gconnection,
+ dbus_gproxy = dbus_g_proxy_new_for_name (dbus_gconnection,
PANEL_DBUS_PLUGIN_INTERFACE,
PANEL_DBUS_PATH,
PANEL_DBUS_PLUGIN_INTERFACE);
@@ -312,9 +312,9 @@ main (gint argc, gchar **argv)
/* setup signal for property changes */
dbus_g_object_register_marshaller (wrapper_marshal_VOID__INT_INT_BOXED,
- G_TYPE_NONE, G_TYPE_INT, G_TYPE_INT,
+ G_TYPE_NONE, G_TYPE_INT, G_TYPE_INT,
G_TYPE_VALUE, G_TYPE_INVALID);
- dbus_g_proxy_add_signal (dbus_gproxy, "PropertyChanged", G_TYPE_INT,
+ dbus_g_proxy_add_signal (dbus_gproxy, "PropertyChanged", G_TYPE_INT,
G_TYPE_INT, G_TYPE_VALUE, G_TYPE_INVALID);
/* load the module and link the function */
@@ -326,7 +326,7 @@ main (gint argc, gchar **argv)
&& !g_module_symbol (module, "__xpp_construct", (gpointer) &construct_func))
{
/* print error */
- g_critical ("Plugin \"%s-%d\" lacks a plugin register function",
+ g_critical ("Plugin \"%s-%d\" lacks a plugin register function",
wrapper_name, opt_unique_id);
/* close the module */
@@ -339,7 +339,7 @@ main (gint argc, gchar **argv)
else
{
/* print error */
- g_critical ("Unable to load the plugin module \"%s\": %s.",
+ g_critical ("Unable to load the plugin module \"%s\": %s.",
wrapper_name, g_module_error ());
/* leave */
@@ -359,13 +359,13 @@ main (gint argc, gchar **argv)
g_object_set_qdata (G_OBJECT (provider), plug_quark, plug);
/* connect provider signals, so we can send them to the panel through dbus */
- g_signal_connect (G_OBJECT (provider), "provider-signal",
+ g_signal_connect (G_OBJECT (provider), "provider-signal",
G_CALLBACK (dbus_gproxy_provider_signal), dbus_gproxy);
/* connect dbus signal to set provider properties send from the panel */
- dbus_g_proxy_connect_signal (dbus_gproxy, "PropertyChanged",
+ dbus_g_proxy_connect_signal (dbus_gproxy, "PropertyChanged",
G_CALLBACK (dbus_gproxy_property_changed),
- g_object_ref (provider),
+ g_object_ref (provider),
(GClosureNotify) g_object_unref);
/* show the plugin */
@@ -377,7 +377,7 @@ main (gint argc, gchar **argv)
gtk_main ();
/* disconnect signal */
- dbus_g_proxy_disconnect_signal (dbus_gproxy, "PropertyChanged",
+ dbus_g_proxy_disconnect_signal (dbus_gproxy, "PropertyChanged",
G_CALLBACK (dbus_gproxy_property_changed), provider);
/* destroy the plug and provider */
@@ -386,7 +386,7 @@ main (gint argc, gchar **argv)
else
{
/* print error */
- g_critical ("Failed to contruct the plugin \"%s-%d\".",
+ g_critical ("Failed to contruct the plugin \"%s-%d\".",
wrapper_name, opt_unique_id);
/* release the proxy */
diff --git a/wrapper/wrapper-plug.c b/wrapper/wrapper-plug.c
index 139651f..1217306 100644
--- a/wrapper/wrapper-plug.c
+++ b/wrapper/wrapper-plug.c
@@ -29,9 +29,9 @@
-static gboolean wrapper_plug_expose_event (GtkWidget *widget,
- GdkEventExpose *event);
-static void wrapper_plug_set_colormap (WrapperPlug *plug);
+static gboolean wrapper_plug_expose_event (GtkWidget *widget,
+ GdkEventExpose *event);
+static void wrapper_plug_set_colormap (WrapperPlug *plug);
@@ -84,7 +84,8 @@ wrapper_plug_init (WrapperPlug *plug)
gtk_widget_set_app_paintable (GTK_WIDGET (plug), TRUE);
/* connect signal to monitor the compositor changes */
- g_signal_connect (G_OBJECT (plug), "composited-changed", G_CALLBACK (wrapper_plug_set_colormap), NULL);
+ g_signal_connect (G_OBJECT (plug), "composited-changed",
+ G_CALLBACK (wrapper_plug_set_colormap), NULL);
/* set the colormap */
/* HACK: the systray can't handle composited windows! */
More information about the Xfce4-commits
mailing list