[Xfce4-commits] <xfce4-panel:devel> Cleanup some code.
Nick Schermer
nick at xfce.org
Tue Aug 11 20:30:34 CEST 2009
Updating branch refs/heads/devel
to 9416f3f32f2521bd310bc985fc280d82b3df0c27 (commit)
from c9198ba4920c700399331101e564252f1ccf7e5d (commit)
commit 9416f3f32f2521bd310bc985fc280d82b3df0c27
Author: Nick Schermer <nick at xfce.org>
Date: Fri Mar 20 10:25:43 2009 +0100
Cleanup some code.
plugins/actions/actions.c | 37 +++++-----
plugins/actions/actions.h | 3 +-
plugins/windowmenu/windowmenu.c | 143 ++++++++++++++++++++++-----------------
plugins/windowmenu/windowmenu.h | 10 ++--
4 files changed, 104 insertions(+), 89 deletions(-)
diff --git a/plugins/actions/actions.c b/plugins/actions/actions.c
index 0e414e2..8fbdb34 100644
--- a/plugins/actions/actions.c
+++ b/plugins/actions/actions.c
@@ -1,7 +1,6 @@
/* $Id$ */
/*
- * Copyright (c) 2005-2007 Jasper Huijsmans <jasper at xfce.org>
- * Copyright (c) 2007-2009 Nick Schermer <nick at xfce.org>
+ * Copyright (c) 2009 Nick Schermer <nick at xfce.org>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
@@ -34,23 +33,23 @@
-static void actions_plugin_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
-static void actions_plugin_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
-static void actions_plugin_construct (XfcePanelPlugin *panel_plugin);
-static void actions_plugin_free_data (XfcePanelPlugin *panel_plugin);
-static gboolean actions_plugin_size_changed (XfcePanelPlugin *panel_plugin,
- gint size);
-static void actions_plugin_configure_plugin (XfcePanelPlugin *panel_plugin);
-static void actions_plugin_orientation_changed (XfcePanelPlugin *panel_plugin,
- GtkOrientation orientation);
-static void actions_plugin_button_clicked (GtkWidget *button,
- ActionsPlugin *plugin);
+static void actions_plugin_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
+static void actions_plugin_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void actions_plugin_construct (XfcePanelPlugin *panel_plugin);
+static void actions_plugin_free_data (XfcePanelPlugin *panel_plugin);
+static gboolean actions_plugin_size_changed (XfcePanelPlugin *panel_plugin,
+ gint size);
+static void actions_plugin_configure_plugin (XfcePanelPlugin *panel_plugin);
+static void actions_plugin_orientation_changed (XfcePanelPlugin *panel_plugin,
+ GtkOrientation orientation);
+static void actions_plugin_button_clicked (GtkWidget *button,
+ ActionsPlugin *plugin);
diff --git a/plugins/actions/actions.h b/plugins/actions/actions.h
index e239657..d4ba0f9 100644
--- a/plugins/actions/actions.h
+++ b/plugins/actions/actions.h
@@ -1,7 +1,6 @@
/* $Id$ */
/*
- * Copyright (c) 2005-2007 Jasper Huijsmans <jasper at xfce.org>
- * Copyright (c) 2007-2009 Nick Schermer <nick at xfce.org>
+ * Copyright (c) 2009 Nick Schermer <nick at xfce.org>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
diff --git a/plugins/windowmenu/windowmenu.c b/plugins/windowmenu/windowmenu.c
index a12c0cd..555eb89 100644
--- a/plugins/windowmenu/windowmenu.c
+++ b/plugins/windowmenu/windowmenu.c
@@ -36,12 +36,12 @@
#define URGENT_FLAGS (WNCK_WINDOW_STATE_DEMANDS_ATTENTION | \
WNCK_WINDOW_STATE_URGENT)
-struct _XfceWindowMenuPluginClass
+struct _WindowMenuPluginClass
{
XfcePanelPluginClass __parent__;
};
-struct _XfceWindowMenuPlugin
+struct _WindowMenuPlugin
{
XfcePanelPlugin __parent__;
@@ -83,30 +83,46 @@ enum
};
-static void window_menu_plugin_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
-static void window_menu_plugin_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
-static void window_menu_plugin_screen_changed (GtkWidget *widget, GdkScreen *previous_screen);
-
-static void window_menu_plugin_construct (XfcePanelPlugin *panel_plugin);
-static void window_menu_plugin_free_data (XfcePanelPlugin *panel_plugin);
-static void window_menu_plugin_screen_position_changed (XfcePanelPlugin *panel_plugin, gint position);
-static gboolean window_menu_plugin_size_changed (XfcePanelPlugin *panel_plugin, gint size);
-static void window_menu_plugin_configure_plugin (XfcePanelPlugin *panel_plugin);
-
-static void window_menu_plugin_active_window_changed (WnckScreen *screen, WnckWindow *previous_window, XfceWindowMenuPlugin *plugin);
-static void window_menu_plugin_window_state_changed (WnckWindow *window, WnckWindowState changed_mask, WnckWindowState new_state, XfceWindowMenuPlugin *plugin);
-static void window_menu_plugin_window_opened (WnckScreen *screen, WnckWindow *window, XfceWindowMenuPlugin *plugin);
-static void window_menu_plugin_window_closed (WnckScreen *screen, WnckWindow *window, XfceWindowMenuPlugin *plugin);
-
-static gboolean window_menu_plugin_button_press_event (GtkWidget *button, GdkEventButton *event, XfceWindowMenuPlugin *plugin);
-
-static GtkWidget *window_menu_plugin_menu_new (XfceWindowMenuPlugin *plugin);
+static void window_menu_plugin_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
+static void window_menu_plugin_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void window_menu_plugin_screen_changed (GtkWidget *widget,
+ GdkScreen *previous_screen);
+static void window_menu_plugin_construct (XfcePanelPlugin *panel_plugin);
+static void window_menu_plugin_free_data (XfcePanelPlugin *panel_plugin);
+static void window_menu_plugin_screen_position_changed (XfcePanelPlugin *panel_plugin,
+ gint position);
+static gboolean window_menu_plugin_size_changed (XfcePanelPlugin *panel_plugin,
+ gint size);
+static void window_menu_plugin_configure_plugin (XfcePanelPlugin *panel_plugin);
+static void window_menu_plugin_active_window_changed (WnckScreen *screen,
+ WnckWindow *previous_window,
+ WindowMenuPlugin *plugin);
+static void window_menu_plugin_window_state_changed (WnckWindow *window,
+ WnckWindowState changed_mask,
+ WnckWindowState new_state,
+ WindowMenuPlugin *plugin);
+static void window_menu_plugin_window_opened (WnckScreen *screen,
+ WnckWindow *window,
+ WindowMenuPlugin *plugin);
+static void window_menu_plugin_window_closed (WnckScreen *screen,
+ WnckWindow *window,
+ WindowMenuPlugin *plugin);
+static gboolean window_menu_plugin_button_press_event (GtkWidget *button,
+ GdkEventButton *event,
+ WindowMenuPlugin *plugin);
+static GtkWidget *window_menu_plugin_menu_new (WindowMenuPlugin *plugin);
/* define the plugin */
-XFCE_PANEL_DEFINE_PLUGIN_RESIDENT (XfceWindowMenuPlugin, window_menu_plugin)
+XFCE_PANEL_DEFINE_PLUGIN_RESIDENT (WindowMenuPlugin, window_menu_plugin)
@@ -115,7 +131,7 @@ static GQuark window_quark = 0;
static void
-window_menu_plugin_class_init (XfceWindowMenuPluginClass *klass)
+window_menu_plugin_class_init (WindowMenuPluginClass *klass)
{
XfcePanelPluginClass *plugin_class;
GObjectClass *gobject_class;
@@ -175,7 +191,7 @@ window_menu_plugin_class_init (XfceWindowMenuPluginClass *klass)
static void
-window_menu_plugin_init (XfceWindowMenuPlugin *plugin)
+window_menu_plugin_init (WindowMenuPlugin *plugin)
{
/* initialize settings */
plugin->button_style = BUTTON_STYLE_ICON;
@@ -215,7 +231,7 @@ window_menu_plugin_get_property (GObject *object,
GValue *value,
GParamSpec *pspec)
{
- XfceWindowMenuPlugin *plugin = XFCE_WINDOW_MENU_PLUGIN (object);
+ WindowMenuPlugin *plugin = XFCE_WINDOW_MENU_PLUGIN (object);
switch (prop_id)
{
@@ -253,9 +269,9 @@ window_menu_plugin_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
- XfceWindowMenuPlugin *plugin = XFCE_WINDOW_MENU_PLUGIN (object);
- XfcePanelPlugin *panel_plugin = XFCE_PANEL_PLUGIN (object);
- guint button_style;
+ WindowMenuPlugin *plugin = XFCE_WINDOW_MENU_PLUGIN (object);
+ XfcePanelPlugin *panel_plugin = XFCE_PANEL_PLUGIN (object);
+ guint button_style;
switch (prop_id)
{
@@ -311,9 +327,9 @@ static void
window_menu_plugin_screen_changed (GtkWidget *widget,
GdkScreen *previous_screen)
{
- XfceWindowMenuPlugin *plugin = XFCE_WINDOW_MENU_PLUGIN (widget);
- GdkScreen *screen;
- WnckScreen *wnck_screen;
+ WindowMenuPlugin *plugin = XFCE_WINDOW_MENU_PLUGIN (widget);
+ GdkScreen *screen;
+ WnckScreen *wnck_screen;
/* get the wnck screen */
screen = gtk_widget_get_screen (widget);
@@ -353,7 +369,7 @@ window_menu_plugin_screen_changed (GtkWidget *widget,
static void
window_menu_plugin_construct (XfcePanelPlugin *panel_plugin)
{
- XfceWindowMenuPlugin *plugin = XFCE_WINDOW_MENU_PLUGIN (panel_plugin);
+ WindowMenuPlugin *plugin = XFCE_WINDOW_MENU_PLUGIN (panel_plugin);
/* open the xfconf channel */
plugin->channel = xfce_panel_plugin_xfconf_channel_new (panel_plugin);
@@ -382,7 +398,7 @@ window_menu_plugin_construct (XfcePanelPlugin *panel_plugin)
static void
window_menu_plugin_free_data (XfcePanelPlugin *panel_plugin)
{
- XfceWindowMenuPlugin *plugin = XFCE_WINDOW_MENU_PLUGIN (panel_plugin);
+ WindowMenuPlugin *plugin = XFCE_WINDOW_MENU_PLUGIN (panel_plugin);
/* disconnect screen changed signal */
g_signal_handlers_disconnect_by_func (G_OBJECT (plugin),
@@ -416,8 +432,8 @@ static void
window_menu_plugin_screen_position_changed (XfcePanelPlugin *panel_plugin,
gint position)
{
- XfceWindowMenuPlugin *plugin = XFCE_WINDOW_MENU_PLUGIN (panel_plugin);
- GtkArrowType arrow_type = GTK_ARROW_NONE;
+ WindowMenuPlugin *plugin = XFCE_WINDOW_MENU_PLUGIN (panel_plugin);
+ GtkArrowType arrow_type = GTK_ARROW_NONE;
/* set the arrow direction if the arrow is visible */
if (plugin->button_style == BUTTON_STYLE_ARROW)
@@ -432,7 +448,7 @@ static gboolean
window_menu_plugin_size_changed (XfcePanelPlugin *panel_plugin,
gint size)
{
- XfceWindowMenuPlugin *plugin = XFCE_WINDOW_MENU_PLUGIN (panel_plugin);
+ WindowMenuPlugin *plugin = XFCE_WINDOW_MENU_PLUGIN (panel_plugin);
if (plugin->button_style == BUTTON_STYLE_ICON)
{
@@ -459,13 +475,13 @@ window_menu_plugin_size_changed (XfcePanelPlugin *panel_plugin,
static void
window_menu_plugin_configure_plugin (XfcePanelPlugin *panel_plugin)
{
- XfceWindowMenuPlugin *plugin = XFCE_WINDOW_MENU_PLUGIN (panel_plugin);
- GtkBuilder *builder;
- GObject *dialog, *object;
- guint i;
- const gchar *names[] = { "workspace-actions", "workspace-names",
- "urgentcy-notification", "all-workspaces",
- "style" };
+ WindowMenuPlugin *plugin = XFCE_WINDOW_MENU_PLUGIN (panel_plugin);
+ GtkBuilder *builder;
+ GObject *dialog, *object;
+ guint i;
+ const gchar *names[] = { "workspace-actions", "workspace-names",
+ "urgentcy-notification", "all-workspaces",
+ "style" };
builder = gtk_builder_new ();
if (gtk_builder_add_from_string (builder, windowmenu_dialog_glade,
@@ -504,9 +520,9 @@ window_menu_plugin_configure_plugin (XfcePanelPlugin *panel_plugin)
static void
-window_menu_plugin_active_window_changed (WnckScreen *screen,
- WnckWindow *previous_window,
- XfceWindowMenuPlugin *plugin)
+window_menu_plugin_active_window_changed (WnckScreen *screen,
+ WnckWindow *previous_window,
+ WindowMenuPlugin *plugin)
{
WnckWindow *window;
GdkPixbuf *pixbuf;
@@ -545,10 +561,10 @@ window_menu_plugin_active_window_changed (WnckScreen *screen,
static void
-window_menu_plugin_window_state_changed (WnckWindow *window,
- WnckWindowState changed_mask,
- WnckWindowState new_state,
- XfceWindowMenuPlugin *plugin)
+window_menu_plugin_window_state_changed (WnckWindow *window,
+ WnckWindowState changed_mask,
+ WnckWindowState new_state,
+ WindowMenuPlugin *plugin)
{
panel_return_if_fail (XFCE_IS_WINDOW_MENU_PLUGIN (plugin));
panel_return_if_fail (WNCK_IS_WINDOW (window));
@@ -575,9 +591,9 @@ window_menu_plugin_window_state_changed (WnckWindow *window,
static void
-window_menu_plugin_window_opened (WnckScreen *screen,
- WnckWindow *window,
- XfceWindowMenuPlugin *plugin)
+window_menu_plugin_window_opened (WnckScreen *screen,
+ WnckWindow *window,
+ WindowMenuPlugin *plugin)
{
panel_return_if_fail (XFCE_IS_WINDOW_MENU_PLUGIN (plugin));
panel_return_if_fail (WNCK_IS_WINDOW (window));
@@ -601,9 +617,9 @@ window_menu_plugin_window_opened (WnckScreen *screen,
static void
-window_menu_plugin_window_closed (WnckScreen *screen,
- WnckWindow *window,
- XfceWindowMenuPlugin *plugin)
+window_menu_plugin_window_closed (WnckScreen *screen,
+ WnckWindow *window,
+ WindowMenuPlugin *plugin)
{
panel_return_if_fail (XFCE_IS_WINDOW_MENU_PLUGIN (plugin));
panel_return_if_fail (WNCK_IS_WINDOW (window));
@@ -623,9 +639,9 @@ window_menu_plugin_window_closed (WnckScreen *screen,
static gboolean
-window_menu_plugin_button_press_event (GtkWidget *button,
- GdkEventButton *event,
- XfceWindowMenuPlugin *plugin)
+window_menu_plugin_button_press_event (GtkWidget *button,
+ GdkEventButton *event,
+ WindowMenuPlugin *plugin)
{
GtkWidget *menu;
@@ -654,8 +670,8 @@ window_menu_plugin_button_press_event (GtkWidget *button,
static void
-window_menu_plugin_workspace_add (GtkWidget *mi,
- XfceWindowMenuPlugin *plugin)
+window_menu_plugin_workspace_add (GtkWidget *mi,
+ WindowMenuPlugin *plugin)
{
panel_return_if_fail (XFCE_IS_WINDOW_MENU_PLUGIN (plugin));
panel_return_if_fail (WNCK_IS_SCREEN (plugin->screen));
@@ -668,8 +684,8 @@ window_menu_plugin_workspace_add (GtkWidget *mi,
static void
-window_menu_plugin_workspace_remove (GtkWidget *mi,
- XfceWindowMenuPlugin *plugin)
+window_menu_plugin_workspace_remove (GtkWidget *mi,
+ WindowMenuPlugin *plugin)
{
gint n_workspaces;
@@ -879,6 +895,7 @@ window_menu_plugin_menu_window_item_new (WnckWindow *window,
}
+
static void
window_menu_plugin_menu_selection_done (GtkWidget *menu,
GtkWidget *button)
@@ -963,7 +980,7 @@ window_menu_plugin_menu_key_press_event (GtkWidget *menu,
static GtkWidget *
-window_menu_plugin_menu_new (XfceWindowMenuPlugin *plugin)
+window_menu_plugin_menu_new (WindowMenuPlugin *plugin)
{
GtkWidget *menu, *mi = NULL, *image;
GList *workspaces, *lp, fake;
diff --git a/plugins/windowmenu/windowmenu.h b/plugins/windowmenu/windowmenu.h
index 51c857d..64a5ce1 100644
--- a/plugins/windowmenu/windowmenu.h
+++ b/plugins/windowmenu/windowmenu.h
@@ -24,15 +24,15 @@
G_BEGIN_DECLS
-typedef struct _XfceWindowMenuPluginClass XfceWindowMenuPluginClass;
-typedef struct _XfceWindowMenuPlugin XfceWindowMenuPlugin;
+typedef struct _WindowMenuPluginClass WindowMenuPluginClass;
+typedef struct _WindowMenuPlugin WindowMenuPlugin;
#define XFCE_TYPE_WINDOW_MENU_PLUGIN (window_menu_plugin_get_type ())
-#define XFCE_WINDOW_MENU_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), XFCE_TYPE_WINDOW_MENU_PLUGIN, XfceWindowMenuPlugin))
-#define XFCE_WINDOW_MENU_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), XFCE_TYPE_WINDOW_MENU_PLUGIN, XfceWindowMenuPluginClass))
+#define XFCE_WINDOW_MENU_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), XFCE_TYPE_WINDOW_MENU_PLUGIN, WindowMenuPlugin))
+#define XFCE_WINDOW_MENU_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), XFCE_TYPE_WINDOW_MENU_PLUGIN, WindowMenuPluginClass))
#define XFCE_IS_WINDOW_MENU_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), XFCE_TYPE_WINDOW_MENU_PLUGIN))
#define XFCE_IS_WINDOW_MENU_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), XFCE_TYPE_WINDOW_MENU_PLUGIN))
-#define XFCE_WINDOW_MENU_PLUGIN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), XFCE_TYPE_WINDOW_MENU_PLUGIN, XfceWindowMenuPluginClass))
+#define XFCE_WINDOW_MENU_PLUGIN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), XFCE_TYPE_WINDOW_MENU_PLUGIN, WindowMenuPluginClass))
GType window_menu_plugin_get_type (void) G_GNUC_CONST;
More information about the Xfce4-commits
mailing list