[Xfce4-commits] <xfce4-panel:devel> Some launcher indent fixes.
Nick Schermer
nick at xfce.org
Tue Aug 11 20:35:08 CEST 2009
Updating branch refs/heads/devel
to 044d2369a8295945c373e9d7ee7505bc02e5988c (commit)
from 587d3ed9a729458341e5932c7d8a705fa7f3f11e (commit)
commit 044d2369a8295945c373e9d7ee7505bc02e5988c
Author: Nick Schermer <nick at xfce.org>
Date: Sat Jun 20 13:58:54 2009 +0200
Some launcher indent fixes.
plugins/launcher/launcher-dialog.c | 16 ++++++++--------
plugins/launcher/launcher.c | 34 ++++++++++++++++------------------
2 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/plugins/launcher/launcher-dialog.c b/plugins/launcher/launcher-dialog.c
index 9f87cea..e1bd094 100644
--- a/plugins/launcher/launcher-dialog.c
+++ b/plugins/launcher/launcher-dialog.c
@@ -665,7 +665,7 @@ launcher_dialog_show (LauncherPlugin *plugin)
window = gtk_builder_get_object (builder, "dialog");
xfce_panel_plugin_take_window (XFCE_PANEL_PLUGIN (plugin), GTK_WINDOW (window));
g_signal_connect (G_OBJECT (window), "response",
- G_CALLBACK (launcher_dialog_response), dialog);
+ G_CALLBACK (launcher_dialog_response), dialog);
/* connect item buttons */
for (i = 0; i < G_N_ELEMENTS (button_names); i++)
@@ -681,7 +681,7 @@ launcher_dialog_show (LauncherPlugin *plugin)
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (object));
gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);
g_signal_connect (G_OBJECT (selection), "changed",
- G_CALLBACK (launcher_dialog_tree_selection_changed), dialog);
+ G_CALLBACK (launcher_dialog_tree_selection_changed), dialog);
launcher_dialog_tree_selection_changed (selection, dialog);
/* connect binding to the advanced properties */
@@ -696,15 +696,15 @@ launcher_dialog_show (LauncherPlugin *plugin)
/* setup responses for the other dialogs */
object = gtk_builder_get_object (builder, "dialog-editor");
g_signal_connect (G_OBJECT (object), "response",
- G_CALLBACK (launcher_dialog_editor_response), dialog);
+ G_CALLBACK (launcher_dialog_editor_response), dialog);
g_signal_connect (G_OBJECT (object), "delete-event",
- G_CALLBACK (exo_noop_true), NULL);
+ G_CALLBACK (exo_noop_true), NULL);
object = gtk_builder_get_object (builder, "dialog-add");
g_signal_connect (G_OBJECT (object), "response",
- G_CALLBACK (launcher_dialog_add_response), dialog);
+ G_CALLBACK (launcher_dialog_add_response), dialog);
g_signal_connect (G_OBJECT (object), "delete-event",
- G_CALLBACK (exo_noop_true), NULL);
+ G_CALLBACK (exo_noop_true), NULL);
/* enable sorting in the add dialog */
object = gtk_builder_get_object (builder, "add-store");
@@ -716,7 +716,7 @@ launcher_dialog_show (LauncherPlugin *plugin)
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (object));
gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE);
g_signal_connect (G_OBJECT (selection), "changed",
- G_CALLBACK (launcher_dialog_add_selection_changed), dialog);
+ G_CALLBACK (launcher_dialog_add_selection_changed), dialog);
/* setup search filter in the add dialog */
object = gtk_builder_get_object (builder, "add-store-filter");
@@ -724,7 +724,7 @@ launcher_dialog_show (LauncherPlugin *plugin)
gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (object),
launcher_dialog_add_visible_function, item, NULL);
g_signal_connect_swapped (G_OBJECT (item), "changed",
- G_CALLBACK (gtk_tree_model_filter_refilter), object);
+ G_CALLBACK (gtk_tree_model_filter_refilter), object);
/* setup the icon size in the icon renderers */
object = gtk_builder_get_object (builder, "addrenderericon");
diff --git a/plugins/launcher/launcher.c b/plugins/launcher/launcher.c
index 6579289..b93dcdb 100644
--- a/plugins/launcher/launcher.c
+++ b/plugins/launcher/launcher.c
@@ -250,7 +250,7 @@ launcher_plugin_init (LauncherPlugin *plugin)
icon_theme = gtk_icon_theme_get_default ();
if (G_LIKELY (icon_theme != NULL))
g_signal_connect (G_OBJECT (icon_theme), "changed",
- G_CALLBACK (launcher_plugin_icon_theme_changed), plugin);
+ G_CALLBACK (launcher_plugin_icon_theme_changed), plugin);
/* create the panel widgets */
plugin->box = xfce_hvbox_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
@@ -260,23 +260,24 @@ launcher_plugin_init (LauncherPlugin *plugin)
gtk_box_pack_start (GTK_BOX (plugin->box), plugin->button, TRUE, TRUE, 0);
xfce_panel_plugin_add_action_widget (XFCE_PANEL_PLUGIN (plugin), plugin->button);
gtk_widget_set_has_tooltip (plugin->button, TRUE);
- gtk_drag_dest_set (plugin->button, GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP,
+ gtk_drag_dest_set (plugin->button,
+ GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP,
drop_targets, G_N_ELEMENTS (drop_targets),
GDK_ACTION_COPY);
g_signal_connect (G_OBJECT (plugin->button), "button-press-event",
- G_CALLBACK (launcher_plugin_button_press_event), plugin);
+ G_CALLBACK (launcher_plugin_button_press_event), plugin);
g_signal_connect (G_OBJECT (plugin->button), "button-release-event",
- G_CALLBACK (launcher_plugin_button_release_event), plugin);
+ G_CALLBACK (launcher_plugin_button_release_event), plugin);
g_signal_connect (G_OBJECT (plugin->button), "query-tooltip",
- G_CALLBACK (launcher_plugin_button_query_tooltip), plugin);
+ G_CALLBACK (launcher_plugin_button_query_tooltip), plugin);
g_signal_connect (G_OBJECT (plugin->button), "drag-data-received",
- G_CALLBACK (launcher_plugin_button_drag_data_received), plugin);
+ G_CALLBACK (launcher_plugin_button_drag_data_received), plugin);
g_signal_connect (G_OBJECT (plugin->button), "drag-motion",
- G_CALLBACK (launcher_plugin_button_drag_motion), plugin);
+ G_CALLBACK (launcher_plugin_button_drag_motion), plugin);
g_signal_connect (G_OBJECT (plugin->button), "drag-leave",
- G_CALLBACK (launcher_plugin_button_drag_leave), plugin);
+ G_CALLBACK (launcher_plugin_button_drag_leave), plugin);
g_signal_connect_after (G_OBJECT (plugin->button), "expose-event",
- G_CALLBACK (launcher_plugin_button_expose_event), plugin);
+ G_CALLBACK (launcher_plugin_button_expose_event), plugin);
plugin->child = xfce_scaled_image_new ();
gtk_container_add (GTK_CONTAINER (plugin->button), plugin->child);
@@ -289,19 +290,17 @@ launcher_plugin_init (LauncherPlugin *plugin)
drop_targets, G_N_ELEMENTS (drop_targets),
GDK_ACTION_COPY);
g_signal_connect (G_OBJECT (plugin->arrow), "button-press-event",
- G_CALLBACK (launcher_plugin_arrow_press_event), plugin);
+ G_CALLBACK (launcher_plugin_arrow_press_event), plugin);
g_signal_connect (G_OBJECT (plugin->arrow), "drag-motion",
- G_CALLBACK (launcher_plugin_arrow_drag_motion), plugin);
+ G_CALLBACK (launcher_plugin_arrow_drag_motion), plugin);
g_signal_connect (G_OBJECT (plugin->arrow), "drag-leave",
- G_CALLBACK (launcher_plugin_arrow_drag_leave), plugin);
+ G_CALLBACK (launcher_plugin_arrow_drag_leave), plugin);
/* sync button states */
g_signal_connect (G_OBJECT (plugin->button), "state-changed",
- G_CALLBACK (launcher_plugin_button_state_changed),
- plugin->arrow);
+ G_CALLBACK (launcher_plugin_button_state_changed), plugin->arrow);
g_signal_connect (G_OBJECT (plugin->arrow), "state-changed",
- G_CALLBACK (launcher_plugin_button_state_changed),
- plugin->button);
+ G_CALLBACK (launcher_plugin_button_state_changed), plugin->button);
}
@@ -343,7 +342,6 @@ launcher_plugin_get_property (GObject *object,
case PROP_SHOW_LABEL:
g_value_set_boolean (value, plugin->show_label);
-
break;
case PROP_ARROW_POSITION:
@@ -416,7 +414,7 @@ launcher_plugin_set_property (GObject *object,
menu = xfce_menu_new (SYSCONFDIR "/xdg/menus/launcher.menu", /* TODO */ NULL);
}
- /* lookup the (probably) desktop id in the pool */
+ /* lookup the (hopefully) desktop id in the pool */
if (G_LIKELY (menu != NULL))
{
item = xfce_menu_item_pool_lookup (
More information about the Xfce4-commits
mailing list