Author: jasper
Date: 2007-02-21 21:37:17 +0000 (Wed, 21 Feb 2007)
New Revision: 25008
Modified:
xfce4-panel/branches/4_5_nick/HACKING
xfce4-panel/branches/4_5_nick/icons/16x16/Makefile.am
xfce4-panel/branches/4_5_nick/libxfce4panel/xfce-arrow-button.c
xfce4-panel/branches/4_5_nick/libxfce4panel/xfce-hvbox.c
xfce4-panel/branches/4_5_nick/libxfce4panel/xfce-panel-convenience.c
xfce4-panel/branches/4_5_nick/libxfce4panel/xfce-panel-internal-plugin.c
xfce4-panel/branches/4_5_nick/libxfce4panel/xfce-panel-item-iface.c
xfce4-panel/branches/4_5_nick/libxfce4panel/xfce-panel-plugin-iface.c
xfce4-panel/branches/4_5_nick/libxfce4panel/xfce-panel-window.c
xfce4-panel/branches/4_5_nick/panel/panel-config.c
xfce4-panel/branches/4_5_nick/plugins/iconbox/iconbox.c
Log:
* Remove some dos line endings.
* Sync remove item dialog with trunk.
* Add back variable initialization in loop when saving panel configuration.
Modified: xfce4-panel/branches/4_5_nick/HACKING
===================================================================
--- xfce4-panel/branches/4_5_nick/HACKING 2007-02-21 20:31:33 UTC (rev
25007)
+++ xfce4-panel/branches/4_5_nick/HACKING 2007-02-21 21:37:17 UTC (rev
25008)
@@ -30,56 +30,56 @@
- Always expand tabs, so the code is not dependent from a gives tab
setting.
- - Braces are on a new line. For one-line if statements braces may be omitted.
- - Return type of function definitions on a separate line.
- - Function arguments on separate lines with the same alignment rules as
- variable declarations.
- - Use 3 empty lines between functions.
- - Variable declarations are aligned on the variable name. Short variable
- declarations may be combined. Example:
-
- static gboolean
- example_function (GtkWidget *widget,
- Panel *panel,
- gint value)
- {
- XfceHandleType type;
- const gchar *string;
- gint important_value;
- gint i, n, x, y;
- /* ... */
- }
-
- - In header files and for static prototypes, you may align functions names as
- well as arguments. No need to limit the line length. Example:
-
- static gboolean xfce_panel_long_name_for_example_function (GtkWidget
*widget,
- Panel
*panel,
- gint
value);
- static void example_function_2 (Panel
*panel,
+ - Braces are on a new line. For one-line if statements braces may be omitted.
+ - Return type of function definitions on a separate line.
+ - Function arguments on separate lines with the same alignment rules as
+ variable declarations.
+ - Use 3 empty lines between functions.
+ - Variable declarations are aligned on the variable name. Short variable
+ declarations may be combined. Example:
+
+ static gboolean
+ example_function (GtkWidget *widget,
+ Panel *panel,
+ gint value)
+ {
+ XfceHandleType type;
+ const gchar *string;
+ gint important_value;
+ gint i, n, x, y;
+ /* ... */
+ }
+
+ - In header files and for static prototypes, you may align functions names as
+ well as arguments. No need to limit the line length. Example:
+
+ static gboolean xfce_panel_long_name_for_example_function (GtkWidget
*widget,
+ Panel
*panel,
+ gint
value);
+ static void example_function_2 (Panel
*panel,
const
gchar *value);
- Write ChangeLog entries.
-
-
-ChangeLogs
-==========
-
-I use the svn2cl package to create the changelog from the SVN log messages.
-
- - Website: http://ch.tudelft.nl/~arthur/svn2cl/ .
- - Current version: 0.8.
- - Command line: svn2cl.sh --linelen=74 --break-before-msg.
-
-Note: I don't care about linelen, but with this parameter the changes with
- previous ChangeLog were smallest.
-
-
-Misc
-====
-- If you have SVN access it is ok to commit trivial changes directly, but
- please send a patch to the mailing list for discussion for any non-trivial
- or non-obvious changes.
-- As an exception to the rule above, if you are managing an Xfce release, feel
- free to do anything you need to achieve that goal.
-- Managing the po/ directory, including the ChangeLog found there is left
- completely in the hands of the Xfce Translation Team.
+
+
+ChangeLogs
+==========
+
+I use the svn2cl package to create the changelog from the SVN log messages.
+
+ - Website: http://ch.tudelft.nl/~arthur/svn2cl/ .
+ - Current version: 0.8.
+ - Command line: svn2cl.sh --linelen=74 --break-before-msg.
+
+Note: I don't care about linelen, but with this parameter the changes with
+ previous ChangeLog were smallest.
+
+
+Misc
+====
+- If you have SVN access it is ok to commit trivial changes directly, but
+ please send a patch to the mailing list for discussion for any non-trivial
+ or non-obvious changes.
+- As an exception to the rule above, if you are managing an Xfce release, feel
+ free to do anything you need to achieve that goal.
+- Managing the po/ directory, including the ChangeLog found there is left
+ completely in the hands of the Xfce Translation Team.
Modified: xfce4-panel/branches/4_5_nick/icons/16x16/Makefile.am
===================================================================
--- xfce4-panel/branches/4_5_nick/icons/16x16/Makefile.am 2007-02-21
20:31:33 UTC (rev 25007)
+++ xfce4-panel/branches/4_5_nick/icons/16x16/Makefile.am 2007-02-21
21:37:17 UTC (rev 25008)
@@ -3,10 +3,10 @@
iconsdir = $(datadir)/icons/hicolor/16x16/apps
icons_DATA = \
- xfce-system-settings.png \
- xfce-system-lock.png \
- xfce-system-info.png \
- xfce-system-exit.png
+ xfce-system-settings.png \
+ xfce-system-lock.png \
+ xfce-system-info.png \
+ xfce-system-exit.png
EXTRA_DIST = \
Modified: xfce4-panel/branches/4_5_nick/libxfce4panel/xfce-arrow-button.c
===================================================================
--- xfce4-panel/branches/4_5_nick/libxfce4panel/xfce-arrow-button.c
2007-02-21 20:31:33 UTC (rev 25007)
+++ xfce4-panel/branches/4_5_nick/libxfce4panel/xfce-arrow-button.c
2007-02-21 21:37:17 UTC (rev 25008)
@@ -71,14 +71,14 @@
GtkWidget *child);
static GType xfce_arrow_button_child_type (GtkContainer
*container);
-
+
/* global vars */
static GtkToggleButtonClass *parent_class = NULL;
static guint arrow_button_signals[LAST_SIGNAL] = { 0 };
-
+
GType
xfce_arrow_button_get_type (void)
{
@@ -105,9 +105,9 @@
return type;
}
-
+
static void
xfce_arrow_button_class_init (XfceArrowButtonClass * klass)
{
@@ -166,9 +166,9 @@
GTK_ARROW_UP,
G_PARAM_READWRITE));
}
-
-
+
+
static void
xfce_arrow_button_init (XfceArrowButton * arrow_button)
{
@@ -176,9 +176,9 @@
arrow_button->arrow_type = DEFAULT_ARROW_TYPE;
}
-
-
+
+
static void
xfce_arrow_button_set_property (GObject *object,
guint prop_id,
@@ -197,9 +197,9 @@
break;
}
}
-
-
+
+
static void
xfce_arrow_button_get_property (GObject *object,
guint prop_id,
@@ -218,9 +218,9 @@
break;
}
}
-
-
+
+
static gint
xfce_arrow_button_expose (GtkWidget *widget,
GdkEventExpose *event)
@@ -247,9 +247,9 @@
return TRUE;
}
-
-
+
+
static void
xfce_arrow_button_size_request (GtkWidget *widget,
GtkRequisition *requisition)
@@ -259,26 +259,26 @@
requisition->width = requisition->height = size;
}
-
-
+
+
static void
xfce_arrow_button_add (GtkContainer *container,
GtkWidget *child)
{
g_warning ("XfceArrowButton cannot contain any children");
}
-
-
+
+
static GType
xfce_arrow_button_child_type (GtkContainer *container)
{
return GTK_TYPE_NONE;
}
-
+
/* public interface */
/**
@@ -296,9 +296,9 @@
return GTK_WIDGET (button);
}
-
-
+
+
/**
* xfce_arrow_button_set_arrow_type:
* @button : an #XfceArrowButton
@@ -320,9 +320,9 @@
gtk_widget_queue_draw (GTK_WIDGET (button));
}
-
-
+
+
/**
* xfce_arrow_button_get_arrow_type:
* @button : an #XfceArrowButton
Modified: xfce4-panel/branches/4_5_nick/libxfce4panel/xfce-hvbox.c
===================================================================
--- xfce4-panel/branches/4_5_nick/libxfce4panel/xfce-hvbox.c 2007-02-21
20:31:33 UTC (rev 25007)
+++ xfce4-panel/branches/4_5_nick/libxfce4panel/xfce-hvbox.c 2007-02-21
21:37:17 UTC (rev 25008)
@@ -30,9 +30,9 @@
#include "xfce-panel-macros.h"
#include "xfce-hvbox.h"
-
-
+
+
/* prototypes */
static void xfce_hvbox_class_init (XfceHVBoxClass *klass);
static void xfce_hvbox_init (XfceHVBox *hvbox);
@@ -41,8 +41,8 @@
static void xfce_hvbox_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
-
+
GtkType
xfce_hvbox_get_type (void)
{
@@ -69,9 +69,9 @@
return hvbox_type;
}
-
-
+
+
static void
xfce_hvbox_class_init (XfceHVBoxClass *klass)
{
@@ -82,17 +82,17 @@
widget_class->size_request = xfce_hvbox_size_request;
widget_class->size_allocate = xfce_hvbox_size_allocate;
}
-
-
+
+
static void
xfce_hvbox_init (XfceHVBox *hvbox)
{
/* empty */
}
-
-
+
+
static GtkWidgetClass *
get_class (XfceHVBox *hvbox)
{
@@ -114,9 +114,9 @@
return klass;
}
-
-
+
+
static void
xfce_hvbox_size_request (GtkWidget *widget,
GtkRequisition *requisition)
@@ -130,9 +130,9 @@
klass->size_request (widget, requisition);
}
-
-
+
+
static void
xfce_hvbox_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
@@ -146,9 +146,9 @@
klass->size_allocate (widget, allocation);
}
-
-
+
+
/**
* xfce_hvbox_new:
* @orienation : Orientation of the #XfceHVBox
@@ -172,15 +172,15 @@
return box;
}
-
-
-
-/**
- * xfce_hvbox_set_orientation:
- * @hvbox : #XfceHVBox
- * @orientation : the new orientation of the #XfceHVBox
- *
- * Set the new orientation of the #XfceHVBox container widget.
+
+
+
+/**
+ * xfce_hvbox_set_orientation:
+ * @hvbox : #XfceHVBox
+ * @orientation : the new orientation of the #XfceHVBox
+ *
+ * Set the new orientation of the #XfceHVBox container widget.
**/
void
xfce_hvbox_set_orientation (XfceHVBox *hvbox,
Modified: xfce4-panel/branches/4_5_nick/libxfce4panel/xfce-panel-convenience.c
===================================================================
--- xfce4-panel/branches/4_5_nick/libxfce4panel/xfce-panel-convenience.c
2007-02-21 20:31:33 UTC (rev 25007)
+++ xfce4-panel/branches/4_5_nick/libxfce4panel/xfce-panel-convenience.c
2007-02-21 21:37:17 UTC (rev 25008)
@@ -48,9 +48,9 @@
return button;
}
-
-
+
+
/**
* xfce_create_panel_button:
*
@@ -72,9 +72,9 @@
return button;
}
-
-
+
+
/**
* xfce_allow_panel_customization:
*
@@ -88,7 +88,7 @@
xfce_allow_panel_customization (void )
{
static gboolean allow_customization = FALSE;
- static gboolean checked = FALSE;
+ static gboolean checked = FALSE;
XfceKiosk *kiosk;
if (G_UNLIKELY (!checked))
Modified:
xfce4-panel/branches/4_5_nick/libxfce4panel/xfce-panel-internal-plugin.c
===================================================================
--- xfce4-panel/branches/4_5_nick/libxfce4panel/xfce-panel-internal-plugin.c
2007-02-21 20:31:33 UTC (rev 25007)
+++ xfce4-panel/branches/4_5_nick/libxfce4panel/xfce-panel-internal-plugin.c
2007-02-21 21:37:17 UTC (rev 25008)
@@ -109,8 +109,8 @@
static void _plugin_menu_deactivated
(GtkWidget *menu,
XfcePanelItem *item);
-
+
/* type definition and initialization */
G_DEFINE_TYPE_EXTENDED (XfceInternalPanelPlugin, xfce_internal_panel_plugin,
GTK_TYPE_EVENT_BOX, 0,
@@ -118,9 +118,9 @@
xfce_internal_panel_plugin_init_item_interface)
G_IMPLEMENT_INTERFACE (XFCE_TYPE_PANEL_PLUGIN,
xfce_internal_panel_plugin_init_plugin_interface))
-
-
+
+
static void
xfce_internal_panel_plugin_init_item_interface (gpointer g_iface,
gpointer data)
@@ -139,9 +139,9 @@
iface->remove = xfce_internal_panel_plugin_remove_item;
iface->configure = xfce_internal_panel_plugin_configure_item;
}
-
-
+
+
static void
xfce_internal_panel_plugin_init_plugin_interface (gpointer g_iface,
gpointer data)
@@ -157,9 +157,9 @@
iface->register_menu = xfce_internal_panel_plugin_register_menu;
iface->focus_panel = xfce_internal_panel_plugin_focus_panel;
}
-
-
+
+
static void
xfce_internal_panel_plugin_class_init (XfceInternalPanelPluginClass *klass)
{
@@ -182,9 +182,9 @@
g_object_class_override_property (object_class, PROP_SCREEN_POSITION,
"screen-position");
g_object_class_override_property (object_class, PROP_EXPAND, "expand");
}
-
-
+
+
static void
xfce_internal_panel_plugin_init (XfceInternalPanelPlugin *plugin)
{
@@ -199,9 +199,9 @@
priv->screen_position = XFCE_SCREEN_POSITION_NONE;
priv->expand = FALSE;
}
-
-
+
+
/* GObject */
static void
xfce_internal_panel_plugin_finalize (GObject *object)
@@ -216,9 +216,9 @@
G_OBJECT_CLASS (xfce_internal_panel_plugin_parent_class)->finalize (object);
}
-
-
+
+
static void
xfce_internal_panel_plugin_get_property (GObject *object,
guint prop_id,
@@ -254,9 +254,9 @@
break;
}
}
-
-
+
+
static void
xfce_internal_panel_plugin_set_property (GObject *object,
guint prop_id,
@@ -298,9 +298,9 @@
break;
}
}
-
-
+
+
/* item interface */
static const gchar *
xfce_internal_panel_plugin_get_name (XfcePanelItem *plugin)
@@ -314,9 +314,9 @@
return priv->name;
}
-
-
+
+
static const gchar *
xfce_internal_panel_plugin_get_id (XfcePanelItem *plugin)
{
@@ -329,9 +329,9 @@
return priv->id;
}
-
-
+
+
static const gchar *
xfce_internal_panel_plugin_get_display_name (XfcePanelItem *plugin)
{
@@ -344,9 +344,9 @@
return priv->display_name;
}
-
-
+
+
static gboolean
xfce_internal_panel_plugin_get_expand (XfcePanelItem *plugin)
{
@@ -359,9 +359,9 @@
return priv->expand;
}
-
-
+
+
static void
xfce_internal_panel_plugin_free_data (XfcePanelItem * plugin)
{
@@ -376,9 +376,9 @@
gtk_widget_destroy (GTK_WIDGET (plugin));
}
-
-
+
+
static void
xfce_internal_panel_plugin_save (XfcePanelItem * plugin)
{
@@ -391,9 +391,9 @@
xfce_panel_plugin_signal_save (XFCE_PANEL_PLUGIN (plugin));
}
-
-
+
+
static void
xfce_internal_panel_plugin_set_screen_position (XfcePanelItem *plugin,
XfceScreenPosition position)
@@ -422,9 +422,9 @@
xfce_panel_plugin_signal_size (XFCE_PANEL_PLUGIN (plugin), priv->size);
}
-
-
+
+
static void
xfce_internal_panel_plugin_set_size (XfcePanelItem *plugin,
gint size)
@@ -443,34 +443,34 @@
xfce_panel_plugin_signal_size (XFCE_PANEL_PLUGIN (plugin), size);
}
}
-
-
+
+
static void
xfce_internal_panel_plugin_set_sensitive (XfcePanelItem *plugin,
gboolean sensitive)
{
xfce_panel_plugin_set_sensitive (XFCE_PANEL_PLUGIN (plugin), sensitive);
}
-
-
+
+
static void
xfce_internal_panel_plugin_remove_item (XfcePanelItem *plugin)
{
xfce_panel_plugin_remove_confirm (XFCE_PANEL_PLUGIN (plugin));
}
-
-
+
+
static void
xfce_internal_panel_plugin_configure_item (XfcePanelItem *plugin)
{
xfce_panel_plugin_signal_configure (XFCE_PANEL_PLUGIN (plugin));
}
-
-
+
+
/* plugin interface */
static void
xfce_internal_panel_plugin_remove (XfcePanelPlugin *plugin)
@@ -489,9 +489,9 @@
xfce_internal_panel_plugin_free_data (XFCE_PANEL_ITEM (plugin));
}
-
-
+
+
static void
xfce_internal_panel_plugin_set_expand (XfcePanelPlugin *plugin,
gboolean expand)
@@ -510,42 +510,42 @@
xfce_panel_item_expand_changed (XFCE_PANEL_ITEM (plugin), expand);
}
}
-
-
+
+
static void
xfce_internal_panel_plugin_customize_panel (XfcePanelPlugin *plugin)
{
xfce_panel_item_customize_panel (XFCE_PANEL_ITEM (plugin));
}
-
-
+
+
static void
xfce_internal_panel_plugin_customize_items (XfcePanelPlugin *plugin)
{
xfce_panel_item_customize_items (XFCE_PANEL_ITEM (plugin));
}
-
-
+
+
static void
xfce_internal_panel_plugin_move (XfcePanelPlugin *plugin)
{
xfce_panel_item_move (XFCE_PANEL_ITEM (plugin));
}
-
-
+
+
static void
xfce_internal_panel_plugin_set_panel_hidden (XfcePanelPlugin *plugin,
gboolean hidden)
{
xfce_panel_item_set_panel_hidden (XFCE_PANEL_ITEM (plugin), hidden);
}
-
-
+
+
static void
xfce_internal_panel_plugin_register_menu (XfcePanelPlugin *plugin,
GtkMenu *menu)
@@ -562,17 +562,17 @@
g_object_set_data (G_OBJECT (plugin), I_("deactivate_id"),
GINT_TO_POINTER (id));
}
-
-
+
+
static void
xfce_internal_panel_plugin_focus_panel (XfcePanelPlugin *plugin)
{
xfce_panel_item_focus_panel (XFCE_PANEL_ITEM (plugin));
}
-
+
/* properties */
static void
xfce_internal_panel_plugin_set_name (XfcePanelPlugin *plugin,
@@ -588,9 +588,9 @@
g_free (priv->name);
priv->name = g_strdup (name);
}
-
-
+
+
static void
xfce_internal_panel_plugin_set_id (XfcePanelPlugin *plugin,
const gchar *id)
@@ -605,9 +605,9 @@
g_free (priv->id);
priv->id = g_strdup (id);
}
-
-
+
+
static void
xfce_internal_panel_plugin_set_display_name (XfcePanelPlugin *plugin,
const gchar *name)
@@ -622,9 +622,9 @@
g_free (priv->display_name);
priv->display_name = g_strdup (name);
}
-
-
+
+
/* ginternal functions */
static void
_plugin_menu_deactivated (GtkWidget *menu,
@@ -643,9 +643,9 @@
g_object_set_data (G_OBJECT (item), I_("deactivate_id"), NULL);
}
}
-
-
+
+
static void
_plugin_setup (XfceInternalPanelPlugin *plugin,
XfcePanelPluginFunc construct)
@@ -662,9 +662,9 @@
/* make sure the plugin has the proper size */
xfce_panel_plugin_signal_size (XFCE_PANEL_PLUGIN (plugin), priv->size);
}
-
-
+
+
/**
* xfce_internal_panel_plugin_new
* @name : plugin name
Modified: xfce4-panel/branches/4_5_nick/libxfce4panel/xfce-panel-item-iface.c
===================================================================
--- xfce4-panel/branches/4_5_nick/libxfce4panel/xfce-panel-item-iface.c
2007-02-21 20:31:33 UTC (rev 25007)
+++ xfce4-panel/branches/4_5_nick/libxfce4panel/xfce-panel-item-iface.c
2007-02-21 21:37:17 UTC (rev 25008)
@@ -169,9 +169,9 @@
initialized = TRUE;
}
}
-
-
+
+
GType
xfce_panel_item_get_type (void)
{
@@ -198,9 +198,9 @@
return type;
}
-
-
+
+
/* public API */
void
xfce_panel_item_focus_panel (XfcePanelItem *item)
@@ -246,9 +246,9 @@
g_signal_emit (G_OBJECT (item), xfce_panel_item_signals[EXPAND_CHANGED],
0, expand, NULL);
}
-
-
+
+
/**
* xfce_panel_item_menu_deactivated
* @item : #XfcePanelItem
@@ -263,9 +263,9 @@
g_signal_emit (G_OBJECT (item), xfce_panel_item_signals[MENU_DEACTIVATED],
0, NULL);
}
-
-
+
+
/**
* xfce_panel_item_menu_opened
* @item : #XfcePanelItem
@@ -280,9 +280,9 @@
g_signal_emit (G_OBJECT (item), xfce_panel_item_signals[MENU_OPENED], 0,
NULL);
}
-
-
+
+
/**
* xfce_panel_item_customize_panel
* @item : #XfcePanelItem
@@ -297,9 +297,9 @@
g_signal_emit (G_OBJECT (item), xfce_panel_item_signals[CUSTOMIZE_PANEL],
0, NULL);
}
-
-
+
+
/**
* xfce_panel_item_customize_items
* @item : #XfcePanelItem
@@ -314,9 +314,9 @@
g_signal_emit (G_OBJECT (item), xfce_panel_item_signals[CUSTOMIZE_ITEMS],
0, NULL);
}
-
-
+
+
/**
* xfce_panel_item_move
* @item : #XfcePanelItem
@@ -331,9 +331,9 @@
g_signal_emit (G_OBJECT (item), xfce_panel_item_signals[MOVE], 0, NULL);
}
-
-
+
+
/**
* xfce_panel_item_set_panel_hidden
* @item : #XfcePanelItem
@@ -350,9 +350,9 @@
g_signal_emit (G_OBJECT (item), xfce_panel_item_signals[SET_HIDDEN],
0, hidden, NULL);
}
-
+
/**
* xfce_panel_item_get_name
* @item : #XfcePanelItem
@@ -364,9 +364,9 @@
{
return XFCE_PANEL_ITEM_GET_INTERFACE (item)->get_name (item);
}
-
-
+
+
/**
* xfce_panel_item_get_id
* @item : #XfcePanelItem
@@ -378,9 +378,9 @@
{
return XFCE_PANEL_ITEM_GET_INTERFACE (item)->get_id (item);
}
-
-
+
+
/**
* xfce_panel_item_get_display_name
* @item : #XfcePanelItem
@@ -392,9 +392,9 @@
{
return XFCE_PANEL_ITEM_GET_INTERFACE (item)->get_display_name (item);
}
-
-
+
+
/**
* xfce_panel_item_get_expand
* @item : #XfcePanelItem
@@ -406,9 +406,9 @@
{
return XFCE_PANEL_ITEM_GET_INTERFACE (item)->get_expand (item);
}
-
-
+
+
/**
* xfce_panel_item_save
* @item : #XfcePanelItem
@@ -420,9 +420,9 @@
{
XFCE_PANEL_ITEM_GET_INTERFACE (item)->save (item);
}
-
-
+
+
/**
* xfce_panel_item_free_data
* @item : #XfcePanelItem
@@ -434,9 +434,9 @@
{
XFCE_PANEL_ITEM_GET_INTERFACE (item)->free_data (item);
}
-
-
+
+
/**
* xfce_panel_item_set_size
* @item : #XfcePanelItem
@@ -450,9 +450,9 @@
{
XFCE_PANEL_ITEM_GET_INTERFACE (item)->set_size (item, size);
}
-
-
+
+
/**
* xfce_panel_item_set
* @item : #XfcePanelItem
@@ -466,9 +466,9 @@
{
XFCE_PANEL_ITEM_GET_INTERFACE (item)->set_screen_position (item, position);
}
-
-
+
+
/*
* xfce_panel_item_set_sensitive
* @item : an #XfcePanelItem
@@ -482,9 +482,9 @@
{
XFCE_PANEL_ITEM_GET_INTERFACE (item)->set_sensitive (item, sensitive);
}
-
-
+
+
/*
* xfce_panel_item_remove
* @item : an #XfcePanelItem
@@ -496,9 +496,9 @@
{
XFCE_PANEL_ITEM_GET_INTERFACE (item)->remove (item);
}
-
-
+
+
/*
* xfce_panel_item_configure
* @item : an #XfcePanelItem
Modified: xfce4-panel/branches/4_5_nick/libxfce4panel/xfce-panel-plugin-iface.c
===================================================================
--- xfce4-panel/branches/4_5_nick/libxfce4panel/xfce-panel-plugin-iface.c
2007-02-21 20:31:33 UTC (rev 25007)
+++ xfce4-panel/branches/4_5_nick/libxfce4panel/xfce-panel-plugin-iface.c
2007-02-21 21:37:17 UTC (rev 25008)
@@ -68,7 +68,7 @@
* @position : new #XfceScreenPosition of the panel
*
* Emitted when the screen position changes. Most plugins will be
- * more ginterested in the "orientation-changed" signal.
+ * more interested in the "orientation-changed" signal.
**/
xfce_panel_plugin_signals [SCREEN_POSITION_CHANGED] =
g_signal_newv (I_("screen-position-changed"),
@@ -605,9 +605,13 @@
dialog = gtk_message_dialog_new (NULL,
GTK_DIALOG_MODAL,
GTK_MESSAGE_QUESTION,
- GTK_BUTTONS_YES_NO,
+ GTK_BUTTONS_NONE,
_("Remove \"%s\"?"), name);
+ 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),
Modified: xfce4-panel/branches/4_5_nick/libxfce4panel/xfce-panel-window.c
===================================================================
--- xfce4-panel/branches/4_5_nick/libxfce4panel/xfce-panel-window.c
2007-02-21 20:31:33 UTC (rev 25007)
+++ xfce4-panel/branches/4_5_nick/libxfce4panel/xfce-panel-window.c
2007-02-21 21:37:17 UTC (rev 25008)
@@ -85,10 +85,10 @@
guint right_border : 1;
guint movable : 1;
};
-
-
-
+
+
+
static void xfce_panel_window_class_init (XfcePanelWindowClass
*klass);
static void xfce_panel_window_init (XfcePanelWindow
*window);
static void xfce_panel_window_get_property (GObject
*object,
@@ -120,15 +120,15 @@
static void _paint_handle (XfcePanelWindow
*panel_window,
gboolean
start,
GdkRectangle
*area);
-
-
+
+
/* global vars */
static GtkWindowClass *parent_class = NULL;
static guint panel_window_signals[LAST_SIGNAL] = { 0 };
-
+
/* public GType function */
GType
xfce_panel_window_get_type (void)
@@ -157,8 +157,8 @@
return type;
}
-
+
/* init */
static void
xfce_panel_window_class_init (XfcePanelWindowClass *klass)
@@ -306,9 +306,9 @@
DEFAULT_HANDLE_STYLE,
G_PARAM_READWRITE));
}
-
-
+
+
static void
xfce_panel_window_init (XfcePanelWindow *panel_window)
{
@@ -358,9 +358,9 @@
| GDK_ENTER_NOTIFY_MASK
| GDK_LEAVE_NOTIFY_MASK);
}
-
-
+
+
/* GObject */
static void
xfce_panel_window_get_property (GObject *object,
@@ -383,9 +383,9 @@
break;
}
}
-
-
+
+
static void
xfce_panel_window_set_property (GObject *object,
guint prop_id,
@@ -407,9 +407,9 @@
break;
}
}
-
-
+
+
/* GtkWidget */
static void
xfce_panel_window_realize (GtkWidget *widget)
@@ -418,33 +418,33 @@
GTK_WIDGET_CLASS (parent_class)->realize (widget);
}
-
-
+
+
static void
xfce_panel_window_unrealize (GtkWidget *widget)
{
GTK_WIDGET_CLASS (parent_class)->unrealize (widget);
}
-
-
+
+
static void
xfce_panel_window_map (GtkWidget *widget)
{
GTK_WIDGET_CLASS (parent_class)->map (widget);
}
-
-
+
+
static void
xfce_panel_window_unmap (GtkWidget *widget)
{
GTK_WIDGET_CLASS (parent_class)->unmap (widget);
}
-
-
+
+
static void
xfce_panel_window_show (GtkWidget *widget)
{
@@ -460,9 +460,9 @@
priv->shown = TRUE;
}
}
-
-
+
+
static void
xfce_panel_window_hide (GtkWidget *widget)
{
@@ -472,9 +472,9 @@
priv->shown = FALSE;
}
-
-
+
+
/* drawing, size and style */
static void
_panel_window_paint_border (XfcePanelWindow *panel)
@@ -624,9 +624,9 @@
}
}
}
-
-
+
+
static gint
xfce_panel_window_expose (GtkWidget *widget,
GdkEventExpose *event)
@@ -663,9 +663,9 @@
return FALSE;
}
-
-
+
+
static void
xfce_panel_window_size_request (GtkWidget *widget,
GtkRequisition *requisition)
@@ -699,12 +699,12 @@
{
case XFCE_HANDLE_STYLE_BOTH:
handle_size = 2 * (HANDLE_WIDTH + thick);
- break;
+ break;
case XFCE_HANDLE_STYLE_START:
case XFCE_HANDLE_STYLE_END:
handle_size = HANDLE_WIDTH + thick;
- break;
+ break;
default:
handle_size = 0;
@@ -715,9 +715,9 @@
else
requisition->height += handle_size;
}
-
-
+
+
static void
xfce_panel_window_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
@@ -814,9 +814,9 @@
priv->allocation = *allocation;
}
-
-
+
+
/* keyboard and mouse events */
static gboolean
xfce_panel_window_button_press (GtkWidget *widget,
@@ -859,9 +859,9 @@
return FALSE;
}
-
-
+
+
static gboolean
xfce_panel_window_button_release (GtkWidget *widget,
GdkEventButton *event)
@@ -886,9 +886,9 @@
return TRUE;
}
-
-
+
+
static gboolean
xfce_panel_window_motion_notify (GtkWidget *widget,
GdkEventMotion *event)
@@ -921,9 +921,9 @@
return TRUE;
}
-
-
+
+
/* ginternal functions */
static void
_paint_handle (XfcePanelWindow *panel_window,
@@ -1022,9 +1022,9 @@
{
return GTK_WIDGET (g_object_new (XFCE_TYPE_PANEL_WINDOW, NULL));
}
-
-
+
+
/**
* xfce_panel_window_get_orientation
* @window: #XfcePanelWindow
@@ -1044,9 +1044,9 @@
return priv->orientation;
}
-
-
+
+
/**
* xfce_panel_window_set_orientation
* @window : #XfcePanelWindow
@@ -1071,9 +1071,9 @@
g_object_notify (G_OBJECT (window), "orientation");
}
-
-
+
+
/**
* xfce_panel_window_get_handle_style
* @window: #XfcePanelWindow
@@ -1093,9 +1093,9 @@
return priv->handle_style;
}
-
-
+
+
/**
* xfce_panel_window_set_handle_style
* @window : #XfcePanelWindow
@@ -1122,9 +1122,9 @@
gtk_widget_queue_resize (GTK_WIDGET (window));
}
-
-
+
+
/**
* xfce_panel_window_get_show_border
* @window : #XfcePanelWindow
@@ -1157,9 +1157,9 @@
if (right_border != NULL)
*right_border = priv->right_border;
}
-
-
+
+
/**
* xfce_panel_window_set_show_border
* @window : #XfcePanelWindow
@@ -1196,9 +1196,9 @@
gtk_widget_queue_resize (GTK_WIDGET (window));
}
}
-
-
+
+
/**
* xfce_panel_window_set_move_function
* @window : #XfcePanelWindow
@@ -1221,9 +1221,9 @@
priv->move_func = function;
priv->move_data = data;
}
-
-
+
+
/**
* xfce_panel_window_set_resize_function
* @window : #XfcePanelWindow
@@ -1246,9 +1246,9 @@
priv->resize_func = function;
priv->resize_data = data;
}
-
-
+
+
/**
* xfce_panel_window_get_movable
* @window : #XfcePanelWindow
@@ -1269,9 +1269,9 @@
return priv->movable;
}
-
-
+
+
/**
* xfce_panel_window_set_movable
* @window : #XfcePanelWindow
Modified: xfce4-panel/branches/4_5_nick/panel/panel-config.c
===================================================================
--- xfce4-panel/branches/4_5_nick/panel/panel-config.c 2007-02-21 20:31:33 UTC
(rev 25007)
+++ xfce4-panel/branches/4_5_nick/panel/panel-config.c 2007-02-21 21:37:17 UTC
(rev 25008)
@@ -626,19 +626,6 @@
FILE *fp;
gchar tmp_path[PATH_MAX];
gint i;
- Panel *panel;
- gint size = 0;
- gint monitor = 0;
- gint screen_position = 0;
- gint fullwidth = 0;
- gint xoffset = 0;
- gint yoffset = 0;
- gint handle_style = 0;
- gint transparency = 0;
- gboolean autohide = FALSE;
- gboolean activetrans = FALSE;
- GList *configlist, *l;
- XfcePanelItem *item;
g_return_val_if_fail (array != NULL, FALSE);
g_return_val_if_fail (filename != NULL || (strlen (filename) > 0), FALSE);
@@ -662,12 +649,24 @@
for (i = 0; i < array->len; ++i)
{
+ gint size = 0;
+ gint monitor = 0;
+ gint screen_position = 0;
+ gint fullwidth = 0;
+ gint xoffset = 0;
+ gint yoffset = 0;
+ gint handle_style = 0;
+ gint transparency = 0;
+ gboolean autohide = FALSE;
+ gboolean activetrans = FALSE;
+ Panel *panel;
+ GList *configlist, *l;
+ XfcePanelItem *item;
+
DBG ("Saving panel %d", i + 1);
panel = g_ptr_array_index (array, i);
- autohide = activetrans = FALSE;
-
g_object_get (G_OBJECT (panel),
"size", &size,
"monitor", &monitor,
Modified: xfce4-panel/branches/4_5_nick/plugins/iconbox/iconbox.c
===================================================================
--- xfce4-panel/branches/4_5_nick/plugins/iconbox/iconbox.c 2007-02-21
20:31:33 UTC (rev 25007)
+++ xfce4-panel/branches/4_5_nick/plugins/iconbox/iconbox.c 2007-02-21
21:37:17 UTC (rev 25008)
@@ -491,6 +491,11 @@
ib->iconlist = g_slist_append (ib->iconlist, icon);
gtk_box_pack_start (GTK_BOX (ib->iconbox), icon->button, FALSE, FALSE, 0);
+
+ if (netk_window_or_transient_demands_attention (window))
+ {
+ queue_urgent_timeout (icon);
+ }
}
static void
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
