diff options
author | monsta <[email protected]> | 2016-12-29 14:49:39 +0300 |
---|---|---|
committer | monsta <[email protected]> | 2016-12-29 14:49:39 +0300 |
commit | 5ba16bf7f86d2a9daff01cc146a57f5201141c65 (patch) | |
tree | 1768b9546aa85069a593464c8b6fbefb160eb8ae | |
parent | 19022217432b8ef3b256df98cf2ccc69d1855595 (diff) | |
download | caja-5ba16bf7f86d2a9daff01cc146a57f5201141c65.tar.bz2 caja-5ba16bf7f86d2a9daff01cc146a57f5201141c65.tar.xz |
fix indent and spacing a bit
-rw-r--r-- | eel/eel-canvas.c | 20 | ||||
-rw-r--r-- | eel/eel-canvas.h | 6 | ||||
-rw-r--r-- | libcaja-private/caja-icon-container.c | 22 | ||||
-rw-r--r-- | src/caja-notebook.c | 2 | ||||
-rw-r--r-- | src/caja-pathbar.c | 4 | ||||
-rw-r--r-- | src/caja-view-as-action.c | 2 | ||||
-rw-r--r-- | src/caja-zoom-control.c | 6 | ||||
-rw-r--r-- | src/file-manager/fm-directory-view.c | 11 |
8 files changed, 37 insertions, 36 deletions
diff --git a/eel/eel-canvas.c b/eel/eel-canvas.c index ddc15036..97aad908 100644 --- a/eel/eel-canvas.c +++ b/eel/eel-canvas.c @@ -332,7 +332,7 @@ eel_canvas_item_dispose (GObject *object) item->canvas->need_repick = TRUE; } -#if GTK_CHECK_VERSION(3, 20, 0) +#if GTK_CHECK_VERSION (3, 20, 0) eel_canvas_item_ungrab (item); #else eel_canvas_item_ungrab (item, GDK_CURRENT_TIME); @@ -859,7 +859,7 @@ eel_canvas_item_hide (EelCanvasItem *item) } } -#if GTK_CHECK_VERSION(3, 20, 0) +#if GTK_CHECK_VERSION (3, 20, 0) /* * Prepare the window for grabbing, i.e. show it. */ @@ -911,7 +911,7 @@ GdkGrabStatus eel_canvas_item_grab (EelCanvasItem *item, GdkEventMask event_mask, GdkCursor *cursor, -#if GTK_CHECK_VERSION(3, 20, 0) +#if GTK_CHECK_VERSION (3, 20, 0) const GdkEvent *event) { GdkGrabStatus retval; @@ -937,7 +937,7 @@ eel_canvas_item_grab (EelCanvasItem *item, return GDK_GRAB_NOT_VIEWABLE; display = gtk_widget_get_display (GTK_WIDGET (item->canvas)); -#if GTK_CHECK_VERSION(3, 20, 0) +#if GTK_CHECK_VERSION (3, 20, 0) seat = gdk_display_get_default_seat (display); retval = gdk_seat_grab (seat, @@ -971,7 +971,7 @@ eel_canvas_item_grab (EelCanvasItem *item, return retval; } -#if GTK_CHECK_VERSION(3, 20, 0) +#if GTK_CHECK_VERSION (3, 20, 0) /** * eel_canvas_item_ungrab: * @item: A canvas item that holds a grab. @@ -990,7 +990,7 @@ eel_canvas_item_grab (EelCanvasItem *item, **/ #endif void -#if GTK_CHECK_VERSION(3, 20, 0) +#if GTK_CHECK_VERSION (3, 20, 0) eel_canvas_item_ungrab (EelCanvasItem *item) { GdkDisplay *display; @@ -2209,7 +2209,7 @@ shutdown_transients (EelCanvas *canvas) if (canvas->grabbed_item) { -#if GTK_CHECK_VERSION(3, 20, 0) +#if GTK_CHECK_VERSION (3, 20, 0) eel_canvas_item_ungrab (canvas->grabbed_item); #else eel_canvas_item_ungrab (canvas->grabbed_item, GDK_CURRENT_TIME); @@ -2606,7 +2606,7 @@ emit_event (EelCanvas *canvas, GdkEvent *event) break; case GDK_MOTION_NOTIFY: -#if !GTK_CHECK_VERSION(3, 20, 0) +#if !GTK_CHECK_VERSION (3, 20, 0) eel_canvas_window_to_world (canvas, ev.motion.x, ev.motion.y, &ev.motion.x, &ev.motion.y); @@ -2616,7 +2616,7 @@ emit_event (EelCanvas *canvas, GdkEvent *event) case GDK_BUTTON_PRESS: case GDK_2BUTTON_PRESS: case GDK_3BUTTON_PRESS: -#if GTK_CHECK_VERSION(3, 20, 0) +#if GTK_CHECK_VERSION (3, 20, 0) case GDK_BUTTON_RELEASE: #endif eel_canvas_window_to_world (canvas, @@ -2624,7 +2624,7 @@ emit_event (EelCanvas *canvas, GdkEvent *event) &ev.motion.x, &ev.motion.y); break; -#if !GTK_CHECK_VERSION(3, 20, 0) +#if !GTK_CHECK_VERSION (3, 20, 0) case GDK_BUTTON_RELEASE: eel_canvas_window_to_world (canvas, ev.motion.x, ev.motion.y, diff --git a/eel/eel-canvas.h b/eel/eel-canvas.h index d26d3daf..4b4505f3 100644 --- a/eel/eel-canvas.h +++ b/eel/eel-canvas.h @@ -247,7 +247,7 @@ extern "C" { */ void eel_canvas_item_hide (EelCanvasItem *item); -#if GTK_CHECK_VERSION(3, 20, 0) +#if GTK_CHECK_VERSION (3, 20, 0) /* Grab the seat for the specified item. Only the events in event_mask will be * reported. If cursor is non-NULL, it will be used during the duration of the * grab. event is the event, triggering the grab. Returns the same values as gdk_seat_grab(). @@ -262,13 +262,13 @@ extern "C" { GdkGrabStatus eel_canvas_item_grab (EelCanvasItem *item, GdkEventMask event_mask, GdkCursor *cursor, -#if GTK_CHECK_VERSION(3, 20, 0) +#if GTK_CHECK_VERSION (3, 20, 0) const GdkEvent* event); #else guint32 etime); #endif -#if GTK_CHECK_VERSION(3, 20, 0) +#if GTK_CHECK_VERSION (3, 20, 0) /* Ungrabs the seat -- the specified item must be the same that was passed to * eel_canvas_item_grab(). */ diff --git a/libcaja-private/caja-icon-container.c b/libcaja-private/caja-icon-container.c index 66cfa4c9..50272ce7 100644 --- a/libcaja-private/caja-icon-container.c +++ b/libcaja-private/caja-icon-container.c @@ -2730,7 +2730,7 @@ rubberband_timeout_callback (gpointer data) double world_x, world_y; int x_scroll, y_scroll; int adj_x, adj_y; -#if GTK_CHECK_VERSION(3, 20, 0) +#if GTK_CHECK_VERSION (3, 20, 0) GdkDisplay *display; GdkSeat *seat; #endif @@ -2763,7 +2763,7 @@ rubberband_timeout_callback (gpointer data) band_info->last_adj_y = adj_y; adj_changed = TRUE; } -#if GTK_CHECK_VERSION(3, 20, 0) +#if GTK_CHECK_VERSION (3, 20, 0) display = gtk_widget_get_display (widget); seat = gdk_display_get_default_seat (display); @@ -2946,7 +2946,7 @@ start_rubberbanding (CajaIconContainer *container, (GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK | GDK_SCROLL_MASK), -#if GTK_CHECK_VERSION(3, 20, 0) +#if GTK_CHECK_VERSION (3, 20, 0) NULL, (GdkEvent *)event); #else @@ -2955,7 +2955,7 @@ start_rubberbanding (CajaIconContainer *container, } static void -#if GTK_CHECK_VERSION(3, 20, 0) +#if GTK_CHECK_VERSION (3, 20, 0) stop_rubberbanding (CajaIconContainer *container) #else stop_rubberbanding (CajaIconContainer *container, @@ -2974,7 +2974,7 @@ stop_rubberbanding (CajaIconContainer *container, band_info->active = FALSE; /* Destroy this canvas item; the parent will unref it. */ -#if GTK_CHECK_VERSION(3, 20, 0) +#if GTK_CHECK_VERSION (3, 20, 0) eel_canvas_item_ungrab (band_info->selection_rectangle); #else eel_canvas_item_ungrab (band_info->selection_rectangle, time); @@ -4841,7 +4841,7 @@ clear_drag_state (CajaIconContainer *container) } static gboolean -#if GTK_CHECK_VERSION(3, 20, 0) +#if GTK_CHECK_VERSION (3, 20, 0) start_stretching (CajaIconContainer *container, GdkEvent *event) #else @@ -4904,7 +4904,7 @@ start_stretching (CajaIconContainer *container) (GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK), cursor, -#if GTK_CHECK_VERSION(3, 20, 0) +#if GTK_CHECK_VERSION (3, 20, 0) event); #else GDK_CURRENT_TIME); @@ -5016,7 +5016,7 @@ keyboard_stretching (CajaIconContainer *container, static void ungrab_stretch_icon (CajaIconContainer *container) { -#if GTK_CHECK_VERSION(3, 20, 0) +#if GTK_CHECK_VERSION (3, 20, 0) eel_canvas_item_ungrab (EEL_CANVAS_ITEM (container->details->stretch_icon->item)); #else eel_canvas_item_ungrab (EEL_CANVAS_ITEM (container->details->stretch_icon->item), @@ -5104,7 +5104,7 @@ button_release_event (GtkWidget *widget, if (event->button == RUBBERBAND_BUTTON && details->rubberband_info.active) { -#if GTK_CHECK_VERSION(3, 20, 0) +#if GTK_CHECK_VERSION (3, 20, 0) stop_rubberbanding (container); #else stop_rubberbanding (container, event->time); @@ -6115,7 +6115,7 @@ grab_notify_cb (GtkWidget *widget, * up (e.g. authentication or an error). Stop * the rubberbanding so that we can handle the * dialog. */ -#if GTK_CHECK_VERSION(3, 20, 0) +#if GTK_CHECK_VERSION (3, 20, 0) stop_rubberbanding (container); #else stop_rubberbanding (container, @@ -6863,7 +6863,7 @@ handle_icon_button_press (CajaIconContainer *container, */ if (icon == container->details->stretch_icon) { -#if GTK_CHECK_VERSION(3, 20, 0) +#if GTK_CHECK_VERSION (3, 20, 0) if (start_stretching (container, (GdkEvent *)event)) { #else diff --git a/src/caja-notebook.c b/src/caja-notebook.c index 1dd5f6a9..a860df2b 100644 --- a/src/caja-notebook.c +++ b/src/caja-notebook.c @@ -325,7 +325,7 @@ build_tab_label (CajaNotebook *nb, CajaWindowSlot *slot) gtk_button_set_relief (GTK_BUTTON (close_button), GTK_RELIEF_NONE); /* don't allow focus on the close button */ -#if GTK_CHECK_VERSION(3,20,0) +#if GTK_CHECK_VERSION (3, 20, 0) gtk_widget_set_focus_on_click (close_button, FALSE); #else gtk_button_set_focus_on_click (GTK_BUTTON (close_button), FALSE); diff --git a/src/caja-pathbar.c b/src/caja-pathbar.c index 8c5fec70..322865a5 100644 --- a/src/caja-pathbar.c +++ b/src/caja-pathbar.c @@ -150,7 +150,7 @@ get_slider_button (CajaPathBar *path_bar, GtkWidget *button; button = gtk_button_new (); -#if GTK_CHECK_VERSION(3,20,0) +#if GTK_CHECK_VERSION (3, 20, 0) gtk_widget_set_focus_on_click (button, FALSE); #else gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE); @@ -1881,7 +1881,7 @@ make_directory_button (CajaPathBar *path_bar, button_data->button = gtk_toggle_button_new (); gtk_style_context_add_class (gtk_widget_get_style_context (button_data->button), "text-button"); -#if GTK_CHECK_VERSION(3,20,0) +#if GTK_CHECK_VERSION (3, 20, 0) gtk_widget_set_focus_on_click (button_data->button, FALSE); #else gtk_button_set_focus_on_click (GTK_BUTTON (button_data->button), FALSE); diff --git a/src/caja-view-as-action.c b/src/caja-view-as-action.c index d03cfa63..ab91f4dd 100644 --- a/src/caja-view-as-action.c +++ b/src/caja-view-as-action.c @@ -180,7 +180,7 @@ connect_proxy (GtkAction *action, view_as_combo_box = gtk_combo_box_text_new (); -#if GTK_CHECK_VERSION(3,20,0) +#if GTK_CHECK_VERSION (3, 20, 0) gtk_widget_set_focus_on_click (view_as_combo_box, FALSE); #else gtk_combo_box_set_focus_on_click (GTK_COMBO_BOX (view_as_combo_box), FALSE); diff --git a/src/caja-zoom-control.c b/src/caja-zoom-control.c index e11c2a39..24ac8fce 100644 --- a/src/caja-zoom-control.c +++ b/src/caja-zoom-control.c @@ -311,7 +311,7 @@ caja_zoom_control_init (CajaZoomControl *zoom_control) image = gtk_image_new_from_icon_name ("zoom-out", GTK_ICON_SIZE_MENU); zoom_control->details->zoom_out = gtk_button_new (); -#if GTK_CHECK_VERSION(3,20,0) +#if GTK_CHECK_VERSION (3, 20, 0) gtk_widget_set_focus_on_click (zoom_control->details->zoom_out, FALSE); #else gtk_button_set_focus_on_click (GTK_BUTTON (zoom_control->details->zoom_out), FALSE); @@ -331,7 +331,7 @@ caja_zoom_control_init (CajaZoomControl *zoom_control) zoom_control->details->zoom_out, FALSE, FALSE, 0); zoom_control->details->zoom_button = gtk_button_new (); -#if GTK_CHECK_VERSION(3,20,0) +#if GTK_CHECK_VERSION (3, 20, 0) gtk_widget_set_focus_on_click (zoom_control->details->zoom_button, FALSE); #else gtk_button_set_focus_on_click (GTK_BUTTON (zoom_control->details->zoom_button), FALSE); @@ -373,7 +373,7 @@ caja_zoom_control_init (CajaZoomControl *zoom_control) image = gtk_image_new_from_icon_name ("zoom-in", GTK_ICON_SIZE_MENU); zoom_control->details->zoom_in = gtk_button_new (); -#if GTK_CHECK_VERSION(3,20,0) +#if GTK_CHECK_VERSION (3, 20, 0) gtk_widget_set_focus_on_click (zoom_control->details->zoom_in, FALSE); #else gtk_button_set_focus_on_click (GTK_BUTTON (zoom_control->details->zoom_in), FALSE); diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index 04233fac..d4c41628 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -3643,6 +3643,7 @@ real_set_is_active (FMDirectoryView *view, eel_background_set_active (bg, is_active); } #endif + static void fm_directory_view_set_is_active (FMDirectoryView *view, gboolean is_active) @@ -11033,11 +11034,11 @@ fm_directory_view_class_init (FMDirectoryViewClass *klass) klass->supports_properties = real_supports_properties; klass->supports_zooming = real_supports_zooming; klass->using_manual_layout = real_using_manual_layout; - klass->merge_menus = real_merge_menus; - klass->unmerge_menus = real_unmerge_menus; - klass->update_menus = real_update_menus; + klass->merge_menus = real_merge_menus; + klass->unmerge_menus = real_unmerge_menus; + klass->update_menus = real_update_menus; #if !GTK_CHECK_VERSION (3, 22, 0) - klass->set_is_active = real_set_is_active; + klass->set_is_active = real_set_is_active; #endif /* Function pointers that subclasses must override */ EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, add_file); @@ -11047,7 +11048,7 @@ fm_directory_view_class_init (FMDirectoryViewClass *klass) EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, clear); EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, file_changed); #if !GTK_CHECK_VERSION (3, 22, 0) - EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, get_background_widget); + EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, get_background_widget); #endif EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, get_selection); EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, get_selection_for_file_transfer); |