Browse Source

Strip trailing spaces.

upstream/xfce4-panel-4.10.1
Nick Schermer 14 years ago
parent
commit
10dcf9b2e6
  1. 2
      libxfce4panel/xfce-arrow-button.h
  2. 6
      libxfce4panel/xfce-hvbox.c
  3. 2
      libxfce4panel/xfce-hvbox.h
  4. 2
      libxfce4panel/xfce-panel-plugin-provider.c
  5. 18
      libxfce4panel/xfce-panel-plugin.c
  6. 8
      panel/main.c
  7. 8
      panel/panel-application.c
  8. 14
      panel/panel-dbus-service.c
  9. 76
      panel/panel-item-dialog.c
  10. 2
      panel/panel-module-factory.h
  11. 10
      panel/panel-module.c
  12. 10
      panel/panel-plugin-external.h
  13. 2
      panel/panel-preferences-dialog.c
  14. 2
      panel/panel-window.c
  15. 2
      plugins/clock/clock-analog.c
  16. 2
      plugins/clock/clock-binary.c
  17. 2
      plugins/clock/clock-lcd.c
  18. 30
      plugins/tasklist.new/tasklist-box.c
  19. 8
      plugins/tasklist.new/tasklist-plugin.c
  20. 2
      wrapper/wrapper-plug.c

2
libxfce4panel/xfce-arrow-button.h

@ -53,7 +53,7 @@ struct _XfceArrowButton
{
/*< private >*/
GtkToggleButton __parent__;
GtkArrowType arrow_type;
};

6
libxfce4panel/xfce-hvbox.c

@ -2,7 +2,7 @@
/*
* This file is partly based on OBox
* Copyright (C) 2002 Red Hat Inc. based on GtkHBox
*
*
* Copyright (C) 2006-2007 Jasper Huijsmans <jasper@xfce.org>
* Copyright (C) 2006 Jani Monoses <jani@ubuntu.com>
* Copyright (C) 2007-2008 Nick Schermer <nick@xfce.org>
@ -80,7 +80,7 @@ xfce_hvbox_get_class (XfceHVBox *hvbox)
/* peek the class, this only works if the class already exists */
klass = g_type_class_peek (type);
/* return the type or create the class */
return klass ? klass : g_type_class_ref (type);
}
@ -95,7 +95,7 @@ xfce_hvbox_size_request (GtkWidget *widget,
/* get the widget class */
klass = xfce_hvbox_get_class (XFCE_HVBOX (widget));
/* request the size */
(*GTK_WIDGET_CLASS (klass)->size_request) (widget, requisition);
}

2
libxfce4panel/xfce-hvbox.h

