summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormonsta <[email protected]>2016-12-29 14:49:39 +0300
committermonsta <[email protected]>2016-12-29 14:49:39 +0300
commit5ba16bf7f86d2a9daff01cc146a57f5201141c65 (patch)
tree1768b9546aa85069a593464c8b6fbefb160eb8ae /src
parent19022217432b8ef3b256df98cf2ccc69d1855595 (diff)
downloadcaja-5ba16bf7f86d2a9daff01cc146a57f5201141c65.tar.bz2
caja-5ba16bf7f86d2a9daff01cc146a57f5201141c65.tar.xz
fix indent and spacing a bit
Diffstat (limited to 'src')
-rw-r--r--src/caja-notebook.c2
-rw-r--r--src/caja-pathbar.c4
-rw-r--r--src/caja-view-as-action.c2
-rw-r--r--src/caja-zoom-control.c6
-rw-r--r--src/file-manager/fm-directory-view.c11
5 files changed, 13 insertions, 12 deletions
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);