[Xfce4-commits] r25118 - in xfce4-panel/trunk: . libxfce4panel panel plugins/launcher
Nick Schermer
nick at xfce.org
Mon Mar 5 20:44:18 CET 2007
Author: nick
Date: 2007-03-05 19:44:17 +0000 (Mon, 05 Mar 2007)
New Revision: 25118
Modified:
xfce4-panel/trunk/ChangeLog
xfce4-panel/trunk/libxfce4panel/xfce-arrow-button.c
xfce4-panel/trunk/libxfce4panel/xfce-hvbox.c
xfce4-panel/trunk/libxfce4panel/xfce-itembar.c
xfce4-panel/trunk/libxfce4panel/xfce-panel-item-iface.c
xfce4-panel/trunk/libxfce4panel/xfce-panel-macros.c
xfce4-panel/trunk/libxfce4panel/xfce-panel-macros.h
xfce4-panel/trunk/libxfce4panel/xfce-panel-plugin-iface.c
xfce4-panel/trunk/libxfce4panel/xfce-panel-window.c
xfce4-panel/trunk/panel/panel-dnd.c
xfce4-panel/trunk/panel/panel.c
xfce4-panel/trunk/panel/panel.h
xfce4-panel/trunk/plugins/launcher/launcher.c
Log:
* libxfce4panel/xfce-panel-macros.c: Replace the g_type_register_static_simple
by a slightly better _panel_g_type_register_simple.
* plugins/launcher/launcher.c: Remove GTK_ARROW_NONE, to fix compilation problems
on Gtk 2.8.
Modified: xfce4-panel/trunk/ChangeLog
===================================================================
--- xfce4-panel/trunk/ChangeLog 2007-03-05 16:27:47 UTC (rev 25117)
+++ xfce4-panel/trunk/ChangeLog 2007-03-05 19:44:17 UTC (rev 25118)
@@ -1,5 +1,12 @@
+2007-03-05 10:39 nick
+
+ * libxfce4panel/xfce-panel-macros.c: Replace the g_type_register_static_simple
+ by a slightly better _panel_g_type_register_simple.
+ * plugins/launcher/launcher.c: Remove GTK_ARROW_NONE, to fix compilation problems
+ on Gtk 2.8.
+
2007-03-04 20:48 nick
-
+
* panel/panel-dialogs.c: Remove the position combobox, this is not working
and thus only confusing for other people ^_^.
Modified: xfce4-panel/trunk/libxfce4panel/xfce-arrow-button.c
===================================================================
--- xfce4-panel/trunk/libxfce4panel/xfce-arrow-button.c 2007-03-05 16:27:47 UTC (rev 25117)
+++ xfce4-panel/trunk/libxfce4panel/xfce-arrow-button.c 2007-03-05 19:44:17 UTC (rev 25118)
@@ -86,13 +86,12 @@
if (G_UNLIKELY (type == G_TYPE_INVALID))
{
- type = g_type_register_static_simple (GTK_TYPE_TOGGLE_BUTTON,
- I_("XfceArrowButton"),
+ type = _panel_g_type_register_simple (GTK_TYPE_TOGGLE_BUTTON,
+ "XfceArrowButton",
sizeof (XfceArrowButtonClass),
- (GClassInitFunc) xfce_arrow_button_class_init,
+ xfce_arrow_button_class_init,
sizeof (XfceArrowButton),
- (GInstanceInitFunc) xfce_arrow_button_init,
- 0);
+ xfce_arrow_button_init);
}
return type;
Modified: xfce4-panel/trunk/libxfce4panel/xfce-hvbox.c
===================================================================
--- xfce4-panel/trunk/libxfce4panel/xfce-hvbox.c 2007-03-05 16:27:47 UTC (rev 25117)
+++ xfce4-panel/trunk/libxfce4panel/xfce-hvbox.c 2007-03-05 19:44:17 UTC (rev 25118)
@@ -50,13 +50,12 @@
if (G_UNLIKELY (type == G_TYPE_INVALID))
{
- type = g_type_register_static_simple (GTK_TYPE_BOX,
- I_("XfceHVBox"),
+ type = _panel_g_type_register_simple (GTK_TYPE_BOX,
+ "XfceHVBox",
sizeof (XfceHVBoxClass),
- (GClassInitFunc) xfce_hvbox_class_init,
+ xfce_hvbox_class_init,
sizeof (XfceHVBox),
- (GInstanceInitFunc) xfce_hvbox_init,
- 0);
+ xfce_hvbox_init);
}
return type;
Modified: xfce4-panel/trunk/libxfce4panel/xfce-itembar.c
===================================================================
--- xfce4-panel/trunk/libxfce4panel/xfce-itembar.c 2007-03-05 16:27:47 UTC (rev 25117)
+++ xfce4-panel/trunk/libxfce4panel/xfce-itembar.c 2007-03-05 19:44:17 UTC (rev 25118)
@@ -151,13 +151,12 @@
if (G_UNLIKELY (type == G_TYPE_INVALID))
{
- type = g_type_register_static_simple (GTK_TYPE_CONTAINER,
- I_("XfceItembar"),
+ type = _panel_g_type_register_simple (GTK_TYPE_CONTAINER,
+ "XfceItembar",
sizeof (XfceItembarClass),
- (GClassInitFunc) xfce_itembar_class_init,
+ xfce_itembar_class_init,
sizeof (XfceItembar),
- (GInstanceInitFunc) xfce_itembar_init,
- 0);
+ xfce_itembar_init);
}
return type;
Modified: xfce4-panel/trunk/libxfce4panel/xfce-panel-item-iface.c
===================================================================
--- xfce4-panel/trunk/libxfce4panel/xfce-panel-item-iface.c 2007-03-05 16:27:47 UTC (rev 25117)
+++ xfce4-panel/trunk/libxfce4panel/xfce-panel-item-iface.c 2007-03-05 19:44:17 UTC (rev 25118)
@@ -179,7 +179,8 @@
if (G_UNLIKELY (type == G_TYPE_INVALID))
{
- static const GTypeInfo info = {
+ GTypeInfo info =
+ {
sizeof (XfcePanelItemInterface),
xfce_panel_item_base_init,
NULL,
@@ -192,8 +193,7 @@
NULL
};
- type = g_type_register_static (G_TYPE_INTERFACE, I_("XfcePanelItem"),
- &info, 0);
+ type = g_type_register_static (G_TYPE_INTERFACE, I_("XfcePanelItem"), &info, 0);
}
return type;
Modified: xfce4-panel/trunk/libxfce4panel/xfce-panel-macros.c
===================================================================
--- xfce4-panel/trunk/libxfce4panel/xfce-panel-macros.c 2007-03-05 16:27:47 UTC (rev 25117)
+++ xfce4-panel/trunk/libxfce4panel/xfce-panel-macros.c 2007-03-05 19:44:17 UTC (rev 25118)
@@ -23,36 +23,35 @@
#endif
#include <glib.h>
+#include <glib-object.h>
+#include "xfce-panel-macros.h"
-#if (!GLIB_CHECK_VERSION(2,12,0))
-/*
- * We can remove this code when the panel depends on Glib 2.12
- */
+
GType
-g_type_register_static_simple (GType parent_type,
- const gchar *type_name,
- guint class_size,
- GClassInitFunc class_init,
- guint instance_size,
- GInstanceInitFunc instance_init,
- GTypeFlags flags)
+_panel_g_type_register_simple (GType type_parent,
+ const gchar *type_name_static,
+ guint class_size,
+ gpointer class_init,
+ guint instance_size,
+ gpointer instance_init)
{
- GTypeInfo info;
+ /* generate the type info (on the stack) */
+ GTypeInfo info =
+ {
+ class_size,
+ NULL,
+ NULL,
+ class_init,
+ NULL,
+ NULL,
+ instance_size,
+ 0,
+ instance_init,
+ NULL,
+ };
- info.class_size = class_size;
- info.base_init = NULL;
- info.base_finalize = NULL;
- info.class_init = class_init;
- info.class_finalize = NULL;
- info.class_data = NULL;
- info.instance_size = instance_size;
- info.n_preallocs = 0;
- info.instance_init = instance_init;
- info.value_table = NULL;
-
- return g_type_register_static (parent_type, type_name, &info, flags);
+ /* register the static type */
+ return g_type_register_static (type_parent, I_(type_name_static), &info, 0);
}
-#endif
-
Modified: xfce4-panel/trunk/libxfce4panel/xfce-panel-macros.h
===================================================================
--- xfce4-panel/trunk/libxfce4panel/xfce-panel-macros.h 2007-03-05 16:27:47 UTC (rev 25117)
+++ xfce4-panel/trunk/libxfce4panel/xfce-panel-macros.h 2007-03-05 19:44:17 UTC (rev 25118)
@@ -47,17 +47,14 @@
#define I_(string) (g_quark_to_string (g_quark_from_static_string ((string))))
#endif
-#if (!GLIB_CHECK_VERSION(2,12,0))
-GType
-g_type_register_static_simple (GType parent_type,
- const gchar *type_name,
- guint class_size,
- GClassInitFunc class_init,
- guint instance_size,
- GInstanceInitFunc instance_init,
- GTypeFlags flags);
-#endif
+GType _panel_g_type_register_simple (GType type_parent,
+ const gchar *type_name_static,
+ guint class_size,
+ gpointer class_init,
+ guint instance_size,
+ gpointer instance_init) G_GNUC_INTERNAL;
+
G_END_DECLS
#endif /* !__XFCE_PANEL_MACROS_H__ */
Modified: xfce4-panel/trunk/libxfce4panel/xfce-panel-plugin-iface.c
===================================================================
--- xfce4-panel/trunk/libxfce4panel/xfce-panel-plugin-iface.c 2007-03-05 16:27:47 UTC (rev 25117)
+++ xfce4-panel/trunk/libxfce4panel/xfce-panel-plugin-iface.c 2007-03-05 19:44:17 UTC (rev 25118)
@@ -285,7 +285,8 @@
if (type == 0)
{
- static const GTypeInfo info = {
+ GTypeInfo info =
+ {
sizeof (XfcePanelPluginInterface),
xfce_panel_plugin_base_init,
NULL,
@@ -298,9 +299,7 @@
NULL
};
- type = g_type_register_static (G_TYPE_INTERFACE, I_("XfcePanelPlugin"),
- &info, 0);
-
+ type = g_type_register_static (G_TYPE_INTERFACE, I_("XfcePanelPlugin"), &info, 0);
g_type_interface_add_prerequisite(type, GTK_TYPE_CONTAINER);
}
@@ -608,12 +607,12 @@
GTK_BUTTONS_NONE,
_("Remove \"%s\"?"), name);
- gtk_dialog_add_buttons (GTK_DIALOG (dialog),
+ gtk_dialog_add_buttons (GTK_DIALOG (dialog),
GTK_STOCK_CANCEL, GTK_RESPONSE_NO,
GTK_STOCK_REMOVE, GTK_RESPONSE_YES,
NULL);
g_free (name);
-
+
gtk_window_set_screen (GTK_WINDOW (dialog),
gtk_widget_get_screen (GTK_WIDGET (plugin)));
Modified: xfce4-panel/trunk/libxfce4panel/xfce-panel-window.c
===================================================================
--- xfce4-panel/trunk/libxfce4panel/xfce-panel-window.c 2007-03-05 16:27:47 UTC (rev 25117)
+++ xfce4-panel/trunk/libxfce4panel/xfce-panel-window.c 2007-03-05 19:44:17 UTC (rev 25118)
@@ -137,13 +137,12 @@
if (G_UNLIKELY (type == G_TYPE_INVALID))
{
- type = g_type_register_static_simple (GTK_TYPE_WINDOW,
- I_("XfcePanelWindow"),
+ type = _panel_g_type_register_simple (GTK_TYPE_WINDOW,
+ "XfcePanelWindow",
sizeof (XfcePanelWindowClass),
- (GClassInitFunc) xfce_panel_window_class_init,
+ xfce_panel_window_class_init,
sizeof (XfcePanelWindow),
- (GInstanceInitFunc) xfce_panel_window_init,
- 0);
+ xfce_panel_window_init);
}
return type;
Modified: xfce4-panel/trunk/panel/panel-dnd.c
===================================================================
--- xfce4-panel/trunk/panel/panel-dnd.c 2007-03-05 16:27:47 UTC (rev 25117)
+++ xfce4-panel/trunk/panel/panel-dnd.c 2007-03-05 19:44:17 UTC (rev 25118)
@@ -27,7 +27,7 @@
/* Partly based on the example on
* http://live.gnome.org/GnomeLove/DragNDropTutorial
- * Copyright © 2005 Ryan McDougall
+ * Copyright (c) 2005 Ryan McDougall
* Licensed under the GNU GPL
*/
Modified: xfce4-panel/trunk/panel/panel.c
===================================================================
--- xfce4-panel/trunk/panel/panel.c 2007-03-05 16:27:47 UTC (rev 25117)
+++ xfce4-panel/trunk/panel/panel.c 2007-03-05 19:44:17 UTC (rev 25118)
@@ -1,11 +1,9 @@
-/* vim: set expandtab ts=8 sw=4: */
-
/* $Id$
*
- * Copyright © 2005 Jasper Huijsmans <jasper at xfce.org>
+ * Copyright (c) 2005 Jasper Huijsmans <jasper 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
+ * it under the terms of the GNU General Public License as published
* by the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
@@ -68,7 +66,7 @@
static void panel_get_property (GObject *object,
guint prop_id,
- GValue *value,
+ GValue *value,
GParamSpec *pspec);
static void panel_set_property (GObject *object,
@@ -80,7 +78,7 @@
static void panel_size_request (GtkWidget *widget,
GtkRequisition *requisition);
-static gboolean panel_button_pressed (GtkWidget *widget,
+static gboolean panel_button_pressed (GtkWidget *widget,
GdkEventButton *ev);
/* plugin menu */
@@ -89,45 +87,45 @@
static void panel_menu_opened (GtkWidget *item);
/* DND dest */
-static void _panel_drag_data_received (GtkWidget *widget,
- GdkDragContext *context,
- gint x,
- gint y,
- GtkSelectionData *data,
- guint info,
- guint time,
+static void _panel_drag_data_received (GtkWidget *widget,
+ GdkDragContext *context,
+ gint x,
+ gint y,
+ GtkSelectionData *data,
+ guint info,
+ guint time,
Panel *panel);
-static gboolean _panel_drag_drop (GtkWidget *widget,
- GdkDragContext *context,
- gint x,
- gint y,
- guint time,
+static gboolean _panel_drag_drop (GtkWidget *widget,
+ GdkDragContext *context,
+ gint x,
+ gint y,
+ guint time,
Panel *panel);
/* DND source */
-static void _panel_drag_begin (GtkWidget *widget,
- GdkDragContext *drag_context,
+static void _panel_drag_begin (GtkWidget *widget,
+ GdkDragContext *drag_context,
Panel *panel);
-static void _panel_drag_end (GtkWidget *widget,
- GdkDragContext *drag_context,
+static void _panel_drag_end (GtkWidget *widget,
+ GdkDragContext *drag_context,
Panel *panel);
-static void _panel_drag_data_get (GtkWidget *widget,
- GdkDragContext *drag_context,
- GtkSelectionData *data,
- guint info,
- guint time,
+static void _panel_drag_data_get (GtkWidget *widget,
+ GdkDragContext *drag_context,
+ GtkSelectionData *data,
+ guint info,
+ guint time,
Panel *panel);
-static void _panel_drag_data_delete (GtkWidget *widget,
- GdkDragContext *drag_context,
+static void _panel_drag_data_delete (GtkWidget *widget,
+ GdkDragContext *drag_context,
Panel *panel);
/* pass through button press events */
-static gboolean _panel_itembar_button_pressed (GtkWidget *widget,
- GdkEventButton *ev,
+static gboolean _panel_itembar_button_pressed (GtkWidget *widget,
+ GdkEventButton *ev,
Panel *panel);
/* menu */
@@ -155,7 +153,7 @@
widget_class->button_press_event = panel_button_pressed;
widget_class->size_request = panel_size_request;
-
+
/* properties */
pspec = g_param_spec_int ("size",
@@ -209,7 +207,7 @@
pspec = g_param_spec_int ("fullwidth",
"panel_fullwidth",
"Use the full screen width",
- XFCE_PANEL_NORMAL_WIDTH,
+ XFCE_PANEL_NORMAL_WIDTH,
XFCE_PANEL_SPAN_MONITORS,
DEFAULT_FULL_WIDTH, G_PARAM_READWRITE);
@@ -236,8 +234,8 @@
{
PanelPrivate *priv;
- priv = panel->priv = G_TYPE_INSTANCE_GET_PRIVATE (panel,
- PANEL_TYPE_PANEL,
+ priv = panel->priv = G_TYPE_INSTANCE_GET_PRIVATE (panel,
+ PANEL_TYPE_PANEL,
PanelPrivate);
priv->size = DEFAULT_SIZE;
@@ -260,22 +258,22 @@
g_signal_connect (panel, "delete-event", G_CALLBACK (gtk_true), NULL);
/* DND */
- g_signal_connect (priv->itembar, "drag-data-received",
+ g_signal_connect (priv->itembar, "drag-data-received",
G_CALLBACK (_panel_drag_data_received), panel);
- g_signal_connect (priv->itembar, "drag-drop",
+ g_signal_connect (priv->itembar, "drag-drop",
G_CALLBACK (_panel_drag_drop), panel);
- g_signal_connect (priv->itembar, "drag-begin",
+ g_signal_connect (priv->itembar, "drag-begin",
G_CALLBACK (_panel_drag_begin), panel);
- g_signal_connect (priv->itembar, "drag-end",
+ g_signal_connect (priv->itembar, "drag-end",
G_CALLBACK (_panel_drag_end), panel);
- g_signal_connect (priv->itembar, "drag-data-get",
+ g_signal_connect (priv->itembar, "drag-data-get",
G_CALLBACK (_panel_drag_data_get), panel);
- g_signal_connect (priv->itembar, "drag-data-delete",
+ g_signal_connect (priv->itembar, "drag-data-delete",
G_CALLBACK (_panel_drag_data_delete), panel);
/* mouse click */
@@ -292,14 +290,14 @@
panel_finalize (GObject * object)
{
/* TODO: properly ref and unref private widgets */
-
+
G_OBJECT_CLASS (panel_parent_class)->finalize (object);
}
static void
-panel_get_property (GObject *object,
+panel_get_property (GObject *object,
guint prop_id,
- GValue *value,
+ GValue *value,
GParamSpec *pspec)
{
PanelPrivate *priv = PANEL(object)->priv;
@@ -340,9 +338,9 @@
}
static void
-panel_set_property (GObject *object,
+panel_set_property (GObject *object,
guint prop_id,
- const GValue *value,
+ const GValue *value,
GParamSpec *pspec)
{
Panel *panel = PANEL (object);
@@ -382,8 +380,8 @@
}
}
-static void
-panel_size_request (GtkWidget *widget,
+static void
+panel_size_request (GtkWidget *widget,
GtkRequisition *requisition)
{
PanelPrivate *priv = PANEL(widget)->priv;
@@ -402,49 +400,49 @@
}
}
-static gboolean
-panel_button_pressed (GtkWidget *widget,
+static gboolean
+panel_button_pressed (GtkWidget *widget,
GdkEventButton *ev)
{
guint modifiers;
modifiers = gtk_accelerator_get_default_mod_mask ();
- if (ev->button == 3 || (ev->button == 1 &&
+ if (ev->button == 3 || (ev->button == 1 &&
(ev->state & modifiers) == GDK_CONTROL_MASK))
{
PanelPrivate *priv;
-
+
priv = PANEL (widget)->priv;
- gtk_menu_set_screen (GTK_MENU (priv->menu),
+ gtk_menu_set_screen (GTK_MENU (priv->menu),
gtk_widget_get_screen (widget));
-
- gtk_menu_popup (GTK_MENU (priv->menu), NULL, NULL, NULL, NULL,
+
+ gtk_menu_popup (GTK_MENU (priv->menu), NULL, NULL, NULL, NULL,
ev->button, ev->time);
return TRUE;
}
-
- return
+
+ return
GTK_WIDGET_CLASS (panel_parent_class)->button_press_event (widget, ev);
}
/* DND dest */
static void
-_panel_drag_data_received (GtkWidget *widget,
- GdkDragContext *context,
- gint x,
- gint y,
- GtkSelectionData *data,
- guint info,
- guint time,
+_panel_drag_data_received (GtkWidget *widget,
+ GdkDragContext *context,
+ gint x,
+ gint y,
+ GtkSelectionData *data,
+ guint info,
+ guint time,
Panel *panel)
{
gboolean handled = FALSE;
DBG (" + drag data received: %d", info);
-
+
if (data->length > 0)
{
XfceItembar *itembar;
@@ -464,11 +462,11 @@
index = xfce_itembar_get_drop_index (itembar, x, y);
panel_insert_item (panel, (const char *)data->data, index);
break;
-
+
case TARGET_PLUGIN_WIDGET:
plugin = panel_dnd_get_plugin_from_data (data);
if (!plugin || !GTK_IS_WIDGET (plugin))
- break;
+ break;
handled = TRUE;
index = xfce_itembar_get_drop_index (itembar, x, y);
@@ -480,14 +478,14 @@
priv = panel->priv;
g_object_freeze_notify (G_OBJECT (widget));
-
+
gtk_widget_reparent (GTK_WIDGET (plugin), widget);
-
+
xfce_panel_item_set_size (item, priv->size);
-
+
xfce_panel_item_set_screen_position (item,
priv->screen_position);
-
+
xfce_itembar_reorder_child (itembar, plugin, index);
g_object_thaw_notify (G_OBJECT (widget));
@@ -499,26 +497,26 @@
oldindex = xfce_itembar_get_item_index (itembar, plugin);
if (index > oldindex) index--;
-
+
if (index != oldindex)
xfce_itembar_reorder_child (itembar, plugin, index);
}
break;
-
+
default:
break;
}
}
-
+
gtk_drag_finish (context, handled, FALSE, time);
}
static gboolean
-_panel_drag_drop (GtkWidget *widget,
- GdkDragContext *context,
- gint x,
- gint y,
- guint time,
+_panel_drag_drop (GtkWidget *widget,
+ GdkDragContext *context,
+ gint x,
+ gint y,
+ guint time,
Panel *panel)
{
GdkAtom atom = gtk_drag_dest_find_target (widget, context, NULL);
@@ -534,8 +532,8 @@
/* DND source */
static void
-_panel_drag_begin (GtkWidget *widget,
- GdkDragContext *drag_context,
+_panel_drag_begin (GtkWidget *widget,
+ GdkDragContext *drag_context,
Panel *panel)
{
int x, y, rootx, rooty, w, h;
@@ -544,7 +542,7 @@
PanelPrivate *priv = panel->priv;
DBG (" + drag begin");
-
+
if (priv->drag_widget)
{
plugin = priv->drag_widget;
@@ -557,7 +555,7 @@
else
{
x = y = 0;
- gdk_display_get_pointer (gtk_widget_get_display (widget),
+ gdk_display_get_pointer (gtk_widget_get_display (widget),
NULL, &x, &y, NULL);
gdk_window_get_root_origin (widget->window, &rootx, &rooty);
x -= rootx;
@@ -569,7 +567,7 @@
if (plugin)
{
GdkDrawable *d = GDK_DRAWABLE (plugin->window);
-
+
gdk_drawable_get_size (d, &w, &h);
pb = gdk_pixbuf_get_from_drawable (NULL, d, NULL, 0, 0, 0, 0, w, h);
gtk_drag_set_icon_pixbuf (drag_context, pb, 0, 0);
@@ -582,8 +580,8 @@
}
static void
-_panel_drag_end (GtkWidget *widget,
- GdkDragContext *drag_context,
+_panel_drag_end (GtkWidget *widget,
+ GdkDragContext *drag_context,
Panel *panel)
{
PanelPrivate *priv = panel->priv;
@@ -594,11 +592,11 @@
{
const GPtrArray *panels = panel_app_get_panel_list ();
int i;
-
+
for (i = 0; i < panels->len; ++i)
{
Panel *p = g_ptr_array_index (panels, i);
-
+
priv = p->priv;
xfce_itembar_lower_event_window (XFCE_ITEMBAR (priv->itembar));
@@ -612,11 +610,11 @@
}
static void
-_panel_drag_data_get (GtkWidget *widget,
- GdkDragContext *drag_context,
- GtkSelectionData *data,
- guint info,
- guint time,
+_panel_drag_data_get (GtkWidget *widget,
+ GdkDragContext *drag_context,
+ GtkSelectionData *data,
+ guint info,
+ guint time,
Panel *panel)
{
if (info == TARGET_PLUGIN_WIDGET)
@@ -631,8 +629,8 @@
}
static void
-_panel_drag_data_delete (GtkWidget *widget,
- GdkDragContext *drag_context,
+_panel_drag_data_delete (GtkWidget *widget,
+ GdkDragContext *drag_context,
Panel *panel)
{
PanelPrivate *priv = panel->priv;
@@ -648,7 +646,7 @@
*/
static gboolean
_panel_itembar_button_pressed (GtkWidget *widget,
- GdkEventButton *ev,
+ GdkEventButton *ev,
Panel *panel)
{
if (xfce_itembar_event_window_is_raised (XFCE_ITEMBAR (widget)))
@@ -657,7 +655,7 @@
modifiers = gtk_accelerator_get_default_mod_mask ();
- if (ev->button == 3 || (ev->button == 1 &&
+ if (ev->button == 3 || (ev->button == 1 &&
(ev->state & modifiers) == GDK_CONTROL_MASK))
{
GtkWidget *plugin;
@@ -673,13 +671,13 @@
else if (ev->button == 1)
{
PanelPrivate *priv = panel->priv;
-
- priv->drag_widget =
- xfce_itembar_get_item_at_point (XFCE_ITEMBAR (widget),
+
+ priv->drag_widget =
+ xfce_itembar_get_item_at_point (XFCE_ITEMBAR (widget),
ev->x, ev->y);
}
}
-
+
return FALSE;
}
@@ -702,9 +700,9 @@
gtk_widget_show (img);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), img);
- g_signal_connect (mi, "activate", G_CALLBACK (panel_app_customize),
+ g_signal_connect (mi, "activate", G_CALLBACK (panel_app_customize),
NULL);
-
+
mi = gtk_image_menu_item_new_with_label (_("Add Items"));
gtk_widget_show (mi);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
@@ -713,9 +711,9 @@
gtk_widget_show (img);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), img);
- g_signal_connect_swapped (mi, "activate",
+ g_signal_connect_swapped (mi, "activate",
G_CALLBACK (panel_app_customize_items), NULL);
-
+
mi = gtk_separator_menu_item_new ();
gtk_widget_show (mi);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
@@ -730,11 +728,11 @@
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), img);
g_signal_connect (mi, "activate", G_CALLBACK (panel_app_quit), NULL);
-
+
mi = gtk_image_menu_item_new_with_label (_("Restart"));
gtk_widget_show (mi);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
-
+
img = gtk_image_new_from_stock (GTK_STOCK_REFRESH, GTK_ICON_SIZE_MENU);
gtk_widget_show (img);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), img);
@@ -744,7 +742,7 @@
mi = gtk_separator_menu_item_new ();
gtk_widget_show (mi);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
-
+
mi = gtk_image_menu_item_new_with_label (_("About the Xfce Panel"));
gtk_widget_show (mi);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
@@ -753,7 +751,7 @@
gtk_widget_show (img);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), img);
- g_signal_connect_swapped (mi, "activate", G_CALLBACK (panel_app_about),
+ g_signal_connect_swapped (mi, "activate", G_CALLBACK (panel_app_about),
panel);
return menu;
@@ -764,7 +762,7 @@
Panel *
panel_new (void)
{
- return PANEL (g_object_new (PANEL_TYPE_PANEL, NULL));
+ return PANEL (g_object_new (PANEL_TYPE_PANEL, NULL));
}
void
@@ -775,18 +773,18 @@
int i;
g_return_if_fail (PANEL_IS_PANEL (panel));
-
+
priv = panel->priv;
/* try and prevent some race conditions */
priv->block_autohide++;
- xfce_panel_window_set_move_function (XFCE_PANEL_WINDOW (panel),
+ xfce_panel_window_set_move_function (XFCE_PANEL_WINDOW (panel),
NULL, NULL);
- xfce_panel_window_set_resize_function (XFCE_PANEL_WINDOW (panel),
+ xfce_panel_window_set_resize_function (XFCE_PANEL_WINDOW (panel),
NULL, NULL);
for (l = gtk_container_get_children (GTK_CONTAINER (priv->itembar));
- l != NULL;
+ l != NULL;
l = l->next)
{
XfcePanelItem *item = l->data;
@@ -797,22 +795,22 @@
g_list_free (l);
/* give plugins the chance to quit */
- for (i = 0; i < 10 &&
+ for (i = 0; i < 10 &&
xfce_itembar_get_n_items (XFCE_ITEMBAR (priv->itembar)) != 0; ++i)
{
- DBG (" + %d item(s) on the panel",
+ DBG (" + %d item(s) on the panel",
xfce_itembar_get_n_items (XFCE_ITEMBAR (priv->itembar)));
g_usleep (200000); /* 0.2 sec */
while (gtk_events_pending ())
gtk_main_iteration ();
}
-
+
}
/* items */
-static void
+static void
panel_menu_deactivated (GtkWidget *item)
{
int x, y, w, h, px, py;
@@ -821,7 +819,7 @@
g_return_if_fail (PANEL_IS_PANEL (panel));
panel_unblock_autohide (panel);
-
+
gdk_display_get_pointer (gdk_display_get_default (), NULL, &px, &py, NULL);
gtk_window_get_position (GTK_WINDOW (panel), &x, &y);
@@ -849,28 +847,28 @@
}
static void
-_item_expand_changed (GtkWidget *item,
- gboolean expand,
+_item_expand_changed (GtkWidget *item,
+ gboolean expand,
Panel *panel)
{
PanelPrivate *priv;
g_return_if_fail (PANEL_IS_PANEL (panel));
-
+
priv = panel->priv;
xfce_itembar_set_child_expand (XFCE_ITEMBAR (priv->itembar), item, expand);
}
static void
-_item_start_move (GtkWidget *item,
+_item_start_move (GtkWidget *item,
Panel *panel)
{
const GPtrArray *panels = panel_app_get_panel_list ();
PanelPrivate *priv;
Panel *p;
int i;
-
+
for (i = 0; i < panels->len; ++i)
{
p = g_ptr_array_index (panels, i);
@@ -894,27 +892,27 @@
panel_dnd_begin_drag (priv->itembar);
}
-extern void panel_set_hidden (Panel *panel,
+extern void panel_set_hidden (Panel *panel,
gboolean hide);
static void
-_item_set_panel_hidden (GtkWidget *item,
- gboolean hidden,
+_item_set_panel_hidden (GtkWidget *item,
+ gboolean hidden,
Panel *panel)
{
PanelPrivate *priv;
g_return_if_fail (PANEL_IS_PANEL (panel));
-
+
priv = panel->priv;
-
+
if (priv->autohide)
panel_set_hidden (panel, hidden);
}
static void
-panel_insert_widget (Panel *panel,
- GtkWidget *item,
+panel_insert_widget (Panel *panel,
+ GtkWidget *item,
int position)
{
PanelPrivate *priv = panel->priv;
@@ -937,8 +935,8 @@
}
static GtkWidget *
-panel_create_item (Panel *panel,
- const char *name,
+panel_create_item (Panel *panel,
+ const char *name,
const char *id)
{
PanelPrivate *priv;
@@ -949,32 +947,32 @@
xmon = panel_app_get_monitor (priv->monitor);
item = xfce_panel_item_manager_create_item (xmon->screen,
- name,
- id,
- priv->size,
+ name,
+ id,
+ priv->size,
priv->screen_position);
if (item != NULL)
{
- g_signal_connect (item, "menu-deactivated",
+ g_signal_connect (item, "menu-deactivated",
G_CALLBACK (panel_menu_deactivated), panel);
-
- g_signal_connect (item, "menu-opened",
+
+ g_signal_connect (item, "menu-opened",
G_CALLBACK (panel_menu_opened), panel);
-
- g_signal_connect (item, "expand-changed",
+
+ g_signal_connect (item, "expand-changed",
G_CALLBACK (_item_expand_changed), panel);
-
- g_signal_connect (item, "customize-panel",
+
+ g_signal_connect (item, "customize-panel",
G_CALLBACK (panel_app_customize), NULL);
-
- g_signal_connect (item, "customize-items",
+
+ g_signal_connect (item, "customize-items",
G_CALLBACK (panel_app_customize_items), NULL);
-
- g_signal_connect (item, "move",
+
+ g_signal_connect (item, "move",
G_CALLBACK (_item_start_move), panel);
-
- g_signal_connect (item, "set-hidden",
+
+ g_signal_connect (item, "set-hidden",
G_CALLBACK (_item_set_panel_hidden), panel);
}
@@ -986,15 +984,15 @@
{
static int counter = 0;
static char id[30];
-
+
/* unique number: pseudo-random time() + counter */
g_snprintf (id, 30, "%ld%d", (glong) time (NULL), counter++);
-
+
return id;
}
GtkWidget *
-panel_add_item_with_id (Panel *panel,
+panel_add_item_with_id (Panel *panel,
const char *name,
const char *id)
{
@@ -1011,15 +1009,15 @@
}
GtkWidget *
-panel_add_item (Panel *panel,
+panel_add_item (Panel *panel,
const char *name)
{
return panel_add_item_with_id (panel, name, _panel_get_new_id ());
}
-GtkWidget *
-panel_insert_item (Panel *panel,
- const char *name,
+GtkWidget *
+panel_insert_item (Panel *panel,
+ const char *name,
int position)
{
GtkWidget *item;
@@ -1052,24 +1050,24 @@
PanelPrivate *priv;
g_return_if_fail (PANEL_IS_PANEL (panel));
-
+
priv = panel->priv;
- gtk_container_foreach (GTK_CONTAINER (priv->itembar),
+ gtk_container_foreach (GTK_CONTAINER (priv->itembar),
(GtkCallback)xfce_panel_item_save, NULL);
}
/* convenience */
-gboolean
+gboolean
panel_is_horizontal (Panel *panel)
{
return (GTK_ORIENTATION_HORIZONTAL ==
xfce_panel_window_get_orientation (XFCE_PANEL_WINDOW (panel)));
}
-void
-panel_set_items_sensitive (Panel *panel,
+void
+panel_set_items_sensitive (Panel *panel,
gboolean sensitive)
{
PanelPrivate *priv = panel->priv;
Modified: xfce4-panel/trunk/panel/panel.h
===================================================================
--- xfce4-panel/trunk/panel/panel.h 2007-03-05 16:27:47 UTC (rev 25117)
+++ xfce4-panel/trunk/panel/panel.h 2007-03-05 19:44:17 UTC (rev 25118)
@@ -1,11 +1,9 @@
-/* vim: set expandtab ts=8 sw=4: */
-
/* $Id$
*
- * Copyright © 2005 Jasper Huijsmans <jasper at xfce.org>
+ * Copyright (c) 2005 Jasper Huijsmans <jasper 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
+ * it under the terms of the GNU General Public License as published
* by the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
@@ -19,8 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef _PANEL_H
-#define _PANEL_H
+#ifndef __PANEL_H__
+#define __PANEL_H__
#include <glib-object.h>
#include <gtk/gtkwidget.h>
@@ -65,7 +63,7 @@
GtkWidget *panel_insert_item (Panel *panel, const char *name, int position);
-GtkWidget *panel_add_item_with_id (Panel *panel, const char *name,
+GtkWidget *panel_add_item_with_id (Panel *panel, const char *name,
const char *id);
/* configuration */
@@ -83,4 +81,4 @@
G_END_DECLS
-#endif /* _PANEL_H */
+#endif /* !__PANEL_H__ */
Modified: xfce4-panel/trunk/plugins/launcher/launcher.c
===================================================================
--- xfce4-panel/trunk/plugins/launcher/launcher.c 2007-03-05 16:27:47 UTC (rev 25117)
+++ xfce4-panel/trunk/plugins/launcher/launcher.c 2007-03-05 19:44:17 UTC (rev 25118)
@@ -570,21 +570,23 @@
switch (xfce_arrow_button_get_arrow_type (XFCE_ARROW_BUTTON (button)))
{
- case GTK_ARROW_NONE:
case GTK_ARROW_UP:
*x += widget->allocation.x;
*y += widget->allocation.y - req.height;
break;
+
case GTK_ARROW_DOWN:
*x += widget->allocation.x;
*y += widget->allocation.y + widget->allocation.height;
break;
+
case GTK_ARROW_LEFT:
*x += widget->allocation.x - req.width;
*y += widget->allocation.y - req.height
+ widget->allocation.height;
break;
- case GTK_ARROW_RIGHT:
+
+ default: /* GTK_ARROW_RIGHT and GTK_ARROW_NONE */
*x += widget->allocation.x + widget->allocation.width;
*y += widget->allocation.y - req.height
+ widget->allocation.height;
More information about the Xfce4-commits
mailing list