@ -2,7 +2,7 @@
/*
* This file is partly based on OBox
* Copyright (C) 2002 Red Hat Inc. based on GtkHBox
*
*
* Copyright (C) 2006-2007 Jasper Huijsmans <jasper@xfce.org>
* Copyright (C) 2006 Jani Monoses <jani@ubuntu.com>
* Copyright (C) 2007-2008 Nick Schermer <nick@xfce.org>

2
libxfce4panel/xfce-panel-plugin-provider.c

@ -52,7 +52,7 @@ xfce_panel_plugin_provider_get_type (void)
static GType type = 0;
if (G_UNLIKELY (type == 0))
{
{
type = g_type_register_static_simple (G_TYPE_INTERFACE, I_("XfcePanelPluginProvider"),
sizeof (XfcePanelPluginProviderIface),
(GClassInitFunc) xfce_panel_plugin_provider_class_init,

18
libxfce4panel/xfce-panel-plugin.c

@ -283,8 +283,8 @@ xfce_panel_plugin_class_init (XfcePanelPluginClass *klass)
/**
* XfcePanelPlugin:name:
*
* The internal, unstranslated, name of the #XfcePanelPlugin. Plugin
* writer can use it to read the plugin name, but
* The internal, unstranslated, name of the #XfcePanelPlugin. Plugin
* writer can use it to read the plugin name, but
* xfce_panel_plugin_get_name() is recommended since that
* returns a const string.
**/
@ -336,9 +336,9 @@ xfce_panel_plugin_class_init (XfcePanelPluginClass *klass)
/**
* XfcePanelPlugin:arguments:
*
* The arguments the plugin was started with. If the plugin was not
* started with any arguments this value is %NULL. Plugin writer can
* use it to read the arguments array, but
* The arguments the plugin was started with. If the plugin was not
* started with any arguments this value is %NULL. Plugin writer can
* use it to read the arguments array, but
* xfce_panel_plugin_get_arguments() is recommended.
**/
g_object_class_install_property (gobject_class,
@ -350,7 +350,7 @@ xfce_panel_plugin_class_init (XfcePanelPluginClass *klass)
G_PARAM_READWRITE
| G_PARAM_STATIC_STRINGS
| G_PARAM_CONSTRUCT_ONLY));
/** TODO properties for size, expand, orientation, screen-position **/
}
@ -757,7 +757,7 @@ xfce_panel_plugin_unregister_menu (GtkMenu *menu,
{
/* disconnect this signal */
g_signal_handlers_disconnect_by_func (G_OBJECT (menu), G_CALLBACK (xfce_panel_plugin_unregister_menu), plugin);
/* decrease the counter */
plugin->priv->registered_menus--;
@ -1289,11 +1289,11 @@ xfce_panel_plugin_position_widget (XfcePanelPlugin *plugin,
/* get the menu/widget size request */
gtk_widget_size_request (menu_widget, &requisition);
/* get the root position of the attach widget (the panel) */
toplevel = gtk_widget_get_toplevel (attach_widget);
gtk_window_get_position (GTK_WINDOW (toplevel), x, y);
/* add the widgets allocation */
*x += attach_widget->allocation.x;
*y += attach_widget->allocation.y;

8
panel/main.c

@ -99,7 +99,7 @@ callback_handler (const gchar *name,
/* set the option */
opt_preferences = value ? MAX (0, atoi (value)) : 0;
break;
case 'a':
/* set the option */
opt_add_items = value ? MAX (0, atoi (value)) : 0;
@ -108,7 +108,7 @@ callback_handler (const gchar *name,
default:
return FALSE;
}
return TRUE;
}
@ -236,7 +236,7 @@ main (gint argc, gchar **argv)
goto dbus_return;
}
/* create dbus service */
dbus_service = panel_dbus_service_get ();
@ -249,7 +249,7 @@ main (gint argc, gchar **argv)
/* enter the main loop */
gtk_main ();
/* release dbus service */
g_object_unref (G_OBJECT (dbus_service));

8
panel/panel-application.c

@ -553,10 +553,10 @@ panel_application_plugin_move (GtkWidget *item,
/* begin a drag */
context = gtk_drag_begin (item, target_list, GDK_ACTION_MOVE, 1, NULL);
/* set the drag context icon name */
icon_name = panel_module_get_icon_name_from_plugin (XFCE_PANEL_PLUGIN_PROVIDER (item));
gtk_drag_set_icon_name (context, icon_name ? icon_name : GTK_STOCK_DND, 0, 0);
gtk_drag_set_icon_name (context, icon_name ? icon_name : GTK_STOCK_DND, 0, 0);
/* release the drag list */
gtk_target_list_unref (target_list);
@ -577,7 +577,7 @@ panel_application_plugin_provider_signal (XfcePanelPluginProvider *provide
panel_return_if_fail (PANEL_IS_APPLICATION (application));
panel_return_if_fail (XFCE_IS_PANEL_PLUGIN_PROVIDER (provider));
/* get the panel of the plugin */
window = PANEL_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (provider)));
@ -601,7 +601,7 @@ panel_application_plugin_provider_signal (XfcePanelPluginProvider *provide
/* block autohide */
panel_window_freeze_autohide (window);
break;
case UNLOCK_PANEL:
/* unblock autohide */
panel_window_thaw_autohide (window);

14
panel/panel-dbus-service.c

@ -158,7 +158,7 @@ panel_dbus_service_display_preferences_dialog (PanelDBusService *service,
GError **error)
{
PanelApplication *application;
panel_return_val_if_fail (PANEL_IS_DBUS_SERVICE (service), FALSE);
panel_return_val_if_fail (error == NULL || *error == NULL, FALSE);
@ -166,7 +166,7 @@ panel_dbus_service_display_preferences_dialog (PanelDBusService *service,
application = panel_application_get ();
panel_preferences_dialog_show (panel_application_get_window (application, active));
g_object_unref (G_OBJECT (application));
return TRUE;
}
@ -178,7 +178,7 @@ panel_dbus_service_display_items_dialog (PanelDBusService *service,
GError **error)
{
PanelApplication *application;
panel_return_val_if_fail (PANEL_IS_DBUS_SERVICE (service), FALSE);
panel_return_val_if_fail (error == NULL || *error == NULL, FALSE);
@ -197,7 +197,7 @@ panel_dbus_service_save (PanelDBusService *service,
GError **error)
{
PanelApplication *application;
panel_return_val_if_fail (PANEL_IS_DBUS_SERVICE (service), FALSE);
panel_return_val_if_fail (error == NULL || *error == NULL, FALSE);
@ -218,11 +218,11 @@ panel_dbus_service_add_new_item (PanelDBusService *service,
GError **error)
{
PanelApplication *application;
panel_return_val_if_fail (PANEL_IS_DBUS_SERVICE (service), FALSE);
panel_return_val_if_fail (error == NULL || *error == NULL, FALSE);
panel_return_val_if_fail (plugin_name != NULL, FALSE);
application = panel_application_get ();
/* save the configuration */
@ -230,7 +230,7 @@ panel_dbus_service_add_new_item (PanelDBusService *service,
panel_application_add_new_item (application, plugin_name, arguments);
else
panel_application_add_new_item (application, plugin_name, NULL);
g_object_unref (G_OBJECT (application));
return TRUE;

76
panel/panel-item-dialog.c

@ -68,10 +68,10 @@ struct _PanelItemDialogClass
struct _PanelItemDialog
{
XfceTitledDialog __parent__;
/* the application */
PanelApplication *application;
/* module factory */
PanelModuleFactory *factory;
@ -128,16 +128,16 @@ panel_item_dialog_init (PanelItemDialog *dialog)
/* get the application */
dialog->application = panel_application_get ();
/* register the window in the application */
panel_application_take_dialog (dialog->application, GTK_WINDOW (dialog));
/* make the application windows insensitive */
panel_application_windows_sensitive (dialog->application, FALSE);
/* block autohide */
panel_application_windows_autohide (dialog->application, TRUE);
/* get factory reference */
dialog->factory = panel_module_factory_get ();
@ -207,12 +207,12 @@ panel_item_dialog_init (PanelItemDialog *dialog)
/* release the filter model */
g_object_unref (G_OBJECT (filter));
/* signals for treeview dnd */
gtk_drag_source_set (treeview, GDK_BUTTON1_MASK, drag_targets, G_N_ELEMENTS (drag_targets), GDK_ACTION_COPY);
g_signal_connect_after (G_OBJECT (treeview), "drag-begin", G_CALLBACK (panel_item_dialog_drag_begin), dialog);
g_signal_connect_after (G_OBJECT (treeview), "drag-data-get", G_CALLBACK (panel_item_dialog_drag_data_get), dialog);
/* icon renderer */
renderer = gtk_cell_renderer_pixbuf_new ();
column = gtk_tree_view_column_new_with_attributes ("", renderer, "icon-name", COLUMN_ICON_NAME, "sensitive", COLUMN_SENSITIVE, NULL);
@ -241,10 +241,10 @@ panel_item_dialog_finalize (GObject *object)
/* disconnect unique-changed signal */
g_signal_handlers_disconnect_by_func (G_OBJECT (dialog->factory), panel_item_dialog_unique_changed, dialog);
/* make the windows sensitive again */
panel_application_windows_sensitive (dialog->application, TRUE);
/* free autohide block */
panel_application_windows_autohide (dialog->application, FALSE);
@ -253,7 +253,7 @@ panel_item_dialog_finalize (GObject *object)
/* release factory */
g_object_unref (G_OBJECT (dialog->factory));
/* release the application */
g_object_unref (G_OBJECT (dialog->application));
@ -268,18 +268,18 @@ panel_item_dialog_response (GtkDialog *dialog,
{
GError *error = NULL;
GdkScreen *screen;
if (response_id == GTK_RESPONSE_HELP)
{
/* get the dialog screen */
screen = gtk_widget_get_screen (GTK_WIDGET (dialog));
/* open the help url */
if (exo_url_show_on_screen (ITEMS_HELP_URL, NULL, screen, &error) == FALSE)
{
/* show error */
g_warning ("Failed to open help: %s", error->message);
/* cleanup */
g_error_free (error);
}
@ -322,7 +322,7 @@ panel_item_dialog_unique_changed_foreach (GtkTreeModel *model,
/* get the module of this iter */
gtk_tree_model_get (model, iter, COLUMN_MODULE, &module, -1);
/* skip the separator */
if (G_UNLIKELY (module == NULL))
return FALSE;
@ -347,22 +347,22 @@ panel_item_dialog_unique_changed_foreach (GtkTreeModel *model,
static gboolean
panel_item_dialog_separator_func (GtkTreeModel *model,
GtkTreeIter *iter,
panel_item_dialog_separator_func (GtkTreeModel *model,
GtkTreeIter *iter,
gpointer user_data)
{
PanelModule *module;
/* get the module */
gtk_tree_model_get (model, iter, COLUMN_MODULE, &module, -1);
/* it's a separator if the module is null */
if (G_UNLIKELY (module == NULL))
return TRUE;
/* release module */
g_object_unref (G_OBJECT (module));
/* not a module */
return FALSE;
}
@ -376,9 +376,9 @@ panel_item_dialog_get_selected_module (GtkTreeView *treeview)
GtkTreeModel *model;
GtkTreeIter iter;
PanelModule *module = NULL;
panel_return_val_if_fail (GTK_IS_TREE_VIEW (treeview), NULL);
/* get the treeview selection */
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
if (G_LIKELY (selection))
@ -395,14 +395,14 @@ panel_item_dialog_get_selected_module (GtkTreeView *treeview)
{
/* release the module */
g_object_unref (G_OBJECT (module));
/* return null */
module = NULL;
}
}
}
}
return module;
}
@ -419,7 +419,7 @@ panel_item_dialog_drag_begin (GtkWidget *treeview,
panel_return_if_fail (GTK_IS_TREE_VIEW (treeview));
panel_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
panel_return_if_fail (PANEL_IS_ITEM_DIALOG (dialog));
/* get the selected panel module */
module = panel_item_dialog_get_selected_module (GTK_TREE_VIEW (treeview));
if (G_LIKELY (module))
@ -428,7 +428,7 @@ panel_item_dialog_drag_begin (GtkWidget *treeview,
{
/* get the module icon name */
icon_name = panel_module_get_icon_name (module);
/* set the drag icon */
if (G_LIKELY (icon_name))
gtk_drag_set_icon_name (context, icon_name, 0, 0);
@ -440,7 +440,7 @@ panel_item_dialog_drag_begin (GtkWidget *treeview,
/* plugin is not usable */
gtk_drag_set_icon_name (context, GTK_STOCK_CANCEL, 0, 0);
}
/* release module */
g_object_unref (G_OBJECT (module));
}
@ -458,7 +458,7 @@ panel_item_dialog_drag_data_get (GtkWidget *treeview,
{
PanelModule *module;
const gchar *internal_name;
panel_return_if_fail (GTK_IS_TREE_VIEW (treeview));
panel_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
panel_return_if_fail (PANEL_IS_ITEM_DIALOG (dialog));
@ -469,10 +469,10 @@ panel_item_dialog_drag_data_get (GtkWidget *treeview,
{
/* get the internal module name */
internal_name = panel_module_get_internal_name (module);
/* set the selection data */
gtk_selection_data_set (selection_data, selection_data->target, 8, (guchar *) internal_name, strlen (internal_name));
/* release module */
g_object_unref (G_OBJECT (module));
}
@ -500,7 +500,7 @@ panel_item_dialog_populate_store (PanelItemDialog *dialog)
{
/* get module */
module = PANEL_MODULE (li->data);
/* insert in the store */
gtk_list_store_insert_with_values (dialog->store, &iter, n,
COLUMN_MODULE, module,
@ -510,7 +510,7 @@ panel_item_dialog_populate_store (PanelItemDialog *dialog)
/* cleanup */
g_list_free (modules);
/* add an empty item for separator in 2nd position */
if (panel_module_factory_has_launcher (dialog->factory))
gtk_list_store_insert_with_values (dialog->store, &iter, 1, COLUMN_MODULE, NULL, -1);
@ -533,7 +533,7 @@ panel_item_dialog_compare_func (GtkTreeModel *model,
/* get modules a name */
gtk_tree_model_get (model, a, COLUMN_MODULE, &module_a, -1);
gtk_tree_model_get (model, b, COLUMN_MODULE, &module_b, -1);
if (G_UNLIKELY (module_a == NULL || module_b == NULL))
{
/* don't move the separator */
@ -567,7 +567,7 @@ panel_item_dialog_compare_func (GtkTreeModel *model,
/* release the modules */
if (G_LIKELY (module_a))
g_object_unref (G_OBJECT (module_a));
if (G_LIKELY (module_b))
g_object_unref (G_OBJECT (module_b));
@ -598,7 +598,7 @@ panel_item_dialog_visible_func (GtkTreeModel *model,
/* get the data from the model */
gtk_tree_model_get (model, iter, COLUMN_MODULE, &module, -1);
/* hide separator when searching */
if (G_UNLIKELY (module == NULL))
return FALSE;
@ -698,16 +698,16 @@ panel_item_dialog_show (PanelWindow *active)
dialog = g_object_new (PANEL_TYPE_ITEM_DIALOG, NULL);
g_object_add_weak_pointer (G_OBJECT (dialog), (gpointer) &dialog);
}
if (G_UNLIKELY (active == NULL))
active = panel_application_get_window (dialog->application, 0);
/* show the dialog on the same screen as the panel */
gtk_window_set_screen (GTK_WINDOW (dialog), gtk_widget_get_screen (GTK_WIDGET (active)));
/* show the dialog */
gtk_widget_show (GTK_WIDGET (dialog));
/* focus the window */
gtk_window_present (GTK_WINDOW (dialog));
}

2
panel/panel-module-factory.h

@ -51,7 +51,7 @@ GList *panel_module_factory_get_modules (PanelModuleFa
gboolean panel_module_factory_has_module (PanelModuleFactory *factory,
const gchar *name);
XfcePanelPluginProvider *panel_module_factory_get_plugin (PanelModuleFactory *factory,
const gchar *id);

10
panel/panel-module.c

@ -103,7 +103,7 @@ panel_module_class_init (PanelModuleClass *klass)
gtype_module_class = G_TYPE_MODULE_CLASS (klass);
gtype_module_class->load = panel_module_load;
gtype_module_class->unload = panel_module_unload;
/* initialize the quark */
module_quark = g_quark_from_static_string ("panel-module");
}
@ -377,7 +377,7 @@ panel_module_create_plugin (PanelModule *module,
/* emit unique-changed if the plugin is unique */
if (module->is_unique)
panel_module_factory_emit_unique_changed (module);
/* add link to the module */
g_object_set_qdata (G_OBJECT (plugin), module_quark, module);
}
@ -453,12 +453,12 @@ const gchar *
panel_module_get_icon_name_from_plugin (XfcePanelPluginProvider *provider)
{
PanelModule *module;
panel_return_val_if_fail (XFCE_IS_PANEL_PLUGIN_PROVIDER (provider), NULL);
/* get the module */
module = g_object_get_qdata (G_OBJECT (provider), module_quark);
/* return the icon name */
return panel_module_get_icon_name (module);
}

10
panel/panel-plugin-external.h

@ -39,15 +39,15 @@ typedef struct _PanelPluginExternal PanelPluginExternal;
GType panel_plugin_external_get_type (void) G_GNUC_CONST;
XfcePanelPluginProvider *panel_plugin_external_new (PanelModule *module,
const gchar *name,
const gchar *id,
XfcePanelPluginProvider *panel_plugin_external_new (PanelModule *module,
const gchar *name,
const gchar *id,
gchar **arguments);
void panel_plugin_external_set_background_alpha (PanelPluginExternal *external,
void panel_plugin_external_set_background_alpha (PanelPluginExternal *external,
gint percentage);
void panel_plugin_external_set_active_panel (PanelPluginExternal *external,
void panel_plugin_external_set_active_panel (PanelPluginExternal *external,
gboolean active);
G_END_DECLS

2
panel/panel-preferences-dialog.c

@ -827,7 +827,7 @@ panel_preferences_dialog_show (PanelWindow *active)
dialog = g_object_new (PANEL_TYPE_PREFERENCES_DIALOG, NULL);
g_object_add_weak_pointer (G_OBJECT (dialog), (gpointer) &dialog);
}
/* get the active window index */
if (G_LIKELY (active))
idx = panel_application_get_window_index (dialog->application, active);

2
panel/panel-window.c

@ -353,7 +353,7 @@ panel_window_expose_event (GtkWidget *widget,
{
/* create cairo context */
cr = gdk_cairo_create (widget->window);
/* clip the drawing area */
gdk_cairo_rectangle (cr, &event->area);
cairo_clip (cr);

2
plugins/clock/clock-analog.c

@ -230,7 +230,7 @@ xfce_clock_analog_expose_event (GtkWidget *widget,
/* clip the drawing region */
gdk_cairo_rectangle (cr, &event->area);
cairo_clip (cr);
/* get the local time */
xfce_clock_util_get_localtime (&tm);

2
plugins/clock/clock-binary.c

@ -276,7 +276,7 @@ xfce_clock_binary_expose_event (GtkWidget *widget,
/* clip the drawing region */
gdk_cairo_rectangle (cr, &event->area);
cairo_clip (cr);
/* get the current time */
xfce_clock_util_get_localtime (&tm);

2
plugins/clock/clock-lcd.c

@ -314,7 +314,7 @@ xfce_clock_lcd_expose_event (GtkWidget *widget,
/* clip the drawing region */
gdk_cairo_rectangle (cr, &event->area);
cairo_clip (cr);
/* get the local time */
xfce_clock_util_get_localtime (&tm);

30
plugins/tasklist.new/tasklist-box.c

@ -11,7 +11,7 @@
* more details.
*
* You should have received a copy of the GNU Library General Public License
* along with this library; if not, write to the Free Software Foundation,
* along with this library; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
@ -58,17 +58,17 @@ tasklist_box_class_init (TasklistBoxClass *klass)
static void
static void
tasklist_box_init (TasklistBox *box)
{
}
static void
static void
tasklist_box_finalize (GObject *object)
{
//TasklistBox *box = TASKLIST_BOX (object);
(*G_OBJECT_CLASS (tasklist_box_parent_class)->finalize) (object);
}
@ -80,7 +80,7 @@ tasklist_box_connect_window (TasklistBox *box,
{
panel_return_if_fail (TASKLIST_IS_BOX (box));
panel_return_if_fail (WNCK_IS_WINDOW (window));
/* monitor window changes */
g_signal_connect (G_OBJECT (window), "workspace-changed", G_CALLBACK (tasklist_box_window_changed_workspace), box);
g_signal_connect (G_OBJECT (window), "geometry-changed", G_CALLBACK (tasklist_box_window_changed_geometry), box);
@ -94,7 +94,7 @@ tasklist_box_disconnect_window (TasklistBox *box,
{
panel_return_if_fail (TASKLIST_IS_BOX (box));
panel_return_if_fail (WNCK_IS_WINDOW (window));
/* disconnect window monitor signals */
g_signal_handlers_disconnect_by_func (G_OBJECT (window), G_CALLBACK (tasklist_box_window_changed_workspace), box);
g_signal_handlers_disconnect_by_func (G_OBJECT (window), G_CALLBACK (tasklist_box_window_changed_geometry), box);
@ -107,20 +107,20 @@ tasklist_box_connect_screen (TasklistBox *box,
WnckScreen *screen)
{
GList *windows, *li;
panel_return_if_fail (TASKLIST_IS_BOX (box));
panel_return_if_fail (WNCK_IS_SCREEN (screen));
/* monitor screen changes */
g_signal_connect (G_OBJECT (screen), "active-window-changed", G_CALLBACK (tasklist_box_active_window_changed), box);
g_signal_connect (G_OBJECT (screen), "active-workspace-changed", G_CALLBACK (tasklist_box_active_workspace_changed), box);
g_signal_connect (G_OBJECT (screen), "window-opened", G_CALLBACK (tasklist_box_window_added), box);
g_signal_connect (G_OBJECT (screen), "window-closed", G_CALLBACK (tasklist_box_window_removed), box);
g_signal_connect (G_OBJECT (screen), "viewports-changed", G_CALLBACK (tasklist_box_viewports_changed), box);
/* get screen windows */
windows = wnck_screen_get_windows (screen);
/* monitor window changes */
for (li = windows; li != NULL; li = li->next)
tasklist_box_connect_window (box, li->data);
@ -132,17 +132,17 @@ tasklist_box_disconnect_screen (TasklistBox *box,
WnckScreen *screen)
{
GList *windows, *li;
panel_return_if_fail (TASKLIST_IS_BOX (box));
panel_return_if_fail (WNCK_IS_SCREEN (screen));
/* get screen windows */
windows = wnck_screen_get_windows (screen);
/* disconnect window signals */
for (li = windows; li != NULL; li = li->next)
tasklist_box_disconnect_window (box, li->data);
/* disconnect monitor signals */
g_signal_handlers_disconnect_by_func (G_OBJECT (screen), G_CALLBACK (tasklist_box_active_window_changed), box);
g_signal_handlers_disconnect_by_func (G_OBJECT (screen), G_CALLBACK (tasklist_box_active_workspace_changed), box);

8
plugins/tasklist.new/tasklist-plugin.c

@ -11,7 +11,7 @@
* more details.
*
* You should have received a copy of the GNU Library General Public License
* along with this library; if not, write to the Free Software Foundation,
* along with this library; if not, write to the Free Software Foundation,
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
@ -59,9 +59,9 @@ tasklist_plugin_class_init (TasklistPluginClass *klass)
{
GObjectClass *gobject_class;
XfcePanelPluginClass *plugin_class;
gobject_class = G_OBJECT_CLASS (klass);
plugin_class = XFCE_PANEL_PLUGIN_CLASS (klass);
plugin_class->orientation_changed = tasklist_plugin_orientation_changed;
plugin_class->size_changed = tasklist_plugin_size_changed;
@ -77,7 +77,7 @@ static void
tasklist_plugin_init (TasklistPlugin *plugin)
{
GtkWidget *button;
button = gtk_button_new_from_stock (GTK_STOCK_FLOPPY);
gtk_container_add (GTK_CONTAINER (plugin), button);
gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);

2
wrapper/wrapper-plug.c

@ -77,7 +77,7 @@ static void
wrapper_plug_init (WrapperPlug *plug)
{
extern gchar *opt_name;
/* init vars */
plug->background_alpha = 1.00;
plug->is_selected = FALSE;

Loading…
Cancel
Save