diff options
| author | rbuj <[email protected]> | 2021-10-27 17:34:17 +0200 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2021-11-20 16:50:14 +0100 |
| commit | 0a4384ca8c93b62bdf393cd1f3698bab1999fc6f (patch) | |
| tree | 9c68212e8ba254df3dc80cd091b8fd3198a9b643 | |
| parent | bdc5cf66eff8c52cf422cf7b0143ff3489bbb7b0 (diff) | |
| download | caja-0a4384ca8c93b62bdf393cd1f3698bab1999fc6f.tar.bz2 caja-0a4384ca8c93b62bdf393cd1f3698bab1999fc6f.tar.xz | |
Use a blank line at most
176 files changed, 0 insertions, 709 deletions
diff --git a/eel/check-program.c b/eel/check-program.c index b82858c7..1c85f5ac 100644 --- a/eel/check-program.c +++ b/eel/check-program.c @@ -40,7 +40,6 @@ main (int argc, char *argv[]) eel_make_warnings_and_criticals_stop_in_debugger (); - LIBXML_TEST_VERSION gtk_init (&argc, &argv); diff --git a/eel/eel-accessibility.h b/eel/eel-accessibility.h index 1a44ad28..3e84d617 100644 --- a/eel/eel-accessibility.h +++ b/eel/eel-accessibility.h @@ -67,7 +67,6 @@ char* eel_accessibility_text_get_text_after_offset gint eel_accessibility_text_get_character_count (AtkText *text); - #define EEL_TYPE_ACCESSIBLE_TEXT (eel_accessible_text_get_type ()) #define EEL_IS_ACCESSIBLE_TEXT(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEL_TYPE_ACCESSIBLE_TEXT) #define EEL_ACCESSIBLE_TEXT(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), EEL_TYPE_ACCESSIBLE_TEXT, EelAccessibleText) @@ -140,5 +139,4 @@ type_as_function ## _factory_get_type (void) \ object_type, \ type_as_function ## _factory_get_type ()) - #endif /* EEL_ACCESSIBILITY_H */ diff --git a/eel/eel-art-extensions.c b/eel/eel-art-extensions.c index 505d12ca..13bdefb8 100644 --- a/eel/eel-art-extensions.c +++ b/eel/eel-art-extensions.c @@ -153,7 +153,6 @@ eel_irect_get_height (EelIRect rectangle) return rectangle.y1 - rectangle.y0; } - static void eel_drect_copy (EelDRect *dest, const EelDRect *src) @@ -192,7 +191,6 @@ eel_drect_union (EelDRect *dest, } } - /** * eel_irect_contains_point: * @@ -284,7 +282,6 @@ eel_irect_align (EelIRect container, return aligned; } - /** * eel_dimensions_are_empty: * diff --git a/eel/eel-art-extensions.h b/eel/eel-art-extensions.h index 273a035a..e8fb3ab0 100644 --- a/eel/eel-art-extensions.h +++ b/eel/eel-art-extensions.h @@ -103,16 +103,13 @@ extern "C" { float x_alignment, float y_alignment); - void eel_drect_union (EelDRect *dest, const EelDRect *src1, const EelDRect *src2); - /* EelDimensions functions. */ gboolean eel_dimensions_are_empty (EelDimensions dimensions); - #ifdef __cplusplus } #endif diff --git a/eel/eel-background-box.h b/eel/eel-background-box.h index 1a8f3e36..7226b0b4 100644 --- a/eel/eel-background-box.h +++ b/eel/eel-background-box.h @@ -68,4 +68,3 @@ extern "C" { #endif /* EEL_BACKGROUND_TABLE_H */ - diff --git a/eel/eel-background.c b/eel/eel-background.c index adeed503..8b2adffe 100644 --- a/eel/eel-background.c +++ b/eel/eel-background.c @@ -1137,7 +1137,6 @@ eel_background_new (void) return EEL_BACKGROUND (g_object_new (EEL_TYPE_BACKGROUND, NULL)); } - /* * self check code */ diff --git a/eel/eel-background.h b/eel/eel-background.h index 2e0bed44..ecc23cd6 100644 --- a/eel/eel-background.h +++ b/eel/eel-background.h @@ -69,7 +69,6 @@ typedef struct EelBackgroundClass EelBackgroundClass; GType eel_background_get_type (void); EelBackground * eel_background_new (void); - /* Calls to change a background. */ void eel_background_set_use_base (EelBackground *self, gboolean use_base); diff --git a/eel/eel-canvas-rect-ellipse.c b/eel/eel-canvas-rect-ellipse.c index 55196da3..9b2feba4 100644 --- a/eel/eel-canvas-rect-ellipse.c +++ b/eel/eel-canvas-rect-ellipse.c @@ -53,7 +53,6 @@ enum PROP_WIDTH_UNITS }; - static void eel_canvas_re_class_init (EelCanvasREClass *klass); static void eel_canvas_re_init (EelCanvasRE *re); static void eel_canvas_re_set_property (GObject *object, @@ -85,7 +84,6 @@ static void diff_rects (Rect r1, Rect r2, int *count, Rect result[4]); static EelCanvasItemClass *re_parent_class; static EelCanvasREClass *rect_parent_class; - GType eel_canvas_re_get_type (void) { @@ -410,7 +408,6 @@ eel_canvas_re_translate (EelCanvasItem *item, double dx, double dy) re->y2 += dy; } - static void eel_canvas_re_bounds (EelCanvasItem *item, double *x1, double *y1, double *x2, double *y2) { @@ -435,7 +432,6 @@ eel_canvas_re_bounds (EelCanvasItem *item, double *x1, double *y1, double *x2, d /* Rectangle item */ - static void eel_canvas_rect_class_init (EelCanvasRectClass *klass); static void eel_canvas_rect_init (EelCanvasRect *rect); static void eel_canvas_rect_finalize (GObject *object); @@ -695,7 +691,6 @@ request_redraw_borders (EelCanvas *canvas, update_rect->x1, update_rect->y1); } - static void eel_canvas_rect_update (EelCanvasItem *item, double i2w_dx, double i2w_dy, gint flags) { diff --git a/eel/eel-canvas-rect-ellipse.h b/eel/eel-canvas-rect-ellipse.h index d9fbc904..f7a5c0ed 100644 --- a/eel/eel-canvas-rect-ellipse.h +++ b/eel/eel-canvas-rect-ellipse.h @@ -34,14 +34,12 @@ #ifndef EEL_CANVAS_RECT_ELLIPSE_H #define EEL_CANVAS_RECT_ELLIPSE_H - #include "eel-canvas.h" #ifdef __cplusplus extern "C" { #endif - /* Base class for rectangle and ellipse item types. These are defined by their top-left and * bottom-right corners. Rectangles and ellipses share the following arguments: * @@ -65,7 +63,6 @@ extern "C" { * will be scaled when the canvas zoom factor is changed. */ - #define EEL_TYPE_CANVAS_RE (eel_canvas_re_get_type ()) #define EEL_CANVAS_RE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEL_TYPE_CANVAS_RE, EelCanvasRE)) #define EEL_CANVAS_RE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEL_TYPE_CANVAS_RE, EelCanvasREClass)) @@ -73,7 +70,6 @@ extern "C" { #define EEL_IS_CANVAS_RE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEL_TYPE_CANVAS_RE)) #define EEL_CANVAS_RE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEL_TYPE_CANVAS_RE, EelCanvasREClass)) - typedef struct _EelCanvasRE EelCanvasRE; typedef struct _EelCanvasREClass EelCanvasREClass; @@ -101,16 +97,13 @@ extern "C" { EelCanvasItemClass parent_class; }; - /* Standard Gtk function */ GType eel_canvas_re_get_type (void) G_GNUC_CONST; - /* Rectangle item. No configurable or queryable arguments are available (use those in * EelCanvasRE). */ - #define EEL_TYPE_CANVAS_RECT (eel_canvas_rect_get_type ()) #define EEL_CANVAS_RECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEL_TYPE_CANVAS_RECT, EelCanvasRect)) #define EEL_CANVAS_RECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEL_TYPE_CANVAS_RECT, EelCanvasRectClass)) @@ -118,7 +111,6 @@ extern "C" { #define EEL_IS_CANVAS_RECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEL_TYPE_CANVAS_RECT)) #define EEL_CANVAS_RECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEL_TYPE_CANVAS_RECT, EelCanvasRectClass)) - typedef struct _EelCanvasRect EelCanvasRect; typedef struct _EelCanvasRectPrivate EelCanvasRectPrivate; typedef struct _EelCanvasRectClass EelCanvasRectClass; @@ -134,7 +126,6 @@ extern "C" { EelCanvasREClass parent_class; }; - /* Standard Gtk function */ GType eel_canvas_rect_get_type (void) G_GNUC_CONST; diff --git a/eel/eel-canvas.c b/eel/eel-canvas.c index ee70a047..faf1ab69 100644 --- a/eel/eel-canvas.c +++ b/eel/eel-canvas.c @@ -112,7 +112,6 @@ static GObjectClass *item_parent_class; static gpointer accessible_item_parent_class; static gpointer accessible_parent_class; - /** * eel_canvas_item_get_type: * @@ -192,7 +191,6 @@ eel_canvas_item_new (EelCanvasGroup *parent, GType type, const gchar *first_arg_ return item; } - /* Performs post-creation operations on a canvas item (adding it to its parent * group, etc.) */ @@ -292,7 +290,6 @@ eel_canvas_item_construct (EelCanvasItem *item, EelCanvasGroup *parent, item_post_create_setup (item); } - static void redraw_and_repick_if_mapped (EelCanvasItem *item) { @@ -491,7 +488,6 @@ eel_canvas_item_set (EelCanvasItem *item, const gchar *first_arg_name, ...) va_end (args); } - /** * eel_canvas_item_set_valist: * @item: A canvas item. @@ -511,7 +507,6 @@ eel_canvas_item_set_valist (EelCanvasItem *item, const gchar *first_arg_name, va item->canvas->need_repick = TRUE; } - /** * eel_canvas_item_move: * @item: A canvas item. @@ -618,7 +613,6 @@ put_item_after (GList *link, GList *before) return TRUE; } - /** * eel_canvas_item_raise: * @item: A canvas item. @@ -656,7 +650,6 @@ eel_canvas_item_raise (EelCanvasItem *item, int positions) } } - /** * eel_canvas_item_lower: * @item: A canvas item. @@ -694,7 +687,6 @@ eel_canvas_item_lower (EelCanvasItem *item, int positions) } } - /** * eel_canvas_item_raise_to_top: * @item: A canvas item. @@ -722,7 +714,6 @@ eel_canvas_item_raise_to_top (EelCanvasItem *item) } } - /** * eel_canvas_item_lower_to_bottom: * @item: A canvas item. @@ -836,7 +827,6 @@ eel_canvas_item_show (EelCanvasItem *item) } } - /** * eel_canvas_item_hide: * @item: A canvas item. @@ -987,7 +977,6 @@ eel_canvas_item_w2i (EelCanvasItem *item, double *x, double *y) } } - /** * eel_canvas_item_i2w: * @item: A canvas item. @@ -1112,7 +1101,6 @@ eel_canvas_item_grab_focus (EelCanvasItem *item) } } - /** * eel_canvas_item_get_bounds: * @item: A canvas item. @@ -1153,7 +1141,6 @@ eel_canvas_item_get_bounds (EelCanvasItem *item, double *x1, double *y1, double *y2 = ty2; } - /** * eel_canvas_item_request_update * @item: A canvas item. @@ -1202,11 +1189,8 @@ eel_canvas_item_request_redraw (EelCanvasItem *item) item->x2 + 1, item->y2 + 1); } - - /*** EelCanvasGroup ***/ - enum { GROUP_PROP_0, @@ -1214,7 +1198,6 @@ enum GROUP_PROP_Y }; - static void eel_canvas_group_class_init (EelCanvasGroupClass *klass); static void eel_canvas_group_init (EelCanvasGroup *group); static void eel_canvas_group_set_property(GObject *object, @@ -1245,10 +1228,8 @@ static void eel_canvas_group_translate (EelCanvasItem *item, double dx, doub static void eel_canvas_group_bounds (EelCanvasItem *item, double *x1, double *y1, double *x2, double *y2); - static EelCanvasItemClass *group_parent_class; - /** * eel_canvas_group_get_type: * @@ -1276,7 +1257,6 @@ eel_canvas_group_get_type (void) 0, /* n_preallocs */ (GInstanceInitFunc) eel_canvas_group_init - }; group_type = g_type_register_static (eel_canvas_item_get_type (), @@ -1807,10 +1787,8 @@ group_remove (EelCanvasGroup *group, EelCanvasItem *item) } } - /*** EelCanvas ***/ - enum { DRAW_BACKGROUND, @@ -2860,7 +2838,6 @@ eel_canvas_key (GtkWidget *widget, GdkEventKey *event) return GTK_WIDGET_CLASS (canvas_parent_class)->key_press_event (widget, event); } - /* Crossing event handler for the canvas */ static gint eel_canvas_crossing (GtkWidget *widget, GdkEventCrossing *event) @@ -2925,7 +2902,6 @@ eel_cairo_get_clip_region (cairo_t *cr) return cairo_region_create_rectangle (&clip_rect); } - region = cairo_region_create (); for (i = list->num_rectangles - 1; i >= 0; --i) { cairo_rectangle_t *rect = &list->rectangles[i]; @@ -3131,7 +3107,6 @@ eel_canvas_root (EelCanvas *canvas) return EEL_CANVAS_GROUP (canvas->root); } - /** * eel_canvas_set_scroll_region: * @canvas: A canvas. @@ -3191,7 +3166,6 @@ eel_canvas_set_scroll_region (EelCanvas *canvas, double x1, double y1, double x2 } } - /** * eel_canvas_get_scroll_region: * @canvas: A canvas. @@ -3238,7 +3212,6 @@ eel_canvas_set_center_scroll_region (EelCanvas *canvas, gtk_adjustment_get_value (vadjustment)); } - /** * eel_canvas_set_pixels_per_unit: * @canvas: A canvas. @@ -3518,8 +3491,6 @@ eel_canvas_w2c_rect_d (EelCanvas *canvas, x2, y2); } - - /** * eel_canvas_w2c_d: * @canvas: A canvas. @@ -3546,7 +3517,6 @@ eel_canvas_w2c_d (EelCanvas *canvas, double wx, double wy, double *cx, double *c *cy = (wy - canvas->scroll_y1)*zoom + canvas->zoom_yofs; } - /** * eel_canvas_c2w: * @canvas: A canvas. @@ -3572,7 +3542,6 @@ eel_canvas_c2w (EelCanvas *canvas, int cx, int cy, double *wx, double *wy) *wy = (cy - canvas->zoom_yofs)/zoom + canvas->scroll_y1; } - /** * eel_canvas_window_to_world: * @canvas: A canvas. @@ -3602,7 +3571,6 @@ eel_canvas_window_to_world (EelCanvas *canvas, double winx, double winy, / canvas->pixels_per_unit); } - /** * eel_canvas_world_to_window: * @canvas: A canvas. @@ -3724,7 +3692,6 @@ eel_canvas_item_accessible_is_item_in_window (EelCanvasItem *item, return retval; } - static void eel_canvas_item_accessible_get_extents (AtkComponent *component, gint *x, diff --git a/eel/eel-canvas.h b/eel/eel-canvas.h index 8830e741..f9a2c0ed 100644 --- a/eel/eel-canvas.h +++ b/eel/eel-canvas.h @@ -46,11 +46,9 @@ extern "C" { #endif - /* "Small" value used by canvas stuff */ #define EEL_CANVAS_EPSILON 1e-10 - /* Macros for building colors that fit in a 32-bit integer. The values are in * [0, 255]. */ @@ -65,7 +63,6 @@ extern "C" { | (((int) (b) & 0xff) << 8) \ | ((int) (a) & 0xff)) - typedef struct _EelCanvas EelCanvas; typedef struct _EelCanvasClass EelCanvasClass; typedef struct _EelCanvasItem EelCanvasItem; @@ -73,7 +70,6 @@ extern "C" { typedef struct _EelCanvasGroup EelCanvasGroup; typedef struct _EelCanvasGroupClass EelCanvasGroupClass; - /* EelCanvasItem - base item class for canvas items * * All canvas items are derived from EelCanvasItem. The only information a @@ -113,7 +109,6 @@ extern "C" { #define EEL_IS_CANVAS_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEL_TYPE_CANVAS_ITEM)) #define EEL_CANVAS_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEL_TYPE_CANVAS_ITEM, EelCanvasItemClass)) - struct _EelCanvasItem { GInitiallyUnowned object; @@ -187,7 +182,6 @@ extern "C" { gpointer spare_vmethods [4]; }; - /* Standard Gtk function */ GType eel_canvas_item_get_type (void) G_GNUC_CONST; @@ -236,7 +230,6 @@ extern "C" { void eel_canvas_item_send_behind (EelCanvasItem *item, EelCanvasItem *behind_item); - /* Show an item (make it visible). If the item is already shown, it has no * effect. */ @@ -318,7 +311,6 @@ extern "C" { * y double RW Y coordinate of group's origin */ - #define EEL_TYPE_CANVAS_GROUP (eel_canvas_group_get_type ()) #define EEL_CANVAS_GROUP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEL_TYPE_CANVAS_GROUP, EelCanvasGroup)) #define EEL_CANVAS_GROUP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEL_TYPE_CANVAS_GROUP, EelCanvasGroupClass)) @@ -326,7 +318,6 @@ extern "C" { #define EEL_IS_CANVAS_GROUP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEL_TYPE_CANVAS_GROUP)) #define EEL_CANVAS_GROUP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEL_TYPE_CANVAS_GROUP, EelCanvasGroupClass)) - struct _EelCanvasGroup { EelCanvasItem item; @@ -343,14 +334,11 @@ extern "C" { EelCanvasItemClass parent_class; }; - /* Standard Gtk function */ GType eel_canvas_group_get_type (void) G_GNUC_CONST; - /*** EelCanvas ***/ - #define EEL_TYPE_CANVAS (eel_canvas_get_type ()) #define EEL_CANVAS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEL_TYPE_CANVAS, EelCanvas)) #define EEL_CANVAS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEL_TYPE_CANVAS, EelCanvasClass)) @@ -358,7 +346,6 @@ extern "C" { #define EEL_IS_CANVAS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEL_TYPE_CANVAS)) #define EEL_CANVAS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEL_TYPE_CANVAS, EelCanvasClass)) - struct _EelCanvas { GtkLayout layout; @@ -445,7 +432,6 @@ extern "C" { gpointer spare_vmethods [4]; }; - /* Standard Gtk function */ GType eel_canvas_get_type (void) G_GNUC_CONST; diff --git a/eel/eel-editable-label.c b/eel/eel-editable-label.c index 96598a87..e7c9813e 100644 --- a/eel/eel-editable-label.c +++ b/eel/eel-editable-label.c @@ -49,7 +49,6 @@ PANGO_VERSION_MICRO >= (micro))) #endif - enum { MOVE_CURSOR, @@ -235,7 +234,6 @@ eel_editable_label_class_init (EelEditableLabelClass *class) gobject_class->get_property = eel_editable_label_get_property; gobject_class->finalize = eel_editable_label_finalize; - widget_class->get_preferred_width = eel_editable_label_get_preferred_width; widget_class->get_preferred_height = eel_editable_label_get_preferred_height; widget_class->size_allocate = eel_editable_label_size_allocate; @@ -257,7 +255,6 @@ eel_editable_label_class_init (EelEditableLabelClass *class) widget_class->focus_out_event = eel_editable_label_focus_out; gtk_widget_class_set_accessible_type (widget_class, eel_editable_label_accessible_get_type ()); - class->move_cursor = eel_editable_label_move_cursor; class->delete_from_cursor = eel_editable_label_delete_from_cursor; class->copy_clipboard = eel_editable_label_copy_clipboard; @@ -328,7 +325,6 @@ eel_editable_label_class_init (EelEditableLabelClass *class) g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - g_object_class_install_property (gobject_class, PROP_TEXT, g_param_spec_string ("text", @@ -545,7 +541,6 @@ eel_editable_label_editable_init (GtkEditableInterface *iface) iface->get_position = editable_get_position; } - static void eel_editable_label_set_property (GObject *object, guint prop_id, @@ -776,7 +771,6 @@ eel_editable_label_set_draw_outline (EelEditableLabel *label, } - /** * eel_editable_label_set_line_wrap: * @label: a #EelEditableLabel @@ -803,7 +797,6 @@ eel_editable_label_set_line_wrap (EelEditableLabel *label, } } - void eel_editable_label_set_line_wrap_mode (EelEditableLabel *label, PangoWrapMode mode) @@ -819,7 +812,6 @@ eel_editable_label_set_line_wrap_mode (EelEditableLabel *label, } - /** * eel_editable_label_get_line_wrap: * @label: a #EelEditableLabel @@ -1131,7 +1123,6 @@ eel_editable_label_size_request (GtkWidget *widget, gint xpad, ypad; gint margin_start, margin_end, margin_top, margin_bottom; - g_assert (EEL_IS_EDITABLE_LABEL (widget)); g_assert (requisition != NULL); @@ -1461,7 +1452,6 @@ eel_editable_label_get_block_cursor_location (EelEditableLabel *label, return pos->width != 0; } - /* These functions are copies from gtk+, as they are not exported from gtk+ */ static void @@ -1543,7 +1533,6 @@ eel_editable_label_draw_cursor (EelEditableLabel *label, cairo_t *cr, gint xoff } } - static gint eel_editable_label_draw (GtkWidget *widget, cairo_t *cr) @@ -1992,7 +1981,6 @@ eel_editable_label_select_region_index (EelEditableLabel *label, g_assert (EEL_IS_EDITABLE_LABEL (label)); - if (label->selection_anchor == anchor_index && label->selection_end == end_index) return; @@ -2093,7 +2081,6 @@ eel_editable_label_get_selection_bounds (EelEditableLabel *label, g_return_val_if_fail (EEL_IS_EDITABLE_LABEL (label), FALSE); - start_index = MIN (label->selection_anchor, label->selection_end); end_index = MAX (label->selection_anchor, @@ -2126,7 +2113,6 @@ eel_editable_label_get_selection_bounds (EelEditableLabel *label, return start_offset != end_offset; } - /** * eel_editable_label_get_layout: * @label: a #EelEditableLabel @@ -2501,7 +2487,6 @@ get_better_cursor (EelEditableLabel *label, } } - static gint eel_editable_label_move_logically (EelEditableLabel *label, gint start, @@ -2674,7 +2659,6 @@ eel_editable_label_move_forward_word (EelEditableLabel *label, return g_utf8_offset_to_pointer (label->text, new_pos) - label->text; } - static gint eel_editable_label_move_backward_word (EelEditableLabel *label, gint start) @@ -2819,7 +2803,6 @@ eel_editable_label_reset_im_context (EelEditableLabel *label) } } - static void eel_editable_label_delete_from_cursor (EelEditableLabel *label, GtkDeleteType type, @@ -2896,7 +2879,6 @@ eel_editable_label_delete_from_cursor (EelEditableLabel *label, eel_editable_label_pend_cursor_blink (label); } - static void eel_editable_label_copy_clipboard (EelEditableLabel *label) { @@ -3347,7 +3329,6 @@ editable_get_position (GtkEditable *editable) return g_utf8_pointer_to_offset (label->text, label->text + label->selection_anchor); } - static AtkObjectClass *a11y_parent_class = NULL; static const char* eel_editable_label_accessible_data = "eel-editable-label-accessible-data"; @@ -3475,7 +3456,6 @@ eel_editable_label_accessible_get_text_at_offset (AtkText *text, /* State is defunct */ return NULL; - label = EEL_EDITABLE_LABEL (widget); priv = g_object_get_data (G_OBJECT (text), eel_editable_label_accessible_data); return gail_text_util_get_text (priv->textutil, diff --git a/eel/eel-editable-label.h b/eel/eel-editable-label.h index 9350b060..ab5f7d1c 100644 --- a/eel/eel-editable-label.h +++ b/eel/eel-editable-label.h @@ -26,7 +26,6 @@ #ifndef __EEL_EDITABLE_LABEL_H__ #define __EEL_EDITABLE_LABEL_H__ - #include <gdk/gdk.h> #include <gtk/gtk.h> @@ -86,7 +85,6 @@ extern "C" { { GtkWidgetClass parent_class; - void (* move_cursor) (EelEditableLabel *label, GtkMovementStep step, gint count, @@ -139,5 +137,4 @@ extern "C" { } #endif /* __cplusplus */ - #endif /* __EEL_EDITABLE_LABEL_H__ */ diff --git a/eel/eel-gdk-extensions.c b/eel/eel-gdk-extensions.c index 3c4a63db..fc7e3672 100644 --- a/eel/eel-gdk-extensions.c +++ b/eel/eel-gdk-extensions.c @@ -394,7 +394,6 @@ eel_gdk_rgb_to_rgba (guint32 color) return result; } - /** * eel_gdk_rgb_to_color_spec * @color: a gdk_rgb style value. @@ -410,7 +409,6 @@ eel_gdk_rgb_to_color_spec (const guint32 color) return g_strdup_printf ("#%06X", (guint) (color & 0xFFFFFF)); } - /** * eel_gdk_rgba_is_dark: * diff --git a/eel/eel-gdk-extensions.h b/eel/eel-gdk-extensions.h index ae7b62ae..bfaa835d 100644 --- a/eel/eel-gdk-extensions.h +++ b/eel/eel-gdk-extensions.h @@ -94,7 +94,6 @@ char * eel_gradient_set_right_color_spec (const char char * eel_gradient_set_bottom_color_spec (const char *gradient_spec, const char *bottom_color); - /* A version of parse_color that substitutes a default color instead of returning a boolean to indicate it cannot be parsed. */ @@ -111,7 +110,6 @@ char * eel_gdk_rgb_to_color_spec (guint32 gboolean eel_gdk_rgba_is_dark (const GdkRGBA *color); - /* Wrapper for XParseGeometry */ EelGdkGeometryFlags eel_gdk_parse_geometry (const char *string, int *x_return, diff --git a/eel/eel-gdk-pixbuf-extensions.c b/eel/eel-gdk-pixbuf-extensions.c index d645c8ed..5bde8cbb 100644 --- a/eel/eel-gdk-pixbuf-extensions.c +++ b/eel/eel-gdk-pixbuf-extensions.c @@ -107,7 +107,6 @@ eel_gdk_pixbuf_load_from_stream_at_size (GInputStream *stream, GdkPixbuf *pixbuf; gboolean got_eos; - g_return_val_if_fail (stream != NULL, NULL); got_eos = FALSE; diff --git a/eel/eel-gdk-pixbuf-extensions.h b/eel/eel-gdk-pixbuf-extensions.h index f874498e..2fb574ab 100644 --- a/eel/eel-gdk-pixbuf-extensions.h +++ b/eel/eel-gdk-pixbuf-extensions.h @@ -36,7 +36,6 @@ GdkPixbuf * eel_gdk_pixbuf_load_from_stream (GInputStream GdkPixbuf * eel_gdk_pixbuf_load_from_stream_at_size (GInputStream *stream, int size); - GdkPixbuf * eel_gdk_pixbuf_scale_down_to_fit (GdkPixbuf *pixbuf, int max_width, int max_height); @@ -59,14 +58,12 @@ double eel_gdk_scale_to_min_factor (int int *scaled_width, int *scaled_height); - /* Save a pixbuf to a png file. Return value indicates succss/TRUE or failure/FALSE */ gboolean eel_gdk_pixbuf_save_to_file (const GdkPixbuf *pixbuf, const char *file_name); void eel_gdk_pixbuf_ref_if_not_null (GdkPixbuf *pixbuf_or_null); void eel_gdk_pixbuf_unref_if_not_null (GdkPixbuf *pixbuf_or_null); - /* Scales large pixbufs down fast */ GdkPixbuf * eel_gdk_pixbuf_scale_down (GdkPixbuf *pixbuf, int dest_width, diff --git a/eel/eel-glib-extensions.c b/eel/eel-glib-extensions.c index 772a2cfe..7af722f3 100644 --- a/eel/eel-glib-extensions.c +++ b/eel/eel-glib-extensions.c @@ -260,7 +260,6 @@ eel_g_lists_sort_and_check_for_intersection (GList **list_1, return FALSE; } - /** * eel_g_list_partition * diff --git a/eel/eel-graphic-effects.c b/eel/eel-graphic-effects.c index 1a7bc659..59a51aa7 100644 --- a/eel/eel-graphic-effects.c +++ b/eel/eel-graphic-effects.c @@ -342,7 +342,6 @@ eel_stretch_frame_image (GdkPixbuf *frame_image, int left_offset, int top_offset return result_pixbuf; } - /* draw an arbitrary frame around an image, with the result passed back in a newly allocated pixbuf */ GdkPixbuf * eel_embed_image_in_frame (GdkPixbuf *source_image, GdkPixbuf *frame_image, int left_offset, int top_offset, int right_offset, int bottom_offset) diff --git a/eel/eel-graphic-effects.h b/eel/eel-graphic-effects.h index d71fffcb..841f2e17 100644 --- a/eel/eel-graphic-effects.h +++ b/eel/eel-graphic-effects.h @@ -29,7 +29,6 @@ #include <gtk/gtk.h> #include <gdk/gdk.h> - /* return a lightened pixbuf for pre-lighting */ GdkPixbuf *eel_create_spotlight_pixbuf (GdkPixbuf *source_pixbuf); /* return a lightened surface for pre-lighting */ diff --git a/eel/eel-gtk-extensions.c b/eel/eel-gtk-extensions.c index 350ed596..b2a47d95 100644 --- a/eel/eel-gtk-extensions.c +++ b/eel/eel-gtk-extensions.c @@ -50,7 +50,6 @@ #define MINIMUM_ON_SCREEN_WIDTH 100 #define MINIMUM_ON_SCREEN_HEIGHT 100 - /** * eel_gtk_window_get_geometry_string: * @window: a #GtkWindow diff --git a/eel/eel-gtk-extensions.h b/eel/eel-gtk-extensions.h index 8d9cf790..845c62d3 100644 --- a/eel/eel-gtk-extensions.h +++ b/eel/eel-gtk-extensions.h @@ -45,7 +45,6 @@ void eel_gtk_window_set_initial_geometry_from_string (GtkWindow gboolean ignore_position); char * eel_gtk_window_get_geometry_string (GtkWindow *window); - /* GtkMenu and GtkMenuItem */ void eel_pop_up_context_menu (GtkMenu *menu, GdkEventButton *event); diff --git a/eel/eel-image-table.c b/eel/eel-image-table.c index 03de077b..f4bbeaca 100644 --- a/eel/eel-image-table.c +++ b/eel/eel-image-table.c @@ -123,7 +123,6 @@ eel_image_table_realize (GtkWidget *widget) | GDK_LEAVE_NOTIFY_MASK | GDK_POINTER_MOTION_MASK); - signal_connect_while_realized (windowed_ancestor, "enter_notify_event", G_CALLBACK (ancestor_enter_notify_event), diff --git a/eel/eel-labeled-image.c b/eel/eel-labeled-image.c index 66880c42..838da9cb 100644 --- a/eel/eel-labeled-image.c +++ b/eel/eel-labeled-image.c @@ -535,7 +535,6 @@ eel_labeled_image_class_init (EelLabeledImageClass *labeled_image_class) widget_class->destroy = eel_labeled_image_destroy; - /* GtkWidgetClass */ widget_class->size_allocate = eel_labeled_image_size_allocate; widget_class->get_preferred_width = eel_labeled_image_get_preferred_width; @@ -547,7 +546,6 @@ eel_labeled_image_class_init (EelLabeledImageClass *labeled_image_class) gtk_widget_class_set_accessible_type (widget_class, eel_labeled_image_accessible_get_type ()); - /* GtkContainerClass */ container_class->add = eel_labeled_image_add; container_class->remove = eel_labeled_image_remove; @@ -576,7 +574,6 @@ eel_labeled_image_class_init (EelLabeledImageClass *labeled_image_class) GDK_KEY_space, 0, "activate", 0); - /* Properties */ g_object_class_install_property ( gobject_class, @@ -590,7 +587,6 @@ eel_labeled_image_class_init (EelLabeledImageClass *labeled_image_class) g_param_spec_string ("label", NULL, NULL, "", G_PARAM_READWRITE)); - g_object_class_install_property ( gobject_class, PROP_LABEL_POSITION, @@ -611,7 +607,6 @@ eel_labeled_image_class_init (EelLabeledImageClass *labeled_image_class) g_param_spec_boolean ("show_image", NULL, NULL, TRUE, G_PARAM_READWRITE)); - g_object_class_install_property ( gobject_class, PROP_SPACING, @@ -1488,7 +1483,6 @@ eel_labeled_image_get_show_image (const EelLabeledImage *labeled_image) return labeled_image->details->show_image; } - /** * eel_labeled_image_set_fixed_image_height: * @labeled_image: A EelLabeledImage. @@ -2376,7 +2370,6 @@ eel_labeled_image_toggle_button_get_type (void) return type; } - static GType eel_labeled_image_radio_button_get_type (void) { diff --git a/eel/eel-labeled-image.h b/eel/eel-labeled-image.h index 50295c9a..469c7db0 100644 --- a/eel/eel-labeled-image.h +++ b/eel/eel-labeled-image.h @@ -163,4 +163,3 @@ extern "C" { #endif /* EEL_LABELED_IMAGE_H */ - diff --git a/eel/eel-mate-extensions.c b/eel/eel-mate-extensions.c index a142a263..332ac1b9 100644 --- a/eel/eel-mate-extensions.c +++ b/eel/eel-mate-extensions.c @@ -33,7 +33,6 @@ #include <gtk/gtk.h> #include <libmate-desktop/mate-desktop-utils.h> - /* Return a command string containing the path to a terminal on this system. */ static char * diff --git a/eel/eel-stock-dialogs.c b/eel/eel-stock-dialogs.c index 15d0d7dc..d4a2814e 100644 --- a/eel/eel-stock-dialogs.c +++ b/eel/eel-stock-dialogs.c @@ -564,7 +564,6 @@ eel_show_info_dialog_with_details (const char *primary_text, } - GtkDialog * eel_show_warning_dialog (const char *primary_text, const char *secondary_text, @@ -575,7 +574,6 @@ eel_show_warning_dialog (const char *primary_text, GTK_MESSAGE_WARNING, parent); } - GtkDialog * eel_show_error_dialog (const char *primary_text, const char *secondary_text, diff --git a/eel/eel-string.c b/eel/eel-string.c index f366e586..de852962 100644 --- a/eel/eel-string.c +++ b/eel/eel-string.c @@ -365,7 +365,6 @@ enum typedef int ArgType; /* An int, because custom are < 0 */ - static const char * get_position (const char *format, int *i) { @@ -407,7 +406,6 @@ is_length_modifier (char c) return strchr ("hlLjzt", c) != NULL; } - static ArgType get_arg_type_from_format (EelPrintfHandler *custom_handlers, const char *format, diff --git a/eel/eel-string.h b/eel/eel-string.h index 27c829e8..4a1fe381 100644 --- a/eel/eel-string.h +++ b/eel/eel-string.h @@ -35,7 +35,6 @@ * abbreviation to mean a case-insensitive char *. */ - /* NULL is allowed for all the str parameters to these functions. */ /* Versions of basic string functions that allow NULL, and handle @@ -69,7 +68,6 @@ char * eel_str_capitalize (const char *str); char * eel_str_middle_truncate (const char *str, guint truncate_length); - /* Remove all characters after the passed-in substring. */ char * eel_str_strip_substring_and_after (const char *str, const char *substring); diff --git a/eel/eel-vfs-extensions.h b/eel/eel-vfs-extensions.h index e564ca15..0a5c58c0 100644 --- a/eel/eel-vfs-extensions.h +++ b/eel/eel-vfs-extensions.h @@ -45,7 +45,6 @@ extern "C" { gboolean eel_uri_is_desktop(const char* uri); gboolean eel_uri_is_search(const char* uri); - char* eel_make_valid_utf8(const char* name); char* eel_filename_strip_extension(const char* filename); diff --git a/eel/eel-wrap-table.c b/eel/eel-wrap-table.c index bb06f0ad..145f8b80 100644 --- a/eel/eel-wrap-table.c +++ b/eel/eel-wrap-table.c @@ -69,7 +69,6 @@ static gboolean wrap_table_child_focus_in (GtkWidget *w gpointer data); static void wrap_table_layout (EelWrapTable *wrap_table); - G_DEFINE_TYPE_WITH_PRIVATE (EelWrapTable, eel_wrap_table, GTK_TYPE_CONTAINER) static void @@ -879,7 +878,6 @@ eel_wrap_table_get_y_spacing (const EelWrapTable *wrap_table) return wrap_table->details->y_spacing; } - /** * eel_wrap_table_find_child_at_event_point: * @wrap_table: A EelWrapTable. diff --git a/eel/eel-wrap-table.h b/eel/eel-wrap-table.h index 75c1b644..964a829a 100644 --- a/eel/eel-wrap-table.h +++ b/eel/eel-wrap-table.h @@ -105,4 +105,3 @@ extern "C" { #endif /* EEL_WRAP_TABLE_H */ - diff --git a/libcaja-extension/caja-configurable.c b/libcaja-extension/caja-configurable.c index ca5c11a8..6405376e 100644 --- a/libcaja-extension/caja-configurable.c +++ b/libcaja-extension/caja-configurable.c @@ -85,4 +85,3 @@ caja_configurable_run_config (CajaConfigurable *provider) } } - diff --git a/libcaja-extension/caja-file-info.h b/libcaja-extension/caja-file-info.h index 24892d73..a82c7979 100644 --- a/libcaja-extension/caja-file-info.h +++ b/libcaja-extension/caja-file-info.h @@ -155,7 +155,6 @@ gboolean caja_file_info_is_mime_type (CajaFileInfo *file, gboolean caja_file_info_is_directory (CajaFileInfo *file); gboolean caja_file_info_can_write (CajaFileInfo *file); - /* Modifying the CajaFileInfo */ void caja_file_info_add_emblem (CajaFileInfo *file, const char *emblem_name); diff --git a/libcaja-extension/caja-info-provider.h b/libcaja-extension/caja-info-provider.h index 4377687f..f316f696 100644 --- a/libcaja-extension/caja-info-provider.h +++ b/libcaja-extension/caja-info-provider.h @@ -80,8 +80,6 @@ CajaOperationResult caja_info_provider_update_file_info (CajaInfoProvider void caja_info_provider_cancel_update (CajaInfoProvider *provider, CajaOperationHandle *handle); - - /* Helper functions for implementations */ void caja_info_provider_update_complete_invoke (GClosure *update_complete, CajaInfoProvider *provider, diff --git a/libcaja-extension/caja-menu.c b/libcaja-extension/caja-menu.c index 87e2f1a5..c5c6c30a 100644 --- a/libcaja-extension/caja-menu.c +++ b/libcaja-extension/caja-menu.c @@ -41,7 +41,6 @@ * #CajaMenuItem objects, using caja_menu_item_set_submenu(). */ - struct _CajaMenuPrivate { GList *item_list; }; diff --git a/libcaja-extension/caja-property-page-provider.c b/libcaja-extension/caja-property-page-provider.c index 8556eeea..64f9bfb2 100644 --- a/libcaja-extension/caja-property-page-provider.c +++ b/libcaja-extension/caja-property-page-provider.c @@ -94,4 +94,3 @@ caja_property_page_provider_get_pages (CajaPropertyPageProvider *provider, (provider, files); } - diff --git a/libcaja-private/caja-autorun.c b/libcaja-private/caja-autorun.c index 17b9d9fc..2f79b16b 100644 --- a/libcaja-private/caja-autorun.c +++ b/libcaja-private/caja-autorun.c @@ -147,7 +147,6 @@ add_elem_to_str_array (char **v, const char *s) return r; } - void caja_autorun_set_preferences (const char *x_content_type, gboolean pref_start_app, @@ -801,7 +800,6 @@ typedef struct gpointer user_data; } AutorunDialogData; - void caja_autorun_launch_for_mount (GMount *mount, GAppInfo *app_info) { @@ -916,7 +914,6 @@ autorun_combo_changed (gboolean selected_ask, data->selected_open_folder = selected_open_folder; } - static void autorun_always_toggled (GtkToggleButton *togglebutton, AutorunDialogData *data) { @@ -1041,7 +1038,6 @@ show_dialog: label = gtk_label_new (NULL); - /* Customize greeting for well-known x-content types */ if (strcmp (x_content_type, "x-content/audio-cdda") == 0) { @@ -1358,7 +1354,6 @@ caja_autorun_get_x_content_types_for_mount_async (GMount *mount, data); } - char ** caja_autorun_get_cached_x_content_types_for_mount (GMount *mount) { diff --git a/libcaja-private/caja-bookmark.c b/libcaja-private/caja-bookmark.c index 7fb0b485..587e8cc9 100644 --- a/libcaja-private/caja-bookmark.c +++ b/libcaja-private/caja-bookmark.c @@ -203,7 +203,6 @@ caja_bookmark_get_name (CajaBookmark *bookmark) return g_strdup (bookmark->details->name); } - gboolean caja_bookmark_get_has_custom_name (CajaBookmark *bookmark) { @@ -283,7 +282,6 @@ caja_bookmark_get_uri (CajaBookmark *bookmark) return uri; } - /** * caja_bookmark_set_name: * diff --git a/libcaja-private/caja-bookmark.h b/libcaja-private/caja-bookmark.h index e8c09149..e1913bf5 100644 --- a/libcaja-private/caja-bookmark.h +++ b/libcaja-private/caja-bookmark.h @@ -91,7 +91,6 @@ void caja_bookmark_set_scroll_pos (CajaBookmark *b const char *uri); char * caja_bookmark_get_scroll_pos (CajaBookmark *bookmark); - /* Helper functions for displaying bookmarks */ cairo_surface_t * caja_bookmark_get_surface (CajaBookmark *bookmark, GtkIconSize icon_size); diff --git a/libcaja-private/caja-cell-renderer-text-ellipsized.h b/libcaja-private/caja-cell-renderer-text-ellipsized.h index 28e2bc9a..8997b831 100644 --- a/libcaja-private/caja-cell-renderer-text-ellipsized.h +++ b/libcaja-private/caja-cell-renderer-text-ellipsized.h @@ -41,7 +41,6 @@ #define CAJA_CELL_RENDERER_TEXT_ELLIPSIZED_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS ((obj), CAJA_TYPE_CELL_RENDERER_TEXT_ELLIPSIZED, CajaCellRendererTextEllipsizedClass)) - typedef struct _CajaCellRendererTextEllipsized CajaCellRendererTextEllipsized; typedef struct _CajaCellRendererTextEllipsizedClass CajaCellRendererTextEllipsizedClass; diff --git a/libcaja-private/caja-clipboard-monitor.h b/libcaja-private/caja-clipboard-monitor.h index b378a778..8c3d406c 100644 --- a/libcaja-private/caja-clipboard-monitor.h +++ b/libcaja-private/caja-clipboard-monitor.h @@ -79,7 +79,5 @@ void caja_get_clipboard_callback (GtkClipboard *clipboard, guint info, gpointer user_data); - - #endif /* CAJA_CLIPBOARD_MONITOR_H */ diff --git a/libcaja-private/caja-clipboard.c b/libcaja-private/caja-clipboard.c index 1821d6ad..307072bf 100644 --- a/libcaja-private/caja-clipboard.c +++ b/libcaja-private/caja-clipboard.c @@ -160,7 +160,6 @@ received_clipboard_contents (GtkClipboard *clipboard, g_object_unref (action_group); } - static void set_paste_sensitive_if_clipboard_contains_data (GtkActionGroup *action_group) { diff --git a/libcaja-private/caja-column-chooser.c b/libcaja-private/caja-column-chooser.c index 0c50f2d0..a14e1cc5 100644 --- a/libcaja-private/caja-column-chooser.c +++ b/libcaja-private/caja-column-chooser.c @@ -566,7 +566,6 @@ get_column_iter (CajaColumnChooser *chooser, { char *name; - gtk_tree_model_get (GTK_TREE_MODEL (chooser->details->store), iter, COLUMN_NAME, &name, diff --git a/libcaja-private/caja-column-utilities.h b/libcaja-private/caja-column-utilities.h index b78c80b8..09cf9475 100644 --- a/libcaja-private/caja-column-utilities.h +++ b/libcaja-private/caja-column-utilities.h @@ -38,5 +38,4 @@ void caja_column_list_free (GList *columns); GList *caja_sort_columns (GList *columns, char **column_order); - #endif /* CAJA_COLUMN_UTILITIES_H */ diff --git a/libcaja-private/caja-customization-data.c b/libcaja-private/caja-customization-data.c index 0a0d540c..8ed9566f 100644 --- a/libcaja-private/caja-customization-data.c +++ b/libcaja-private/caja-customization-data.c @@ -70,7 +70,6 @@ struct CajaCustomizationData guint reading_mode : 2; /* enough bits for CustomizationReadingMode */ }; - /* The Property here should be one of "emblems", "colors" or "patterns" */ static char * get_global_customization_path (const char *customization_name); static char * get_private_customization_path (const char *customization_name); @@ -79,7 +78,6 @@ static char * get_file_path_for_mode (const CajaCustomiz static char* format_name_for_display (CajaCustomizationData *data, const char *name); static void load_name_map_hash_table (CajaCustomizationData *data); - static gboolean read_all_children (char *filename, const char *attributes, @@ -116,7 +114,6 @@ read_all_children (char *filename, return TRUE; } - CajaCustomizationData* caja_customization_data_new (const char *customization_name, gboolean show_public_customizations, @@ -231,7 +228,6 @@ caja_customization_data_get_next_element_for_display (CajaCustomizationData *dat } } - current_file_info = data->current_file_list->data; data->current_file_list = data->current_file_list->next; @@ -321,7 +317,6 @@ caja_customization_data_destroy (CajaCustomizationData *data) g_free (data); } - /* get_global_customization_directory Get the path where a property's pixmaps are stored @customization_name : the name of the customization to get. @@ -337,7 +332,6 @@ get_global_customization_path (const char *customization_name) NULL); } - /* get_private_customization_directory Get the path where a customization's pixmaps are stored @customization_name : the name of the customization to get. @@ -360,7 +354,6 @@ get_private_customization_path (const char *customization_name) return directory_path; } - static char * get_file_path_for_mode (const CajaCustomizationData *data, const char *file_name) @@ -381,7 +374,6 @@ get_file_path_for_mode (const CajaCustomizationData *data, return file; } - /* utility to make an attractive pattern image by compositing with a frame */ GdkPixbuf* caja_customization_make_pattern_chit (GdkPixbuf *pattern_tile, GdkPixbuf *frame, gboolean dragging, gboolean is_reset) @@ -421,7 +413,6 @@ caja_customization_make_pattern_chit (GdkPixbuf *pattern_tile, GdkPixbuf *frame, return pixbuf; } - /* utility to format the passed-in name for display by stripping the extension, mapping underscore and capitalizing as necessary */ diff --git a/libcaja-private/caja-customization-data.h b/libcaja-private/caja-customization-data.h index b2294b8d..5c56e04f 100644 --- a/libcaja-private/caja-customization-data.h +++ b/libcaja-private/caja-customization-data.h @@ -25,8 +25,6 @@ /* caja-customization-data.h - functions to collect and load property names and imges */ - - #ifndef CAJA_CUSTOMIZATION_DATA_H #define CAJA_CUSTOMIZATION_DATA_H @@ -37,8 +35,6 @@ typedef struct CajaCustomizationData CajaCustomizationData; - - CajaCustomizationData* caja_customization_data_new (const char *customization_name, gboolean show_public_customizations, int maximum_icon_height, @@ -58,8 +54,6 @@ gboolean caja_customization_data_private_data_was_displayed void caja_customization_data_destroy (CajaCustomizationData *data); - - GdkPixbuf* caja_customization_make_pattern_chit (GdkPixbuf *pattern_tile, GdkPixbuf *frame, gboolean dragging, diff --git a/libcaja-private/caja-desktop-directory-file.c b/libcaja-private/caja-desktop-directory-file.c index 2c9faba8..ff84cfc7 100644 --- a/libcaja-private/caja-desktop-directory-file.c +++ b/libcaja-private/caja-desktop-directory-file.c @@ -73,7 +73,6 @@ typedef struct CajaFileAttributes non_delegated_attributes; } DesktopMonitor; - static void caja_desktop_directory_file_init (gpointer object, gpointer klass); static void caja_desktop_directory_file_class_init (gpointer klass); @@ -105,7 +104,6 @@ desktop_callback_equal (gconstpointer desktop_callback_as_pointer, && desktop_callback->callback_data == desktop_callback_2->callback_data; } - static void real_file_changed_callback (CajaFile *real_file, gpointer callback_data) @@ -458,7 +456,6 @@ desktop_directory_file_get_where_string (CajaFile *file) return g_strdup (_("on the desktop")); } - static void monitor_destroy (gpointer data) { @@ -515,7 +512,6 @@ caja_desktop_directory_file_init (gpointer object, gpointer klass) G_CALLBACK (real_file_changed_callback), desktop_file, 0); } - static void desktop_callback_remove_file_cover (gpointer key, gpointer value, @@ -525,7 +521,6 @@ desktop_callback_remove_file_cover (gpointer key, (value, CAJA_FILE (callback_data)); } - static void desktop_finalize (GObject *object) { diff --git a/libcaja-private/caja-desktop-directory.c b/libcaja-private/caja-desktop-directory.c index 1c602e80..ad58c751 100644 --- a/libcaja-private/caja-desktop-directory.c +++ b/libcaja-private/caja-desktop-directory.c @@ -57,7 +57,6 @@ typedef struct GList *merged_file_list; } MergedCallback; - typedef struct { CajaDesktopDirectory *desktop_dir; @@ -211,7 +210,6 @@ desktop_call_when_ready (CajaDirectory *directory, merged_callback->non_ready_directories = g_list_prepend (merged_callback->non_ready_directories, desktop->details->real_directory); - merged_callback->merged_file_list = g_list_concat (NULL, caja_file_list_copy (directory->details->file_list)); @@ -342,7 +340,6 @@ desktop_monitor_add (CajaDirectory *directory, merged_callback_list = g_list_concat (merged_callback_list, caja_file_list_copy (directory->details->file_list)); - if (callback != NULL) { (* callback) (directory, merged_callback_list, callback_data); @@ -430,7 +427,6 @@ caja_desktop_directory_get_real_directory (CajaDesktopDirectory *desktop) return desktop->details->real_directory; } - static void desktop_finalize (GObject *object) { @@ -458,7 +454,6 @@ done_loading_callback (CajaDirectory *real_directory, caja_directory_emit_done_loading (CAJA_DIRECTORY (desktop)); } - static void forward_files_added_cover (CajaDirectory *real_directory, GList *files, diff --git a/libcaja-private/caja-desktop-icon-file.c b/libcaja-private/caja-desktop-icon-file.c index 082fdca3..065e4e8e 100644 --- a/libcaja-private/caja-desktop-icon-file.c +++ b/libcaja-private/caja-desktop-icon-file.c @@ -48,7 +48,6 @@ struct _CajaDesktopIconFilePrivate G_DEFINE_TYPE_WITH_PRIVATE (CajaDesktopIconFile, caja_desktop_icon_file, CAJA_TYPE_FILE) - static void desktop_icon_file_monitor_add (CajaFile *file, gconstpointer client, diff --git a/libcaja-private/caja-desktop-link-monitor.c b/libcaja-private/caja-desktop-link-monitor.c index 0d5da061..dde3471e 100644 --- a/libcaja-private/caja-desktop-link-monitor.c +++ b/libcaja-private/caja-desktop-link-monitor.c @@ -59,7 +59,6 @@ struct CajaDesktopLinkMonitorDetails GList *mount_links; }; - static void caja_desktop_link_monitor_init (gpointer object, gpointer klass); static void caja_desktop_link_monitor_class_init (gpointer klass); @@ -201,8 +200,6 @@ remove_mount_link (CajaDesktopLinkMonitor *monitor, } } - - static void mount_added_callback (GVolumeMonitor *volume_monitor, GMount *mount, @@ -211,7 +208,6 @@ mount_added_callback (GVolumeMonitor *volume_monitor, create_mount_link (monitor, mount); } - static void mount_removed_callback (GVolumeMonitor *volume_monitor, GMount *mount, diff --git a/libcaja-private/caja-desktop-link.c b/libcaja-private/caja-desktop-link.c index 7b001884..eb436556 100644 --- a/libcaja-private/caja-desktop-link.c +++ b/libcaja-private/caja-desktop-link.c @@ -390,7 +390,6 @@ caja_desktop_link_get_activation_uri (CajaDesktopLink *link) return NULL; } - gboolean caja_desktop_link_get_date (CajaDesktopLink *link, CajaDateType date_type, diff --git a/libcaja-private/caja-desktop-link.h b/libcaja-private/caja-desktop-link.h index a35cda19..56777b99 100644 --- a/libcaja-private/caja-desktop-link.h +++ b/libcaja-private/caja-desktop-link.h @@ -81,5 +81,4 @@ gboolean caja_desktop_link_can_rename (CajaDesktopLi gboolean caja_desktop_link_rename (CajaDesktopLink *link, const char *name); - #endif /* CAJA_DESKTOP_LINK_H */ diff --git a/libcaja-private/caja-directory-async.c b/libcaja-private/caja-directory-async.c index 8a9c021c..b1fc572b 100644 --- a/libcaja-private/caja-directory-async.c +++ b/libcaja-private/caja-directory-async.c @@ -151,8 +151,6 @@ struct DeepCountState char *fs_id; }; - - typedef struct { CajaFile *file; /* Which file, NULL means all. */ @@ -838,7 +836,6 @@ caja_directory_monitor_add_internal (CajaDirectory *directory, directory->details->monitor = caja_monitor_directory (directory->details->location); } - if (REQUEST_WANTS_TYPE (monitor->request, REQUEST_FILE_INFO) && directory->details->mime_db_monitor == 0) { @@ -2116,7 +2113,6 @@ caja_directory_has_active_request_for_file (CajaDirectory *directory, return FALSE; } - /* This checks if there's a request for monitoring the file list. */ gboolean caja_directory_is_anyone_monitoring_file_list (CajaDirectory *directory) @@ -2278,7 +2274,6 @@ enumerate_children_callback (GObject *source_object, } } - /* Start monitoring the file list if it isn't already. */ static void start_monitoring_file_list (CajaDirectory *directory) @@ -2371,7 +2366,6 @@ caja_file_invalidate_count_and_mime_list (CajaFile *file) caja_file_invalidate_attributes (file, attributes); } - /* Reset count and mime list. Invalidating deep counts is handled by * itself elsewhere because it's a relatively heavyweight and * special-purpose operation (see bug 5863). Also, the shallow count @@ -3045,7 +3039,6 @@ deep_count_callback (GObject *source_object, } } - static void deep_count_load (DeepCountState *state, GFile *location) { @@ -3222,7 +3215,6 @@ mime_list_state_free (MimeListState *state) g_free (state); } - static void mime_list_done (MimeListState *state, gboolean success) { @@ -3432,7 +3424,6 @@ mime_list_start (CajaDirectory *directory, return; } - state = g_new0 (MimeListState, 1); state->mime_list_file = file; state->directory = caja_directory_ref (directory); @@ -4291,7 +4282,6 @@ get_pixbuf_for_content (goffset file_len, return pixbuf; } - static void thumbnail_read_callback (GObject *source_object, GAsyncResult *res, @@ -4828,7 +4818,6 @@ finish_info_provider (CajaDirectory *directory, } } - static gboolean info_provider_idle_callback (gpointer user_data) { @@ -5177,7 +5166,6 @@ cancel_link_info_for_file (CajaDirectory *directory, } } - static void cancel_loading_attributes (CajaDirectory *directory, CajaFileAttributes file_attributes) @@ -5294,7 +5282,6 @@ caja_directory_add_file_to_work_queue (CajaDirectory *directory, file); } - static void add_all_files_to_work_queue (CajaDirectory *directory) { @@ -5322,7 +5309,6 @@ caja_directory_remove_file_from_work_queue (CajaDirectory *directory, file); } - static void move_file_to_low_priority_queue (CajaDirectory *directory, CajaFile *file) diff --git a/libcaja-private/caja-directory.c b/libcaja-private/caja-directory.c index 1bb1518b..d3f75ff3 100644 --- a/libcaja-private/caja-directory.c +++ b/libcaja-private/caja-directory.c @@ -320,7 +320,6 @@ caja_directory_get_existing (GFile *location) return caja_directory_get_internal (location, FALSE); } - CajaDirectory * caja_directory_get_by_uri (const char *uri) { @@ -885,7 +884,6 @@ caja_directory_notify_files_added (GList *files) * we must invalidate it's item count. */ - file = NULL; parent = g_file_get_parent (location); if (parent) @@ -1554,7 +1552,6 @@ caja_directory_match_pattern (CajaDirectory *directory, const char *pattern) GList *files, *l, *ret; GPatternSpec *spec; - ret = NULL; spec = g_pattern_spec_new (pattern); diff --git a/libcaja-private/caja-directory.h b/libcaja-private/caja-directory.h index b375e015..6d08b14f 100644 --- a/libcaja-private/caja-directory.h +++ b/libcaja-private/caja-directory.h @@ -188,7 +188,6 @@ void caja_directory_cancel_callback (CajaDirectory CajaDirectoryCallback callback, gpointer callback_data); - /* Monitor the files in a directory. */ void caja_directory_file_monitor_add (CajaDirectory *directory, gconstpointer client, @@ -206,7 +205,6 @@ GList * caja_directory_get_file_list (CajaDirectory GList * caja_directory_match_pattern (CajaDirectory *directory, const char *glob); - /* Return true if the directory has information about all the files. * This will be false until the directory has been read at least once. */ diff --git a/libcaja-private/caja-dnd.c b/libcaja-private/caja-dnd.c index 9da1a382..65918b08 100644 --- a/libcaja-private/caja-dnd.c +++ b/libcaja-private/caja-dnd.c @@ -92,7 +92,6 @@ caja_drag_finalize (CajaDragInfo *drag_info) g_free (drag_info); } - /* Functions to deal with CajaDragSelectionItems. */ CajaDragSelectionItem * @@ -929,7 +928,6 @@ caja_drag_autoscroll_in_scroll_region (GtkWidget *widget) return x_scroll_delta != 0 || y_scroll_delta != 0; } - void caja_drag_autoscroll_calculate_delta (GtkWidget *widget, float *x_scroll_delta, float *y_scroll_delta) { @@ -1017,8 +1015,6 @@ caja_drag_autoscroll_calculate_delta (GtkWidget *widget, float *x_scroll_delta, } - - void caja_drag_autoscroll_start (CajaDragInfo *drag_info, GtkWidget *widget, @@ -1240,7 +1236,6 @@ slot_proxy_drag_drop (GtkWidget *widget, return TRUE; } - static void slot_proxy_handle_drop (GtkWidget *widget, GdkDragContext *context, @@ -1318,7 +1313,6 @@ slot_proxy_handle_drop (GtkWidget *widget, gdk_drag_context_get_selected_action (context)); } - gtk_drag_finish (context, TRUE, FALSE, time); } else @@ -1429,4 +1423,3 @@ caja_drag_slot_proxy_init (GtkWidget *widget, drag_info); } - diff --git a/libcaja-private/caja-emblem-utils.c b/libcaja-private/caja-emblem-utils.c index 2f4aa054..e14afc46 100644 --- a/libcaja-private/caja-emblem-utils.c +++ b/libcaja-private/caja-emblem-utils.c @@ -76,7 +76,6 @@ caja_emblem_get_icon_name_from_keyword (const char *keyword) return g_strconcat ("emblem-", keyword, NULL); } - /* check for reserved keywords */ static gboolean is_reserved_keyword (const char *keyword) @@ -464,7 +463,6 @@ caja_emblem_rename_emblem (const char *keyword, const char *name) return FALSE; } - /* write the new icon description */ fprintf (file, "\n[Icon Data]\n\nDisplayName=%s\n", name); fflush (file); diff --git a/libcaja-private/caja-emblem-utils.h b/libcaja-private/caja-emblem-utils.h index c524a4f9..6ebeef58 100644 --- a/libcaja-private/caja-emblem-utils.h +++ b/libcaja-private/caja-emblem-utils.h @@ -54,6 +54,5 @@ gboolean caja_emblem_can_rename_emblem (const char *keyword); char * caja_emblem_create_unique_keyword (const char *base); - #endif /* __CAJA_EMBLEM_UTILS_H__ */ diff --git a/libcaja-private/caja-entry.c b/libcaja-private/caja-entry.c index 7c1db0b9..bb86fd18 100644 --- a/libcaja-private/caja-entry.c +++ b/libcaja-private/caja-entry.c @@ -418,4 +418,3 @@ caja_entry_set_special_tab_handling (CajaEntry *entry, entry->details->special_tab_handling = special_tab_handling; } - diff --git a/libcaja-private/caja-extensions.c b/libcaja-private/caja-extensions.c index 804bb492..59d1f8c6 100644 --- a/libcaja-private/caja-extensions.c +++ b/libcaja-private/caja-extensions.c @@ -33,7 +33,6 @@ static GList *caja_extensions = NULL; - static Extension * extension_new (gchar *filename, gboolean state, gboolean python, GObject *module) { diff --git a/libcaja-private/caja-file-changes-queue.c b/libcaja-private/caja-file-changes-queue.c index 20363723..9f59a1ef 100644 --- a/libcaja-private/caja-file-changes-queue.c +++ b/libcaja-private/caja-file-changes-queue.c @@ -266,7 +266,6 @@ caja_file_changes_consume_changes (gboolean consume_all) CajaFileChangesQueue *queue; gboolean flush_needed; - additions = NULL; changes = NULL; deletions = NULL; diff --git a/libcaja-private/caja-file-changes-queue.h b/libcaja-private/caja-file-changes-queue.h index 0d159158..506e0740 100644 --- a/libcaja-private/caja-file-changes-queue.h +++ b/libcaja-private/caja-file-changes-queue.h @@ -38,5 +38,4 @@ void caja_file_changes_queue_schedule_position_remove (GFile *locati void caja_file_changes_consume_changes (gboolean consume_all); - #endif /* CAJA_FILE_CHANGES_QUEUE_H */ diff --git a/libcaja-private/caja-file-operations.c b/libcaja-private/caja-file-operations.c index b77bdd7d..b0c15cdb 100644 --- a/libcaja-private/caja-file-operations.c +++ b/libcaja-private/caja-file-operations.c @@ -124,7 +124,6 @@ typedef struct { gpointer done_callback_data; } CreateJob; - typedef struct { CommonJob common; GList *trash_dirs; @@ -242,7 +241,6 @@ static void scan_sources (GList *files, CommonJob *job, OpKind kind); - static gboolean empty_trash_job (GIOSchedulerJob *io_job, GCancellable *cancellable, gpointer user_data); @@ -466,7 +464,6 @@ get_link_name (const char *name, int count, int max_length) return result; } - /* Translators: * Feel free to leave out the st, nd, rd and th suffix or * make some or all of them match. @@ -588,7 +585,6 @@ parse_previous_duplicate_name (const char *name, return; } - tag = strstr (name, ANOTHER_COPY_DUPLICATE_TAG); if (tag != NULL) { if (tag > *suffix) { @@ -600,7 +596,6 @@ parse_previous_duplicate_name (const char *name, return; } - /* Check to see if we got one of st, nd, rd, th. */ tag = strstr (name, X11TH_COPY_DUPLICATE_TAG); @@ -647,7 +642,6 @@ parse_previous_duplicate_name (const char *name, } } - *count = 0; if (**suffix != '\0') { *name_base = extract_string_until (name, *suffix); @@ -796,7 +790,6 @@ has_invalid_xml_char (char *str) return FALSE; } - static char * custom_full_name_to_string (char *format, va_list va) { @@ -858,7 +851,6 @@ custom_basename_to_string (char *format, va_list va) g_free (tmp); } - return name; } @@ -868,7 +860,6 @@ custom_basename_skip (va_list *va) (void) va_arg (*va, GFile *); } - static char * custom_size_to_string (char *format, va_list va) { @@ -918,7 +909,6 @@ custom_mount_skip (va_list *va) (void) va_arg (*va, GMount *); } - static EelPrintfHandler handlers[] = { { 'F', custom_full_name_to_string, custom_full_name_skip }, { 'B', custom_basename_to_string, custom_basename_skip }, @@ -928,7 +918,6 @@ static EelPrintfHandler handlers[] = { { 0 } }; - static char * f (const char *format, ...) { va_list va; @@ -1854,7 +1843,6 @@ report_trash_progress (CommonJob *job, } } - static void trash_files (CommonJob *job, GList *files, int *files_skipped) { @@ -2129,8 +2117,6 @@ caja_file_operations_delete (GList *files, done_callback, done_callback_data); } - - typedef struct { gboolean eject; GMount *mount; @@ -2242,7 +2228,6 @@ dir_has_files (GFile *dir) g_object_unref (enumerator); } - return res; } @@ -2312,7 +2297,6 @@ has_trash_files (GMount *mount) return res; } - static gint prompt_empty_trash (GtkWindow *parent_window) { @@ -2487,7 +2471,6 @@ volume_mount_cb (GObject *source_object, g_object_unref (mount_op); } - void caja_file_operations_mount_volume (GtkWindow *parent_window, GVolume *volume, @@ -4168,7 +4151,6 @@ copy_move_file (CopyMoveJob *copy_job, dest = get_target_file (src, dest_dir, *dest_fs_type, same_fs); } - /* Don't allow recursive move/copy into itself. * (We would get a file system error if we proceeded but it is nicer to * detect and report it at this level) */ @@ -4236,7 +4218,6 @@ copy_move_file (CopyMoveJob *copy_job, goto out; } - retry: error = NULL; flags = G_FILE_COPY_NOFOLLOW_SYMLINKS; @@ -4589,7 +4570,6 @@ copy_files (CopyMoveJob *job, point = NULL; } - same_fs = FALSE; if (dest_fs_id) { same_fs = has_fs_id (src, dest_fs_id); @@ -4861,7 +4841,6 @@ move_file_prepare (CopyMoveJob *move_job, dest = get_target_file (src, dest_dir, *dest_fs_type, same_fs); - /* Don't allow recursive move/copy into itself. * (We would get a file system error if we proceeded but it is nicer to * detect and report it at this level) */ @@ -5093,7 +5072,6 @@ move_files_prepare (CopyMoveJob *job, point = NULL; } - same_fs = FALSE; if (dest_fs_id) { same_fs = has_fs_id (src, dest_fs_id); @@ -5111,7 +5089,6 @@ move_files_prepare (CopyMoveJob *job, *fallbacks = g_list_reverse (*fallbacks); - } static void @@ -5168,7 +5145,6 @@ move_files (CopyMoveJob *job, } } - static gboolean move_job_done (gpointer user_data) { @@ -5362,7 +5338,6 @@ get_abs_path_for_symlink (GFile *file) return abs; } - static void link_file (CopyMoveJob *job, GFile *src, GFile *dest_dir, @@ -5572,7 +5547,6 @@ link_job (GIOSchedulerJob *io_job, point = NULL; } - link_file (job, src, job->destination, &dest_fs_type, job->debuting_files, point, left); @@ -5633,7 +5607,6 @@ caja_file_operations_link (GList *files, job->common.cancellable); } - void caja_file_operations_duplicate (GList *files, GArray *relative_item_points, @@ -5731,7 +5704,6 @@ set_permissions_file (SetPermissionsJob *job, mask = job->file_mask; } - if (!job_aborted (common) && g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_UNIX_MODE)) { current = g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_UNIX_MODE); @@ -5776,7 +5748,6 @@ set_permissions_file (SetPermissionsJob *job, } } - static gboolean set_permissions_job (GIOSchedulerJob *io_job, GCancellable *cancellable, @@ -5803,8 +5774,6 @@ set_permissions_job (GIOSchedulerJob *io_job, return FALSE; } - - void caja_file_set_permissions_recursive (const char *directory, guint32 file_permissions, @@ -6396,8 +6365,6 @@ caja_file_operations_new_file (GtkWidget *parent_view, job->common.cancellable); } - - static void delete_trash_file (CommonJob *job, GFile *file, @@ -6572,7 +6539,6 @@ mark_desktop_file_trusted (CommonJob *common, response = 0; } - if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) { abort_job (common); } else if (response == 1) { @@ -6659,7 +6625,6 @@ mark_desktop_file_trusted (CommonJob *common, goto out; } - if (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_UNIX_MODE)) { current_perms = g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_UNIX_MODE); new_perms = current_perms | S_IXGRP | S_IXUSR | S_IXOTH; @@ -6760,7 +6725,6 @@ caja_self_check_file_operations (void) { setlocale (LC_MESSAGES, "C"); - /* test the next duplicate name generator */ EEL_CHECK_STRING_RESULT (get_duplicate_name (" (copy)", 1, -1), " (another copy)"); EEL_CHECK_STRING_RESULT (get_duplicate_name ("foo", 1, -1), "foo (copy)"); diff --git a/libcaja-private/caja-file-private.h b/libcaja-private/caja-file-private.h index 315b3b98..d6044d46 100644 --- a/libcaja-private/caja-file-private.h +++ b/libcaja-private/caja-file-private.h @@ -249,7 +249,6 @@ typedef struct CajaUndoStackActionData* undo_redo_data; } CajaFileOperation; - CajaFile *caja_file_new_from_info (CajaDirectory *directory, GFileInfo *info); void caja_file_emit_changed (CajaFile *file); @@ -264,7 +263,6 @@ gboolean caja_file_get_date (CajaFile *file time_t *date); void caja_file_updated_deep_count_in_progress (CajaFile *file); - void caja_file_clear_info (CajaFile *file); /* Compare file's state with a fresh file info struct, return FALSE if * no change, update file and return TRUE if the file info contains @@ -304,7 +302,6 @@ gboolean caja_file_rename_in_progress (CajaFile void caja_file_invalidate_extension_info_internal (CajaFile *file); void caja_file_info_providers_done (CajaFile *file); - /* Thumbnailing: */ void caja_file_set_is_thumbnailing (CajaFile *file, gboolean is_thumbnailing); diff --git a/libcaja-private/caja-file-queue.c b/libcaja-private/caja-file-queue.c index be7e20b6..48fd6818 100644 --- a/libcaja-private/caja-file-queue.c +++ b/libcaja-private/caja-file-queue.c @@ -87,7 +87,6 @@ caja_file_queue_dequeue (CajaFileQueue *queue) return file; } - void caja_file_queue_remove (CajaFileQueue *queue, CajaFile *file) diff --git a/libcaja-private/caja-file-utilities.c b/libcaja-private/caja-file-utilities.c index 13a300a0..825b5b30 100644 --- a/libcaja-private/caja-file-utilities.c +++ b/libcaja-private/caja-file-utilities.c @@ -82,7 +82,6 @@ caja_compute_title_for_location (GFile *location) return title; } - /** * caja_get_user_directory: * @@ -187,7 +186,6 @@ typedef struct { CajaFile* file; } XdgDirEntry; - static XdgDirEntry * parse_xdg_dirs (const char *config_file) { @@ -559,7 +557,6 @@ caja_get_desktop_location (void) return res; } - /** * caja_get_desktop_directory_uri: * @@ -586,7 +583,6 @@ caja_get_home_directory_uri (void) return g_filename_to_uri (g_get_home_dir (), NULL, NULL); } - gboolean caja_should_use_templates_directory (void) { @@ -635,7 +631,6 @@ static GFile *desktop_dir_dir = NULL; static char *desktop_dir_filename = NULL; static gboolean desktop_dir_changed_callback_installed = FALSE; - static void desktop_dir_changed (void) { @@ -722,7 +717,6 @@ caja_is_root_directory (GFile *dir) return g_file_equal (dir, root_dir); } - gboolean caja_is_desktop_directory_file (GFile *dir, const char *file) diff --git a/libcaja-private/caja-file.c b/libcaja-private/caja-file.c index 7ad7335c..a5ed4ff9 100644 --- a/libcaja-private/caja-file.c +++ b/libcaja-private/caja-file.c @@ -289,7 +289,6 @@ foreach_metadata_free (gpointer key, return TRUE; } - static void metadata_hash_free (GHashTable *hash) { @@ -1153,7 +1152,6 @@ caja_file_is_media_check_automatic (CajaFile *file) return ret; } - gboolean caja_file_can_stop (CajaFile *file) { @@ -3034,7 +3032,6 @@ prepend_automatic_keywords (CajaFile *file, caja_file_unref (parent); } - return names; } @@ -3102,7 +3099,6 @@ compare_by_emblems (CajaFile *file_1, CajaFile *file_2) keyword_cache_2 += length + 1; } - /* One or both is now NULL. */ if (*keyword_cache_1 != '\0') { g_assert (*keyword_cache_2 == '\0'); @@ -3304,7 +3300,6 @@ compare_by_extension_segments (CajaFile *file_1, CajaFile *file_2) gboolean is_directory_1, is_directory_2; int segment_index; - /* Directories do not have an extension */ is_directory_1 = caja_file_is_directory (file_1); is_directory_2 = caja_file_is_directory (file_2); @@ -3659,7 +3654,6 @@ caja_file_compare_for_sort_by_attribute (CajaFile *file_1, reversed); } - /** * caja_file_compare_name: * @file: A file object @@ -3682,7 +3676,6 @@ caja_file_compare_display_name (CajaFile *file, return result; } - gboolean caja_file_is_hidden_file (CajaFile *file) { @@ -3894,7 +3887,6 @@ caja_file_set_metadata_list (CajaFile *file, g_free (val); } - gboolean caja_file_get_boolean_metadata (CajaFile *file, const char *key, @@ -4021,7 +4013,6 @@ caja_file_set_time_metadata (CajaFile *file, caja_file_set_metadata (file, key, NULL, metadata); } - void caja_file_set_boolean_metadata (CajaFile *file, const char *key, @@ -4200,7 +4191,6 @@ caja_file_has_activation_uri (CajaFile *file) return file->details->activation_uri != NULL; } - /* Return the uri associated with the passed-in file, which may not be * the actual uri if the file is an desktop file or a caja * xml link file. @@ -4229,7 +4219,6 @@ caja_file_get_activation_location (CajaFile *file) return caja_file_get_location (file); } - char * caja_file_get_drop_target_uri (CajaFile *file) { @@ -4343,7 +4332,6 @@ get_custom_icon (CajaFile *file) return icon; } - static guint64 cached_thumbnail_limit; int cached_thumbnail_size; static int show_image_thumbs; @@ -4725,7 +4713,6 @@ caja_file_get_custom_icon (CajaFile *file) return custom_icon; } - gboolean caja_file_get_date (CajaFile *file, CajaDateType date_type, @@ -5261,7 +5248,6 @@ caja_file_can_get_size (CajaFile *file) return file->details->size == -1; } - /** * caja_file_get_size * @@ -5307,7 +5293,6 @@ caja_file_get_mtime (CajaFile *file) return file->details->mtime; } - static void set_attributes_get_info_callback (GObject *source_object, GAsyncResult *res, @@ -5333,7 +5318,6 @@ set_attributes_get_info_callback (GObject *source_object, } } - static void set_attributes_callback (GObject *source_object, GAsyncResult *result, @@ -5386,7 +5370,6 @@ caja_file_set_attributes (CajaFile *file, g_object_unref (location); } - /** * caja_file_can_get_permissions: * @@ -5526,7 +5509,6 @@ caja_file_can_get_selinux_context (CajaFile *file) return file->details->selinux_context != NULL; } - /** * caja_file_get_selinux_context: * @@ -5601,7 +5583,6 @@ get_real_name (const char *name, const char *gecos) g_free (part_before_comma); } - if (eel_str_is_empty (real_name) || eel_strcmp (name, real_name) == 0 || eel_strcmp (capitalized_login_name, real_name) == 0) { @@ -5948,7 +5929,6 @@ caja_get_group_names_for_user (void) gid_t gid_list[NGROUPS_MAX + 1]; struct group *group = NULL; - list = NULL; count = getgroups (NGROUPS_MAX + 1, gid_list); @@ -6643,7 +6623,6 @@ caja_file_get_string_attribute (CajaFile *file, const char *attribute_name) return caja_file_get_string_attribute_q (file, g_quark_from_string (attribute_name)); } - /** * caja_file_get_string_attribute_with_default: * @@ -6915,7 +6894,6 @@ caja_file_is_launchable (CajaFile *file) !caja_file_is_directory (file); } - /** * caja_file_get_emblem_icons * @@ -6974,7 +6952,6 @@ caja_file_get_emblem_icons (CajaFile *file, } } - icon_names[0] = g_strconcat ("emblem-", keyword, NULL); icon_names[1] = keyword; icon = g_themed_icon_new_from_names (icon_names, 2); @@ -7017,7 +6994,6 @@ caja_file_get_emblem_pixbufs (CajaFile *file, pixbufs = g_list_prepend (pixbufs, pixbuf); } - g_object_unref (icon_info); g_object_unref (icon); } @@ -7025,7 +7001,6 @@ caja_file_get_emblem_pixbufs (CajaFile *file, return g_list_reverse (pixbufs); - } static GList * @@ -7257,7 +7232,6 @@ caja_file_get_volume_free_space (CajaFile *file) caja_directory_unref (directory); } - res = NULL; if (directory->details->free_space != (guint64) -1) @@ -7465,7 +7439,6 @@ caja_file_is_archive (CajaFile *file) return FALSE; } - /** * caja_file_is_in_trash * @@ -7769,7 +7742,6 @@ caja_file_emit_changed (CajaFile *file) g_assert (CAJA_IS_FILE (file)); - /* Invalidate the emblem compare cache. -- This is not the cleanest * place to do it but it is the one guaranteed bottleneck through * which all change notifications pass. @@ -8020,7 +7992,6 @@ caja_file_set_has_open_window (CajaFile *file, } } - gboolean caja_file_is_thumbnailing (CajaFile *file) { @@ -8038,7 +8009,6 @@ caja_file_set_is_thumbnailing (CajaFile *file, file->details->is_thumbnailing = is_thumbnailing; } - /** * caja_file_invalidate_attributes * @@ -8089,7 +8059,6 @@ caja_file_invalidate_all_attributes (CajaFile *file) caja_file_invalidate_attributes (file, all_attributes); } - /** * caja_file_dump * @@ -8376,7 +8345,6 @@ caja_file_list_call_when_ready (GList *file_list, *handle = (CajaFileListHandle *) data; } - l = file_list; while (l != NULL) { file = CAJA_FILE (l->data); @@ -8457,8 +8425,6 @@ try_to_make_utf8 (const char *text, int *length) return utf8_text; } - - /* Extract the top left part of the read-in text. */ char * caja_extract_top_left_text (const char *text, @@ -8485,8 +8451,6 @@ caja_extract_top_left_text (const char *text, max_cols = CAJA_FILE_TOP_LEFT_TEXT_MAXIMUM_CHARACTERS_PER_LINE; } - - text_copy = NULL; if (text != NULL) { /* Might be a partial utf8 character at the end if we didn't read whole file */ @@ -8841,7 +8805,6 @@ caja_self_check_file (void) EEL_CHECK_INTEGER_RESULT (caja_directory_number_outstanding (), 0); - /* name checks */ file_1 = caja_file_get_by_uri ("file:///home/"); diff --git a/libcaja-private/caja-file.h b/libcaja-private/caja-file.h index b4498bcd..7e4ca18a 100644 --- a/libcaja-private/caja-file.h +++ b/libcaja-private/caja-file.h @@ -118,7 +118,6 @@ typedef char * (*CajaTruncateCallback) (const char *string, int width, void *context); - #define CAJA_FILE_ATTRIBUTES_FOR_ICON (CAJA_FILE_ATTRIBUTE_INFO | CAJA_FILE_ATTRIBUTE_LINK_INFO | CAJA_FILE_ATTRIBUTE_THUMBNAIL) typedef void CajaFileListHandle; @@ -384,7 +383,6 @@ void caja_file_set_time_metadata (CajaFile const char *key, time_t time); - /* Attributes for file objects as user-displayable strings. */ char * caja_file_get_string_attribute (CajaFile *file, const char *attribute_name); @@ -444,7 +442,6 @@ gboolean caja_file_should_show (CajaFile GList *caja_file_list_filter_hidden (GList *files, gboolean show_hidden); - /* Get the URI that's used when activating the file. * Getting this can require reading the contents of the file. */ @@ -460,7 +457,6 @@ char * caja_file_get_drop_target_uri (CajaFile /* Get custom icon (if specified by metadata or link contents) */ char * caja_file_get_custom_icon (CajaFile *file); - GIcon *caja_file_get_gicon (CajaFile *file, CajaFileIconFlags flags); CajaIconInfo *caja_file_get_icon (CajaFile *file, diff --git a/libcaja-private/caja-global-preferences.h b/libcaja-private/caja-global-preferences.h index 83281157..ed888db7 100644 --- a/libcaja-private/caja-global-preferences.h +++ b/libcaja-private/caja-global-preferences.h @@ -136,15 +136,12 @@ typedef enum #define CAJA_COMPACT_VIEW_IID "OAFIID:Caja_File_Manager_Compact_View" #define CAJA_LIST_VIEW_IID "OAFIID:Caja_File_Manager_List_View" - /* Icon View */ #define CAJA_PREFERENCES_ICON_VIEW_DEFAULT_USE_TIGHTER_LAYOUT "default-use-tighter-layout" #define CAJA_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL "default-zoom-level" #define CAJA_PREFERENCES_ICON_VIEW_LABELS_BESIDE_ICONS "labels-beside-icons" - - /* Which text attributes appear beneath icon names */ #define CAJA_PREFERENCES_ICON_VIEW_CAPTIONS "captions" diff --git a/libcaja-private/caja-icon-canvas-item.c b/libcaja-private/caja-icon-canvas-item.c index 7ab2f705..8a11b154 100644 --- a/libcaja-private/caja-icon-canvas-item.c +++ b/libcaja-private/caja-icon-canvas-item.c @@ -237,7 +237,6 @@ static void draw_embedded_text (CajaIconCanvasItem static void caja_icon_canvas_item_ensure_bounds_up_to_date (CajaIconCanvasItem *icon_item); - /* Object initialization function for the icon item. */ static void caja_icon_canvas_item_init (CajaIconCanvasItem *icon_item) @@ -732,7 +731,6 @@ caja_icon_canvas_item_set_embedded_text (CajaIconCanvasItem *item, eel_canvas_item_request_update (EEL_CANVAS_ITEM (item)); } - /* Recomputes the bounding box of a icon canvas item. * This is a generic implementation that could be used for any canvas item * class, it has no assumptions about how the item is used. @@ -943,7 +941,6 @@ in_single_click_mode (void) return click_policy_auto_value == CAJA_CLICK_POLICY_SINGLE; } - /* Keep these for a bit while we work on performance of draw_or_measure_label_text. */ /* #define PERFORMANCE_TEST_DRAW_DISABLE @@ -1466,7 +1463,6 @@ caja_icon_canvas_item_invalidate_label (CajaIconCanvasItem *item) } } - static GdkPixbuf * get_knob_pixbuf (void) { @@ -1569,7 +1565,6 @@ emblem_layout_next (EmblemLayout *layout, width = gdk_pixbuf_get_width (pixbuf); height = gdk_pixbuf_get_height (pixbuf); - /* Advance to the next emblem. */ layout->emblem = layout->emblem->next; @@ -1970,7 +1965,6 @@ caja_icon_canvas_item_draw (EelCanvasItem *item, (g_ascii_isdigit (*(p+1)) && \ g_ascii_isdigit (*(p+2)))) - static PangoLayout * create_label_layout (CajaIconCanvasItem *item, const char *text) @@ -2091,7 +2085,6 @@ get_label_layout (PangoLayout **layout_cache, return layout; } - /* handle events */ static int caja_icon_canvas_item_event (EelCanvasItem *item, GdkEvent *event) @@ -2566,7 +2559,6 @@ get_icon_canvas_rectangle (CajaIconCanvasItem *item, g_assert (CAJA_IS_ICON_CANVAS_ITEM (item)); g_assert (rect != NULL); - eel_canvas_w2c (EEL_CANVAS_ITEM (item)->canvas, item->details->x, item->details->y, @@ -2743,7 +2735,6 @@ caja_icon_canvas_item_get_max_text_width (CajaIconCanvasItem *item) return MAX_TEXT_WIDTH_STANDARD * canvas_item->canvas->pixels_per_unit; } - } } @@ -2806,7 +2797,6 @@ caja_icon_canvas_item_class_init (CajaIconCanvasItemClass *class) "whether we are highlighted to render keyboard focus", FALSE, G_PARAM_READWRITE)); - g_object_class_install_property ( object_class, PROP_HIGHLIGHTED_FOR_DROP, @@ -3129,7 +3119,6 @@ caja_icon_canvas_item_accessible_get_index_in_parent (AtkObject *accessible) return -1; } - static const gchar* caja_icon_canvas_item_accessible_get_image_description(AtkImage* image) { CajaIconCanvasItemAccessiblePrivate* priv; @@ -3614,7 +3603,6 @@ typedef AtkObjectFactoryClass CajaIconCanvasItemAccessibleFactoryClass; G_DEFINE_TYPE (CajaIconCanvasItemAccessibleFactory, caja_icon_canvas_item_accessible_factory, ATK_TYPE_OBJECT_FACTORY); - static AtkObject * caja_icon_canvas_item_accessible_factory_create_accessible (GObject *for_object) { diff --git a/libcaja-private/caja-icon-container.c b/libcaja-private/caja-icon-container.c index d4fe27b4..77626b2d 100644 --- a/libcaja-private/caja-icon-container.c +++ b/libcaja-private/caja-icon-container.c @@ -294,7 +294,6 @@ icon_is_positioned (const CajaIcon *icon) return icon->x != ICON_UNPOSITIONED_VALUE && icon->y != ICON_UNPOSITIONED_VALUE; } - /* x, y are the top-left coordinates of the icon. */ static void icon_set_position (CajaIcon *icon, @@ -712,7 +711,6 @@ icon_get_row_and_column_bounds (CajaIconContainer *container, } } - } static void @@ -1411,7 +1409,6 @@ lay_down_icons_horizontal (CajaIconContainer *container, { icon_width = ceil ((bounds.x1 - bounds.x0)/grid_width) * grid_width; - } else { @@ -1754,7 +1751,6 @@ snap_position (CajaIconContainer *container, *x = get_mirror_x_position (container, icon, *x); } - /* Find the grid position vertically and place on the proper baseline */ baseline_y = *y + icon_height; baseline_y = SNAP_NEAREST_VERTICAL (baseline_y); @@ -2294,7 +2290,6 @@ lay_down_icons_vertical_desktop (CajaIconContainer *container, GList *icons) caja_icon_container_freeze_icon_positions (container); } - static void lay_down_icons (CajaIconContainer *container, GList *icons, double start_y) { @@ -2544,7 +2539,6 @@ select_range (CajaIconContainer *container, return selection_changed; } - static gboolean select_one_unselect_others (CajaIconContainer *container, CajaIcon *icon_to_select) @@ -3082,7 +3076,6 @@ get_cmp_point_y (CajaIconContainer *container, } } - static int compare_icons_horizontal (CajaIconContainer *container, CajaIcon *icon_a, @@ -3626,7 +3619,6 @@ previous_column_highest (CajaIconContainer *container, return best_so_far == NULL; } - static gboolean next_column_highest (CajaIconContainer *container, CajaIcon *start_icon, @@ -3722,7 +3714,6 @@ closest_in_90_degrees (CajaIconContainer *container, int dist; int *best_dist; - world_rect = caja_icon_canvas_item_get_icon_rectangle (candidate->item); eel_canvas_w2c (EEL_CANVAS (container), @@ -4805,7 +4796,6 @@ caja_icon_container_did_not_drag (CajaIconContainer *container, * the selection or pressing for a very long time, or double clicking. */ - if (click_count == 0 && event->time - details->button_down_time < MAX_CLICK_TIME && ! button_event_modifies_selection (event)) @@ -5251,7 +5241,6 @@ caja_icon_container_search_position_func (CajaIconContainer *container, GdkMonitor *monitor_num; GdkRectangle monitor; - cont_window = gtk_widget_get_window (GTK_WIDGET (container)); scale = gtk_widget_get_scale_factor (GTK_WIDGET (container)); screen = gdk_window_get_screen (cont_window); @@ -6589,7 +6578,6 @@ caja_icon_container_class_init (CajaIconContainerClass *class) FALSE, G_PARAM_READABLE)); - binding_set = gtk_binding_set_by_class (class); gtk_binding_entry_add_signal (binding_set, GDK_KEY_f, GDK_CONTROL_MASK, "start_interactive_search", 0); @@ -6639,7 +6627,6 @@ handle_scale_factor_changed (GObject *object, caja_icon_container_request_update_all (CAJA_ICON_CONTAINER (object)); } - static int text_ellipsis_limits[CAJA_ZOOM_LEVEL_N_ENTRIES]; static int desktop_text_ellipsis_limit; @@ -6946,7 +6933,6 @@ handle_icon_button_press (CajaIconContainer *container, event); } - return TRUE; } @@ -7438,7 +7424,6 @@ caja_icon_container_stop_monitor_top_left (CajaIconContainer *container, klass->stop_monitor_top_left (container, data, client); } - static void caja_icon_container_prioritize_thumbnailing (CajaIconContainer *container, CajaIcon *icon) @@ -7542,7 +7527,6 @@ handle_hadjustment_changed (GtkAdjustment *adjustment, } } - void caja_icon_container_update_icon (CajaIconContainer *container, CajaIcon *icon) @@ -7584,7 +7568,6 @@ caja_icon_container_update_icon (CajaIconContainer *container, icon_get_size (container, icon, &icon_size); } - icon_size = MAX (icon_size, min_image_size); icon_size = MIN (icon_size, max_image_size); @@ -7599,7 +7582,6 @@ caja_icon_container_update_icon (CajaIconContainer *container, large_embedded_text, &embedded_text_needs_loading, &has_open_window); - if (container->details->forced_icon_size > 0) pixbuf = caja_icon_info_get_pixbuf_at_size (icon_info, icon_size); else @@ -8141,7 +8123,6 @@ caja_icon_container_invert_selection (CajaIconContainer *container) g_signal_emit (container, signals[SELECTION_CHANGED], 0); } - /* Returns an array of GdkPoints of locations of the icons. */ static GArray * caja_icon_container_get_icon_locations (CajaIconContainer *container, @@ -8649,7 +8630,6 @@ caja_icon_container_set_auto_layout (CajaIconContainer *container, g_signal_emit (container, signals[LAYOUT_CHANGED], 0); } - /* Toggle the tighter layout boolean. */ void caja_icon_container_set_tighter_layout (CajaIconContainer *container, @@ -8967,7 +8947,6 @@ caja_icon_container_start_renaming_selected_item (CajaIconContainer *container, g_assert (!has_multiple_selection (container)); - if (!icon_is_positioned (icon)) { set_pending_icon_to_rename (container, icon); @@ -9655,7 +9634,6 @@ caja_icon_container_accessible_cleared_cb (CajaIconContainer *container, g_signal_emit_by_name (data, "children_changed", 0, NULL, NULL); } - static gboolean caja_icon_container_accessible_add_selection (AtkSelection *accessible, int i) @@ -9859,7 +9837,6 @@ caja_icon_container_accessible_selection_interface_init (AtkSelectionIface *ifac iface->select_all_selection = caja_icon_container_accessible_select_all_selection; } - static gint caja_icon_container_accessible_get_n_children (AtkObject *accessible) { diff --git a/libcaja-private/caja-icon-container.h b/libcaja-private/caja-icon-container.h index 1e7bbbe7..d78310d5 100644 --- a/libcaja-private/caja-icon-container.h +++ b/libcaja-private/caja-icon-container.h @@ -42,7 +42,6 @@ #define CAJA_ICON_CONTAINER_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS ((obj), CAJA_TYPE_ICON_CONTAINER, CajaIconContainerClass)) - #define CAJA_ICON_CONTAINER_ICON_DATA(pointer) \ ((CajaIconData *) (pointer)) @@ -245,7 +244,6 @@ typedef struct GType caja_icon_container_get_type (void); GtkWidget * caja_icon_container_new (void); - /* adding, removing, and managing icons */ void caja_icon_container_clear (CajaIconContainer *view); gboolean caja_icon_container_add (CajaIconContainer *view, @@ -301,7 +299,6 @@ void caja_icon_container_set_highlighted_for_clipboard (CajaIconCon void caja_icon_container_unselect_all (CajaIconContainer *view); void caja_icon_container_select_all (CajaIconContainer *view); - /* operations on the selection */ GList * caja_icon_container_get_selection (CajaIconContainer *view); void caja_icon_container_invert_selection (CajaIconContainer *view); @@ -361,7 +358,6 @@ void caja_icon_container_set_store_layout_timestamps (CajaIconCon void caja_icon_container_widget_to_file_operation_position (CajaIconContainer *container, GdkPoint *position); - #define CANVAS_WIDTH(container,allocation) ((allocation.width \ - container->details->left_margin \ - container->details->right_margin) \ diff --git a/libcaja-private/caja-icon-dnd.c b/libcaja-private/caja-icon-dnd.c index a41271e0..dde633e3 100644 --- a/libcaja-private/caja-icon-dnd.c +++ b/libcaja-private/caja-icon-dnd.c @@ -25,12 +25,10 @@ Andy Hertzfeld <[email protected]> Pavel Cisler <[email protected]> - XDS support: Benedikt Meurer <[email protected]> (adapted by Amos Brocco <[email protected]>) */ - #include <config.h> #include <math.h> #include <stdio.h> @@ -183,7 +181,6 @@ set_shadow_position (EelCanvasItem *shadow, NULL); } - /* Source-side handling of the drag. */ /* iteration glue struct */ @@ -339,7 +336,6 @@ drag_data_get_callback (GtkWidget *widget, info, time, widget, each_icon_get_data_binder); } - /* Target-side handling of the drag. */ static void @@ -1221,7 +1217,6 @@ selection_is_image_file (GList *selection_list) return result; } - static void caja_icon_container_receive_dropped_icons (CajaIconContainer *container, GdkDragContext *context, @@ -1943,7 +1938,6 @@ caja_icon_dnd_init (CajaIconContainer *container) g_return_if_fail (container != NULL); g_return_if_fail (CAJA_IS_ICON_CONTAINER (container)); - container->details->dnd_info = g_new0 (CajaIconDndInfo, 1); caja_drag_init (&container->details->dnd_info->drag_info, drag_types, G_N_ELEMENTS (drag_types), TRUE); @@ -1966,7 +1960,6 @@ caja_icon_dnd_init (CajaIconContainer *container) targets = gtk_drag_dest_get_target_list (GTK_WIDGET (container)); gtk_target_list_add_text_targets (targets, CAJA_ICON_DND_TEXT); - /* Messages for outgoing drag. */ g_signal_connect (container, "drag_begin", G_CALLBACK (drag_begin_callback), NULL); diff --git a/libcaja-private/caja-icon-dnd.h b/libcaja-private/caja-icon-dnd.h index 2cea0f1d..ac6f2df5 100644 --- a/libcaja-private/caja-icon-dnd.h +++ b/libcaja-private/caja-icon-dnd.h @@ -43,7 +43,6 @@ typedef struct EelCanvasItem *shadow; } CajaIconDndInfo; - void caja_icon_dnd_init (CajaIconContainer *container); void caja_icon_dnd_fini (CajaIconContainer *container); void caja_icon_dnd_begin_drag (CajaIconContainer *container, diff --git a/libcaja-private/caja-icon-info.c b/libcaja-private/caja-icon-info.c index 3d789bfd..cf690a6e 100644 --- a/libcaja-private/caja-icon-info.c +++ b/libcaja-private/caja-icon-info.c @@ -184,7 +184,6 @@ caja_icon_info_new_for_icon_info (GtkIconInfo *icon_info, return icon; } - typedef struct { GIcon *icon; @@ -378,7 +377,6 @@ caja_icon_info_lookup (GIcon *icon, pixbuf = gtk_icon_info_load_icon (gtkicon_info, NULL); } - icon_info = caja_icon_info_new_for_pixbuf (pixbuf, scale); key = icon_key_new (icon, scale, size); @@ -759,7 +757,6 @@ caja_get_icon_size_for_stock_size (GtkIconSize size) return CAJA_ZOOM_LEVEL_STANDARD; } - guint caja_icon_get_emblem_size_for_icon_size (guint size) { diff --git a/libcaja-private/caja-icon-info.h b/libcaja-private/caja-icon-info.h index eb76bec3..7e1f12f4 100644 --- a/libcaja-private/caja-icon-info.h +++ b/libcaja-private/caja-icon-info.h @@ -45,7 +45,6 @@ extern "C" { typedef struct _CajaIconInfo CajaIconInfo; typedef struct _CajaIconInfoClass CajaIconInfoClass; - #define CAJA_TYPE_ICON_INFO (caja_icon_info_get_type ()) #define CAJA_ICON_INFO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CAJA_TYPE_ICON_INFO, CajaIconInfo)) #define CAJA_ICON_INFO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CAJA_TYPE_ICON_INFO, CajaIconInfoClass)) @@ -53,7 +52,6 @@ extern "C" { #define CAJA_IS_ICON_INFO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CAJA_TYPE_ICON_INFO)) #define CAJA_ICON_INFO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CAJA_TYPE_ICON_INFO, CajaIconInfoClass)) - GType caja_icon_info_get_type (void) G_GNUC_CONST; CajaIconInfo * caja_icon_info_new_for_pixbuf (GdkPixbuf *pixbuf, @@ -103,8 +101,6 @@ extern "C" { gboolean caja_icon_theme_can_render (GThemedIcon *icon); GIcon * caja_user_special_directory_get_gicon (GUserDirectory directory); - - #ifdef __cplusplus } #endif diff --git a/libcaja-private/caja-icon-private.h b/libcaja-private/caja-icon-private.h index 7efdb9ce..e975d6ec 100644 --- a/libcaja-private/caja-icon-private.h +++ b/libcaja-private/caja-icon-private.h @@ -70,7 +70,6 @@ typedef struct eel_boolean_bit has_lazy_position : 1; } CajaIcon; - /* Private CajaIconContainer members. */ typedef struct @@ -319,6 +318,4 @@ gboolean caja_icon_container_scroll (CajaIconContainer int delta_y); void caja_icon_container_update_scroll_region (CajaIconContainer *container); - - #endif /* CAJA_ICON_CONTAINER_PRIVATE_H */ diff --git a/libcaja-private/caja-keep-last-vertical-box.c b/libcaja-private/caja-keep-last-vertical-box.c index 441e8a11..0047756e 100644 --- a/libcaja-private/caja-keep-last-vertical-box.c +++ b/libcaja-private/caja-keep-last-vertical-box.c @@ -49,7 +49,6 @@ caja_keep_last_vertical_box_init (CajaKeepLastVerticalBox *box) gtk_orientable_set_orientation (GTK_ORIENTABLE (box), GTK_ORIENTATION_VERTICAL); } - /* caja_keep_last_vertical_box_new: * * Create a new vertical box that clips off items from the end that don't diff --git a/libcaja-private/caja-link.c b/libcaja-private/caja-link.c index d0677731..2ed3d257 100644 --- a/libcaja-private/caja-link.c +++ b/libcaja-private/caja-link.c @@ -141,8 +141,6 @@ _g_key_file_save_to_gfile (GKeyFile *key_file, return TRUE; } - - static GKeyFile * _g_key_file_new_from_uri (const char *uri, GKeyFileFlags flags, @@ -270,7 +268,6 @@ caja_link_local_create (const char *directory_uri, image != NULL ? "Icon=" : "", image != NULL ? image : ""); - if (!g_file_replace_contents (file, contents, strlen (contents), NULL, FALSE, @@ -355,7 +352,6 @@ caja_link_local_set_key (const char *uri, g_key_file_set_string (key_file, MAIN_GROUP, key, value); } - success = _g_key_file_save_to_gfile (key_file, file, NULL); g_key_file_free (key_file); g_object_unref (file); @@ -369,7 +365,6 @@ caja_link_local_set_text (const char *uri, return caja_link_local_set_key (uri, "Name", text, TRUE); } - gboolean caja_link_local_set_icon (const char *uri, const char *icon) diff --git a/libcaja-private/caja-mime-actions.c b/libcaja-private/caja-mime-actions.c index 83ca70b9..252ee60e 100644 --- a/libcaja-private/caja-mime-actions.c +++ b/libcaja-private/caja-mime-actions.c @@ -114,7 +114,6 @@ static void activate_callback (GList *files, gpointer callback_data); static void activation_mount_not_mounted (ActivateParameters *parameters); - static void launch_location_free (LaunchLocation *location) { @@ -147,7 +146,6 @@ get_file_list_for_launch_locations (GList *locations) return g_list_reverse (files); } - static LaunchLocation * launch_location_from_file (CajaFile *file) { @@ -285,7 +283,6 @@ filter_non_uri_apps (GList *apps) return apps; } - static gboolean caja_mime_actions_check_if_required_attributes_ready (CajaFile *file) { @@ -312,7 +309,6 @@ file_has_local_path (CajaFile *file) char *path; gboolean res; - /* Don't only check _is_native, because we want to support using the fuse path */ location = caja_file_get_location (file); @@ -439,7 +435,6 @@ application_compare_by_id (const GAppInfo *app_a, return 1; } - return strcmp (id_a, id_b); } @@ -808,7 +803,6 @@ get_executable_text_file_action (GtkWindow *parent_window, CajaFile *file) } - file_name = caja_file_get_display_name (file); prompt = g_strdup_printf (_("Do you want to run \"%s\", or display its contents?"), file_name); @@ -937,7 +931,6 @@ caja_mime_file_opens_in_external_app (CajaFile *file) return (activation_action == ACTIVATION_ACTION_OPEN_IN_APPLICATION); } - static unsigned int mime_application_hash (GAppInfo *app) { @@ -967,7 +960,6 @@ list_to_parameters_foreach (GAppInfo *application, *ret = g_list_prepend (*ret, parameters); } - /** * make_activation_parameters * @@ -1152,7 +1144,6 @@ unpause_activation_timed_cancel (ActivateParameters *parameters) } } - static void activate_mount_op_active (GtkMountOperation *operation, GParamSpec *pspec, @@ -1942,7 +1933,6 @@ activate_files (ActivateParameters *parameters) open_in_view_files = g_list_reverse (open_in_view_files); } - for (l = open_in_view_files; l != NULL; l = l->next) { GFile *f; @@ -2116,7 +2106,6 @@ activation_mount_not_mounted (ActivateParameters *parameters) caja_file_list_free (files); } - static void activate_callback (GList *files, gpointer callback_data) { @@ -2156,7 +2145,6 @@ activate_callback (GList *files, gpointer callback_data) } } - if (parameters->not_mounted != NULL) { activation_mount_not_mounted (parameters); @@ -2236,7 +2224,6 @@ activate_activation_uris_ready_callback (GList *files_ignore, g_free (uri); } - /* get the parameters for the actual files */ files = get_file_list_for_launch_locations (parameters->locations); caja_file_list_call_when_ready @@ -2305,7 +2292,6 @@ activation_mountable_mounted (CajaFile *file, parameters->mountables = g_list_remove (parameters->mountables, file); caja_file_unref (file); - if (error == NULL) { CajaFile *target_file; @@ -2360,7 +2346,6 @@ activation_mountable_mounted (CajaFile *file, activation_mount_mountables (parameters); } - static void activation_mount_mountables (ActivateParameters *parameters) { @@ -2387,7 +2372,6 @@ activation_mount_mountables (ActivateParameters *parameters) activation_get_activation_uris (parameters); } - static void activation_mountable_started (CajaFile *file, GFile *gfile_of_file, @@ -2538,7 +2522,6 @@ caja_mime_activate_files (GtkWindow *parent_window, file_count); } - for (l = parameters->locations; l != NULL; l = next) { location = l->data; diff --git a/libcaja-private/caja-mime-actions.h b/libcaja-private/caja-mime-actions.h index 48c9c1c5..1bc7b2fe 100644 --- a/libcaja-private/caja-mime-actions.h +++ b/libcaja-private/caja-mime-actions.h @@ -57,5 +57,4 @@ void caja_mime_activate_file (GtkWindow CajaWindowOpenMode mode, CajaWindowOpenFlags flags); - #endif /* CAJA_MIME_ACTIONS_H */ diff --git a/libcaja-private/caja-mime-application-chooser.c b/libcaja-private/caja-mime-application-chooser.c index e842cf27..ab9b8026 100644 --- a/libcaja-private/caja-mime-application-chooser.c +++ b/libcaja-private/caja-mime-application-chooser.c @@ -94,7 +94,6 @@ caja_mime_application_chooser_finalize (GObject *object) G_CALLBACK (mime_type_data_changed_cb), chooser); - g_free (chooser->details->uri); g_free (chooser->details->content_type); g_free (chooser->details->extension); diff --git a/libcaja-private/caja-module.h b/libcaja-private/caja-module.h index c02ad17a..6cb9779d 100644 --- a/libcaja-private/caja-module.h +++ b/libcaja-private/caja-module.h @@ -34,7 +34,6 @@ extern "C" { GList *caja_module_get_extensions_for_type (GType type); void caja_module_extension_list_free (GList *list); - /* Add a type to the module interface - allows caja to add its own modules * without putting them in separate shared libraries */ GObject *caja_module_add_type (GType type); diff --git a/libcaja-private/caja-open-with-dialog.c b/libcaja-private/caja-open-with-dialog.c index dcffd4c2..6e908e29 100644 --- a/libcaja-private/caja-open-with-dialog.c +++ b/libcaja-private/caja-open-with-dialog.c @@ -390,7 +390,6 @@ response_cb (CajaOpenWithDialog *dialog, } - static void caja_open_with_dialog_class_init (CajaOpenWithDialogClass *class) { @@ -610,7 +609,6 @@ caja_open_with_dialog_add_icon_idle (CajaOpenWithDialog *dialog) return TRUE; } - static gboolean caja_open_with_search_equal_func (GtkTreeModel *model, int column, @@ -688,8 +686,6 @@ caja_open_with_search_equal_func (GtkTreeModel *model, } } - - static gboolean caja_open_with_dialog_add_items_idle (CajaOpenWithDialog *dialog) { @@ -884,7 +880,6 @@ caja_open_with_dialog_init (CajaOpenWithDialog *dialog) FALSE, FALSE, 0); gtk_widget_show (dialog->details->label); - scrolled_window = gtk_scrolled_window_new (NULL, NULL); gtk_widget_set_size_request (scrolled_window, 400, 300); @@ -923,11 +918,9 @@ caja_open_with_dialog_init (CajaOpenWithDialog *dialog) (GSourceFunc) caja_open_with_dialog_add_items_idle, dialog, NULL); - gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), vbox, TRUE, TRUE, 0); gtk_widget_show_all (vbox); - expander = gtk_expander_new_with_mnemonic (_("_Use a custom command")); gtk_box_pack_start (GTK_BOX (vbox), expander, FALSE, FALSE, 0); g_signal_connect_after (expander, "activate", G_CALLBACK (expander_toggled), dialog); @@ -972,7 +965,6 @@ caja_open_with_dialog_init (CajaOpenWithDialog *dialog) "process-stop", GTK_RESPONSE_CANCEL); - /* Create a custom stock icon */ dialog->details->button = gtk_button_new (); @@ -999,7 +991,6 @@ caja_open_with_dialog_init (CajaOpenWithDialog *dialog) gtk_dialog_add_action_widget (GTK_DIALOG (dialog), dialog->details->button, RESPONSE_OPEN); - gtk_dialog_set_default_response (GTK_DIALOG (dialog), RESPONSE_OPEN); @@ -1151,7 +1142,6 @@ set_uri_and_type (CajaOpenWithDialog *dialog, g_free (name); } - static GtkWidget * real_caja_open_with_dialog_new (const char *uri, const char *mime_type, diff --git a/libcaja-private/caja-open-with-dialog.h b/libcaja-private/caja-open-with-dialog.h index 693aec02..7b76c336 100644 --- a/libcaja-private/caja-open-with-dialog.h +++ b/libcaja-private/caja-open-with-dialog.h @@ -61,6 +61,4 @@ GtkWidget* caja_add_application_dialog_new (const char *uri, GtkWidget* caja_add_application_dialog_new_for_multiple_files (const char *extension, const char *mime_type); - - #endif /* CAJA_OPEN_WITH_DIALOG_H */ diff --git a/libcaja-private/caja-progress-info.c b/libcaja-private/caja-progress-info.c index 3ade6cda..1db11351 100644 --- a/libcaja-private/caja-progress-info.c +++ b/libcaja-private/caja-progress-info.c @@ -822,7 +822,6 @@ progress_widget_new (CajaProgressInfo *info) vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_box_set_spacing (GTK_BOX (vbox), 5); - data->widget = vbox; g_object_set_data_full (G_OBJECT (data->widget), "data", data, @@ -1329,7 +1328,6 @@ caja_progress_info_set_status (CajaProgressInfo *info, G_UNLOCK (progress_info); } - void caja_progress_info_take_details (CajaProgressInfo *info, char *details) diff --git a/libcaja-private/caja-progress-info.h b/libcaja-private/caja-progress-info.h index 61cdb02a..c713361b 100644 --- a/libcaja-private/caja-progress-info.h +++ b/libcaja-private/caja-progress-info.h @@ -82,5 +82,4 @@ void caja_progress_info_set_progress (CajaProgressInfo *info, double total); void caja_progress_info_pulse_progress (CajaProgressInfo *info); - #endif /* CAJA_PROGRESS_INFO_H */ diff --git a/libcaja-private/caja-query.c b/libcaja-private/caja-query.c index 70782c8e..d0902652 100644 --- a/libcaja-private/caja-query.c +++ b/libcaja-private/caja-query.c @@ -86,7 +86,6 @@ caja_query_new (void) return g_object_new (CAJA_TYPE_QUERY, NULL); } - char * caja_query_get_text (CajaQuery *query) { @@ -216,7 +215,6 @@ decode_home_uri (const char *uri) return decoded_uri; } - typedef struct { CajaQuery *query; @@ -331,7 +329,6 @@ static GMarkupParser parser = error_cb }; - static CajaQuery * caja_query_parse_xml (char *xml, gsize xml_len) { @@ -353,7 +350,6 @@ caja_query_parse_xml (char *xml, gsize xml_len) return info.query; } - CajaQuery * caja_query_load (char *file) { @@ -366,7 +362,6 @@ caja_query_load (char *file) return NULL; } - g_file_get_contents (file, &xml, &xml_len, NULL); query = caja_query_parse_xml (xml, xml_len); g_free (xml); @@ -450,7 +445,6 @@ caja_query_save (CajaQuery *query, char *file) GError *err = NULL; gboolean res; - res = TRUE; xml = caja_query_to_xml (query); g_file_set_contents (file, xml, strlen (xml), &err); diff --git a/libcaja-private/caja-recent.h b/libcaja-private/caja-recent.h index d2147237..a993ef0f 100644 --- a/libcaja-private/caja-recent.h +++ b/libcaja-private/caja-recent.h @@ -1,5 +1,4 @@ - #ifndef __CAJA_RECENT_H__ #define __CAJA_RECENT_H__ diff --git a/libcaja-private/caja-saved-search-file.c b/libcaja-private/caja-saved-search-file.c index c55b29be..732e1cf0 100644 --- a/libcaja-private/caja-saved-search-file.c +++ b/libcaja-private/caja-saved-search-file.c @@ -28,7 +28,6 @@ G_DEFINE_TYPE(CajaSavedSearchFile, caja_saved_search_file, CAJA_TYPE_VFS_FILE) - static void caja_saved_search_file_init (CajaSavedSearchFile *search_file) { diff --git a/libcaja-private/caja-saved-search-file.h b/libcaja-private/caja-saved-search-file.h index 42089993..327d88f1 100644 --- a/libcaja-private/caja-saved-search-file.h +++ b/libcaja-private/caja-saved-search-file.h @@ -40,7 +40,6 @@ #define CAJA_SAVED_SEARCH_FILE_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS ((obj), CAJA_TYPE_SAVED_SEARCH_FILE, CajaSavedSearchFileClass)) - typedef struct CajaSavedSearchFileDetails CajaSavedSearchFileDetails; typedef struct diff --git a/libcaja-private/caja-search-directory-file.c b/libcaja-private/caja-search-directory-file.c index f455dc01..0984caf6 100644 --- a/libcaja-private/caja-search-directory-file.c +++ b/libcaja-private/caja-search-directory-file.c @@ -46,7 +46,6 @@ struct CajaSearchDirectoryFileDetails G_DEFINE_TYPE(CajaSearchDirectoryFile, caja_search_directory_file, CAJA_TYPE_FILE); - static void search_directory_file_monitor_add (CajaFile *file, gconstpointer client, @@ -185,7 +184,6 @@ caja_search_directory_file_update_display_name (CajaSearchDirectoryFile *search_ char *display_name; gboolean changed; - display_name = NULL; file = CAJA_FILE (search_file); if (file->details->directory) diff --git a/libcaja-private/caja-search-directory.c b/libcaja-private/caja-search-directory.c index 8209e546..4613b564 100644 --- a/libcaja-private/caja-search-directory.c +++ b/libcaja-private/caja-search-directory.c @@ -493,7 +493,6 @@ search_cancel_callback (CajaDirectory *directory, } } - static void search_engine_hits_added (CajaSearchEngine *engine, GList *hits, CajaSearchDirectory *search) @@ -686,7 +685,6 @@ search_get_file_list (CajaDirectory *directory) return caja_file_list_copy (search->details->files); } - static gboolean search_is_editable (CajaDirectory *directory) { @@ -806,7 +804,6 @@ caja_search_directory_generate_new_uri (void) return uri; } - void caja_search_directory_set_query (CajaSearchDirectory *search, CajaQuery *query) @@ -901,7 +898,6 @@ caja_search_directory_is_indexed (CajaSearchDirectory *search) return caja_search_engine_is_indexed (search->details->engine); } - void caja_search_directory_save_to_file (CajaSearchDirectory *search, const char *save_file_uri) diff --git a/libcaja-private/caja-search-engine-beagle.c b/libcaja-private/caja-search-engine-beagle.c index 542ad95b..60a0be65 100644 --- a/libcaja-private/caja-search-engine-beagle.c +++ b/libcaja-private/caja-search-engine-beagle.c @@ -410,7 +410,6 @@ caja_search_engine_beagle_init (CajaSearchEngineBeagle *engine) engine->details = g_new0 (CajaSearchEngineBeagleDetails, 1); } - CajaSearchEngine * caja_search_engine_beagle_new (void) { diff --git a/libcaja-private/caja-search-engine-simple.c b/libcaja-private/caja-search-engine-simple.c index cdf7ef91..207baeaa 100644 --- a/libcaja-private/caja-search-engine-simple.c +++ b/libcaja-private/caja-search-engine-simple.c @@ -54,7 +54,6 @@ typedef struct gint64 size; } SearchThreadData; - struct CajaSearchEngineSimpleDetails { CajaQuery *query; @@ -173,7 +172,6 @@ typedef struct SearchThreadData *thread_data; } SearchHits; - static gboolean search_thread_add_hits_idle (gpointer user_data) { @@ -219,7 +217,6 @@ send_batch (SearchThreadData *data) G_FILE_ATTRIBUTE_STANDARD_TYPE "," \ G_FILE_ATTRIBUTE_ID_FILE - /* Stolen code * file: glocalfileinfo.c * function: hex_unescape_string @@ -620,7 +617,6 @@ next: g_object_unref (enumerator); } - static gpointer search_thread_func (gpointer user_data) { @@ -749,7 +745,6 @@ caja_search_engine_simple_init (CajaSearchEngineSimple *engine) engine->details = g_new0 (CajaSearchEngineSimpleDetails, 1); } - CajaSearchEngine * caja_search_engine_simple_new (void) { diff --git a/libcaja-private/caja-search-engine-tracker.c b/libcaja-private/caja-search-engine-tracker.c index 102ca060..21784230 100644 --- a/libcaja-private/caja-search-engine-tracker.c +++ b/libcaja-private/caja-search-engine-tracker.c @@ -38,7 +38,6 @@ typedef enum TRACKER_0_8 = 1 << 2 } TrackerVersion; - /* tracker 0.6 API */ typedef void (*TrackerArrayReply) (char **result, GError *error, gpointer user_data); @@ -48,7 +47,6 @@ static void (*tracker_disconnect) (TrackerClient *client) = NULL; static void (*tracker_cancel_last_call) (TrackerClient *client) = NULL; static int (*tracker_get_version) (TrackerClient *client, GError **error) = NULL; - static void (*tracker_search_metadata_by_text_async) (TrackerClient *client, const char *query, TrackerArrayReply callback, @@ -70,7 +68,6 @@ static void (*tracker_search_metadata_by_text_and_mime_and_location_async) (Trac TrackerArrayReply callback, gpointer user_data) = NULL; - /* tracker 0.8 API */ typedef enum { @@ -89,7 +86,6 @@ static guint (*tracker_resources_sparql_query_async) (TrackerClient *c TrackerReplyGPtrArray callback, gpointer user_data) = NULL; - static struct TrackerDlMapping { const char *fn_name; @@ -110,7 +106,6 @@ static struct TrackerDlMapping #undef MAP }; - static TrackerVersion open_libtracker (void) { @@ -178,7 +173,6 @@ open_libtracker (void) return version; } - struct CajaSearchEngineTrackerDetails { CajaQuery *query; @@ -220,7 +214,6 @@ finalize (GObject *object) EEL_CALL_PARENT (G_OBJECT_CLASS, finalize, (object)); } - /* stolen from tracker sources, tracker.c */ static void sparql_append_string_literal (GString *sparql, @@ -237,7 +230,6 @@ sparql_append_string_literal (GString *sparql, g_free (s); } - static void search_callback (gpointer results, GError *error, gpointer user_data) { @@ -308,7 +300,6 @@ search_callback (gpointer results, GError *error, gpointer user_data) g_list_free_full (hit_uris, g_free); } - static void caja_search_engine_tracker_start (CajaSearchEngine *engine) { @@ -321,7 +312,6 @@ caja_search_engine_tracker_start (CajaSearchEngine *engine) tracker = CAJA_SEARCH_ENGINE_TRACKER (engine); - if (tracker->details->query_pending) { return; @@ -526,7 +516,6 @@ caja_search_engine_tracker_init (CajaSearchEngineTracker *engine) engine->details = g_new0 (CajaSearchEngineTrackerDetails, 1); } - CajaSearchEngine * caja_search_engine_tracker_new (void) { diff --git a/libcaja-private/caja-search-engine.c b/libcaja-private/caja-search-engine.c index 20a54190..234575de 100644 --- a/libcaja-private/caja-search-engine.c +++ b/libcaja-private/caja-search-engine.c @@ -160,7 +160,6 @@ caja_search_engine_start (CajaSearchEngine *engine) CAJA_SEARCH_ENGINE_GET_CLASS (engine)->start (engine); } - void caja_search_engine_stop (CajaSearchEngine *engine) { @@ -187,7 +186,6 @@ caja_search_engine_hits_added (CajaSearchEngine *engine, GList *hits) g_signal_emit (engine, signals[HITS_ADDED], 0, hits); } - void caja_search_engine_hits_subtracted (CajaSearchEngine *engine, GList *hits) { @@ -196,7 +194,6 @@ caja_search_engine_hits_subtracted (CajaSearchEngine *engine, GList *hits) g_signal_emit (engine, signals[HITS_SUBTRACTED], 0, hits); } - void caja_search_engine_finished (CajaSearchEngine *engine) { diff --git a/libcaja-private/caja-sidebar-provider.c b/libcaja-private/caja-sidebar-provider.c index eb23f886..263a0334 100644 --- a/libcaja-private/caja-sidebar-provider.c +++ b/libcaja-private/caja-sidebar-provider.c @@ -66,7 +66,6 @@ caja_sidebar_provider_create (CajaSidebarProvider *provider, return (* CAJA_SIDEBAR_PROVIDER_GET_IFACE (provider)->create) (provider, window); } - GList * caja_list_sidebar_providers (void) { diff --git a/libcaja-private/caja-sidebar.c b/libcaja-private/caja-sidebar.c index 2d2b06cc..60c7710e 100644 --- a/libcaja-private/caja-sidebar.c +++ b/libcaja-private/caja-sidebar.c @@ -84,7 +84,6 @@ caja_sidebar_get_type (void) return type; } - const char * caja_sidebar_get_sidebar_id (CajaSidebar *sidebar) { diff --git a/libcaja-private/caja-sidebar.h b/libcaja-private/caja-sidebar.h index 7eeacb36..5954c659 100644 --- a/libcaja-private/caja-sidebar.h +++ b/libcaja-private/caja-sidebar.h @@ -56,7 +56,6 @@ extern "C" { void (* is_visible_changed) (CajaSidebar *sidebar, gboolean is_visible); - /* Padding for future expansion */ void (*_reserved1) (void); void (*_reserved2) (void); diff --git a/libcaja-private/caja-thumbnails.c b/libcaja-private/caja-thumbnails.c index 69d4a150..527ef256 100644 --- a/libcaja-private/caja-thumbnails.c +++ b/libcaja-private/caja-thumbnails.c @@ -152,7 +152,6 @@ get_thumbnail_factory (void) return thumbnail_factory; } - /* This function is added as a very low priority idle function to start the thread to create any needed thumbnails. It is added with a very low priority so that it doesn't delay showing the directory in the icon/list views. @@ -258,12 +257,10 @@ caja_thumbnail_prioritize (const char *file_uri) g_mutex_unlock (&thumbnails_mutex); } - /*************************************************************************** * Thumbnail Thread Functions. ***************************************************************************/ - /* This is a one-shot idle callback called from the main loop to call notify_file_changed() for a thumbnail. It frees the uri afterwards. We do this in an idle callback as I don't think caja_file_changed() is @@ -411,7 +408,6 @@ caja_create_thumbnail (CajaFile *file) info->original_file_mtime = file_mtime; - #ifdef DEBUG_THUMBNAILS g_message ("(Main Thread) Locking mutex\n"); #endif diff --git a/libcaja-private/caja-thumbnails.h b/libcaja-private/caja-thumbnails.h index 95ffb7fb..5147dc09 100644 --- a/libcaja-private/caja-thumbnails.h +++ b/libcaja-private/caja-thumbnails.h @@ -40,5 +40,4 @@ gboolean caja_thumbnail_is_mimetype_limited_by_size void caja_thumbnail_remove_from_queue (const char *file_uri); void caja_thumbnail_prioritize (const char *file_uri); - #endif /* CAJA_THUMBNAILS_H */ diff --git a/libcaja-private/caja-tree-view-drag-dest.c b/libcaja-private/caja-tree-view-drag-dest.c index 19aaae63..6033c07e 100644 --- a/libcaja-private/caja-tree-view-drag-dest.c +++ b/libcaja-private/caja-tree-view-drag-dest.c @@ -96,7 +96,6 @@ static const GtkTargetEntry drag_types [] = { CAJA_ICON_DND_RAW_TYPE, 0, CAJA_ICON_DND_RAW } }; - static void gtk_tree_view_vertical_autoscroll (GtkTreeView *tree_view) { @@ -516,7 +515,6 @@ drag_motion_callback (GtkWidget *widget, gtk_tree_view_get_dest_row_at_pos (GTK_TREE_VIEW (widget), x, y, &path, &pos); - if (!dest->details->have_drag_data) { res = get_drag_data (dest, context, time); @@ -895,7 +893,6 @@ receive_xds (CajaTreeViewDragDest *dest, return TRUE; } - static gboolean drag_data_received_callback (GtkWidget *widget, GdkDragContext *context, @@ -1272,8 +1269,6 @@ caja_tree_view_drag_dest_class_init (CajaTreeViewDragDestClass *class) G_TYPE_INT); } - - CajaTreeViewDragDest * caja_tree_view_drag_dest_new (GtkTreeView *tree_view) { diff --git a/libcaja-private/caja-ui-utilities.c b/libcaja-private/caja-ui-utilities.c index 9b184164..afe0bed9 100644 --- a/libcaja-private/caja-ui-utilities.c +++ b/libcaja-private/caja-ui-utilities.c @@ -71,7 +71,6 @@ caja_ui_prepare_merge_ui (GtkUIManager *ui_manager, g_object_unref (*action_group); /* owned by ui manager */ } - char * caja_get_ui_directory (void) { diff --git a/libcaja-private/caja-vfs-file.c b/libcaja-private/caja-vfs-file.c index 1f64d93d..8c614bd6 100644 --- a/libcaja-private/caja-vfs-file.c +++ b/libcaja-private/caja-vfs-file.c @@ -431,7 +431,6 @@ vfs_file_mount_callback (GObject *source_object, } } - static void vfs_file_mount (CajaFile *file, GMountOperation *mount_op, @@ -620,7 +619,6 @@ vfs_file_start_callback (GObject *source_object, } } - static void vfs_file_start (CajaFile *file, GMountOperation *mount_op, diff --git a/libcaja-private/caja-view-factory.c b/libcaja-private/caja-view-factory.c index e5e4219f..cc35c232 100644 --- a/libcaja-private/caja-view-factory.c +++ b/libcaja-private/caja-view-factory.c @@ -44,7 +44,6 @@ caja_view_factory_lookup (const char *id) g_return_val_if_fail (id != NULL, NULL); - for (l = registered_views; l != NULL; l = l->next) { view_info = l->data; @@ -130,4 +129,3 @@ caja_view_factory_get_views_for_uri (const char *uri, return g_list_reverse (res); } - diff --git a/libcaja-private/caja-view-factory.h b/libcaja-private/caja-view-factory.h index 65d9124c..765adafd 100644 --- a/libcaja-private/caja-view-factory.h +++ b/libcaja-private/caja-view-factory.h @@ -54,7 +54,6 @@ extern "C" { const char *mime_type); }; - void caja_view_factory_register (CajaViewInfo *view_info); const CajaViewInfo *caja_view_factory_lookup (const char *id); CajaView * caja_view_factory_create (const char *id, @@ -67,9 +66,6 @@ extern "C" { GFileType file_type, const char *mime_type); - - - #ifdef __cplusplus } #endif diff --git a/libcaja-private/caja-view.c b/libcaja-private/caja-view.c index a3c55421..010b361b 100644 --- a/libcaja-private/caja-view.c +++ b/libcaja-private/caja-view.c @@ -203,7 +203,6 @@ caja_view_get_title (CajaView *view) } } - gboolean caja_view_supports_zooming (CajaView *view) { @@ -327,4 +326,3 @@ caja_view_drop_proxy_received_netscape_url (CajaView *view, } } - diff --git a/libcaja-private/caja-view.h b/libcaja-private/caja-view.h index 93fafdab..b287170e 100644 --- a/libcaja-private/caja-view.h +++ b/libcaja-private/caja-view.h @@ -40,7 +40,6 @@ extern "C" { #define CAJA_IS_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CAJA_TYPE_VIEW)) #define CAJA_VIEW_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), CAJA_TYPE_VIEW, CajaViewIface)) - typedef struct _CajaView CajaView; /* dummy typedef */ typedef struct _CajaViewIface CajaViewIface; @@ -97,7 +96,6 @@ extern "C" { have this function return NULL, or just don't supply a function */ char * (* get_title) (CajaView *view); - /* Zoom support */ gboolean (* supports_zooming) (CajaView *view); void (* bump_zoom_level) (CajaView *view, diff --git a/libcaja-private/caja-window-info.h b/libcaja-private/caja-window-info.h index 00286e40..eefeb1a4 100644 --- a/libcaja-private/caja-window-info.h +++ b/libcaja-private/caja-window-info.h @@ -91,7 +91,6 @@ extern "C" { typedef struct CajaWindowSlot CajaWindowSlot; #endif - typedef CajaWindowSlot CajaWindowSlotInfo; typedef CajaWindow CajaWindowInfo; diff --git a/libcaja-private/caja-window-slot-info.h b/libcaja-private/caja-window-slot-info.h index 49804820..e9fada53 100644 --- a/libcaja-private/caja-window-slot-info.h +++ b/libcaja-private/caja-window-slot-info.h @@ -28,7 +28,6 @@ #include "caja-window-info.h" #include "caja-view.h" - #define CAJA_TYPE_WINDOW_SLOT_INFO (caja_window_slot_info_get_type ()) #define CAJA_WINDOW_SLOT_INFO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CAJA_TYPE_WINDOW_SLOT_INFO, CajaWindowSlotInfo)) #define CAJA_IS_WINDOW_SLOT_INFO(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CAJA_TYPE_WINDOW_SLOT_INFO)) @@ -78,7 +77,6 @@ struct _CajaWindowSlotInfoIface void (* make_hosting_pane_active) (CajaWindowSlotInfo *slot); }; - GType caja_window_slot_info_get_type (void); CajaWindowInfo * caja_window_slot_info_get_window (CajaWindowSlotInfo *slot); #define caja_window_slot_info_open_location(slot, location, mode, flags, selection) \ diff --git a/src/caja-application.c b/src/caja-application.c index 065f8cbd..ecfc6a82 100644 --- a/src/caja-application.c +++ b/src/caja-application.c @@ -925,7 +925,6 @@ caja_window_delete_event_callback (GtkWidget *widget, return TRUE; } - static CajaWindow * create_window (CajaApplication *application, GType window_type, @@ -1962,7 +1961,6 @@ caja_application_local_command_line (GApplication *application, g_option_context_add_group (context, egg_sm_client_get_option_group ()); - /* we need to do this here, as parsing the EggSMClient option context, * unsets this variable. */ @@ -1972,7 +1970,6 @@ caja_application_local_command_line (GApplication *application, self->priv->autostart = TRUE; } - argv = *arguments; argc = g_strv_length (argv); @@ -2237,7 +2234,6 @@ init_gtk_accels (void) G_CALLBACK (queue_accel_map_save_callback), NULL); } - static void caja_application_startup (GApplication *app) { diff --git a/src/caja-autorun-software.c b/src/caja-autorun-software.c index fef3c483..543206c5 100644 --- a/src/caja-autorun-software.c +++ b/src/caja-autorun-software.c @@ -22,7 +22,6 @@ Author: David Zeuthen <[email protected]> */ - #include <config.h> #include <unistd.h> #include <string.h> @@ -226,7 +225,6 @@ present_autorun_for_software_dialog (GMount *mount) * etc.) */ - icon = g_mount_get_icon (mount); icon_size = caja_get_icon_size_for_stock_size (GTK_ICON_SIZE_DIALOG); icon_info = caja_icon_info_lookup (icon, icon_size, diff --git a/src/caja-bookmark-list.c b/src/caja-bookmark-list.c index 8be0a00b..effd57c1 100644 --- a/src/caja-bookmark-list.c +++ b/src/caja-bookmark-list.c @@ -227,7 +227,6 @@ do_constructor (GType type, return retval; } - static void caja_bookmark_list_class_init (CajaBookmarkListClass *class) { diff --git a/src/caja-bookmarks-sidebar.c b/src/caja-bookmarks-sidebar.c index 3a06f065..fdff6e5d 100644 --- a/src/caja-bookmarks-sidebar.c +++ b/src/caja-bookmarks-sidebar.c @@ -51,7 +51,6 @@ #include "caja-bookmarks-sidebar.h" - typedef struct { GtkScrolledWindowClass parent; diff --git a/src/caja-bookmarks-window.c b/src/caja-bookmarks-window.c index e97314cd..4abff840 100644 --- a/src/caja-bookmarks-window.c +++ b/src/caja-bookmarks-window.c @@ -673,7 +673,6 @@ on_remove_button_clicked (GtkButton *button, bookmarks_delete_bookmark (); } - /* This is a bit of a kludge to get DnD to work. We check if the row in the GtkListStore matches the one in the bookmark list. If it doesn't, we assume the bookmark has just been dragged here and we insert it into the bookmark @@ -839,7 +838,6 @@ on_selection_changed (GtkTreeSelection *treeselection, g_free (entry_text); } - static void update_bookmark_from_text (void) { diff --git a/src/caja-connect-server-dialog.c b/src/caja-connect-server-dialog.c index 9caaced5..d97bcb0a 100644 --- a/src/caja-connect-server-dialog.c +++ b/src/caja-connect-server-dialog.c @@ -975,7 +975,6 @@ caja_connect_server_dialog_init (CajaConnectServerDialog *dialog) 1, get_method_description (&(methods[i])), -1); - if (methods[i].flags & DEFAULT_METHOD) { gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo), &iter); diff --git a/src/caja-connect-server-operation.h b/src/caja-connect-server-operation.h index 84df443d..755468e8 100644 --- a/src/caja-connect-server-operation.h +++ b/src/caja-connect-server-operation.h @@ -59,5 +59,4 @@ GType caja_connect_server_operation_get_type (void); GMountOperation * caja_connect_server_operation_new (CajaConnectServerDialog *dialog); - #endif /* __CAJA_CONNECT_SERVER_OPERATION_H__ */ diff --git a/src/caja-emblem-sidebar.c b/src/caja-emblem-sidebar.c index ed65055e..f6fc6860 100644 --- a/src/caja-emblem-sidebar.c +++ b/src/caja-emblem-sidebar.c @@ -317,7 +317,6 @@ create_rename_emblem_dialog (CajaEmblemSidebar *emblem_sidebar, gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), label, FALSE, FALSE, 8); - hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8); gtk_box_pack_start (GTK_BOX (hbox), image, TRUE, TRUE, 8); @@ -335,7 +334,6 @@ create_rename_emblem_dialog (CajaEmblemSidebar *emblem_sidebar, gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox, TRUE, TRUE, 8); - return dialog; } @@ -407,15 +405,12 @@ create_emblem_widget_with_pixbuf (CajaEmblemSidebar *emblem_sidebar, prelight_pixbuf = eel_create_spotlight_pixbuf (pixbuf); - gtk_drag_source_set (event_box, GDK_BUTTON1_MASK, drag_types, G_N_ELEMENTS (drag_types), GDK_ACTION_COPY | GDK_ACTION_MOVE); gtk_drag_source_set_icon_pixbuf (event_box, pixbuf); - - g_signal_connect (event_box, "button_press_event", G_CALLBACK (caja_emblem_sidebar_button_press_cb), emblem_sidebar); @@ -489,13 +484,11 @@ emblem_name_entry_changed_cb (GtkWidget *entry, Emblem *emblem) emblem->name = g_strdup (text); } - static void destroy_emblem (Emblem *emblem, gpointer user_data) { g_return_if_fail (emblem != NULL); - if (emblem->pixbuf != NULL) { g_object_unref (emblem->pixbuf); @@ -1004,7 +997,6 @@ caja_emblem_sidebar_populate (CajaEmblemSidebar *emblem_sidebar) emblem_widget); } - icons = caja_emblem_list_available (); l = icons; diff --git a/src/caja-file-management-properties.c b/src/caja-file-management-properties.c index 5a4368a7..957a87d2 100644 --- a/src/caja-file-management-properties.c +++ b/src/caja-file-management-properties.c @@ -235,7 +235,6 @@ preferences_show_help (GtkWindow *parent, } } - static void caja_file_management_properties_dialog_response_cb (GtkDialog *parent, int response_id, @@ -721,7 +720,6 @@ extension_state_toggled (GtkCellRendererToggle *cell, gchar *path_str, gpointer gtk_tree_path_free (path); } - static void caja_file_management_properties_dialog_setup_media_page (GtkBuilder *builder) { @@ -756,7 +754,6 @@ caja_file_management_properties_dialog_setup_media_page (GtkBuilder *builder) gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (other_type_list_store), 1, GTK_SORT_ASCENDING); - content_types = g_content_types_get_registered (); for (l = content_types; l != NULL; l = l->next) @@ -1220,7 +1217,6 @@ caja_file_management_properties_dialog_setup (GtkBuilder *builder, GtkWindow *wi G_CALLBACK(caja_file_management_properties_dialog_update_media_sensitivity), builder); - /* UI callbacks */ dialog = GTK_WIDGET (gtk_builder_get_object (builder, "file_management_dialog")); g_signal_connect_data (dialog, "response", diff --git a/src/caja-freedesktop-dbus.h b/src/caja-freedesktop-dbus.h index a3ac1504..89e80396 100644 --- a/src/caja-freedesktop-dbus.h +++ b/src/caja-freedesktop-dbus.h @@ -21,7 +21,6 @@ * Stefano Karapetsas <[email protected]> */ - #ifndef __CAJA_FREEDESKTOP_DBUS_H__ #define __CAJA_FREEDESKTOP_DBUS_H__ diff --git a/src/caja-history-sidebar.c b/src/caja-history-sidebar.c index 1a269375..cc3b9202 100644 --- a/src/caja-history-sidebar.c +++ b/src/caja-history-sidebar.c @@ -58,7 +58,6 @@ typedef struct GObjectClass parent; } CajaHistorySidebarProviderClass; - enum { HISTORY_SIDEBAR_COLUMN_ICON, diff --git a/src/caja-image-properties-page.c b/src/caja-image-properties-page.c index 8cdf19ce..afb66c9e 100644 --- a/src/caja-image-properties-page.c +++ b/src/caja-image-properties-page.c @@ -91,7 +91,6 @@ typedef struct GObjectClass parent; } CajaImagePropertiesPageProviderClass; - static GType caja_image_properties_page_provider_get_type (void); static void property_page_provider_iface_init (CajaPropertyPageProviderIface *iface); @@ -718,7 +717,6 @@ property_page_provider_iface_init (CajaPropertyPageProviderIface *iface) iface->get_pages = get_property_pages; } - static void caja_image_properties_page_provider_init (CajaImagePropertiesPageProvider *sidebar) { diff --git a/src/caja-information-panel.c b/src/caja-information-panel.c index d2eeb150..41a2c493 100644 --- a/src/caja-information-panel.c +++ b/src/caja-information-panel.c @@ -141,7 +141,6 @@ typedef struct GObjectClass parent; } CajaInformationPanelProviderClass; - G_DEFINE_TYPE_WITH_CODE (CajaInformationPanel, caja_information_panel, EEL_TYPE_BACKGROUND_BOX, G_ADD_PRIVATE (CajaInformationPanel) G_IMPLEMENT_INTERFACE (CAJA_TYPE_SIDEBAR, @@ -151,7 +150,6 @@ G_DEFINE_TYPE_WITH_CODE (CajaInformationPanelProvider, caja_information_panel_pr G_IMPLEMENT_INTERFACE (CAJA_TYPE_SIDEBAR_PROVIDER, sidebar_provider_iface_init)); - static const char * caja_information_panel_get_sidebar_id (CajaSidebar *sidebar) { diff --git a/src/caja-main.c b/src/caja-main.c index 68426509..75ccbdf5 100644 --- a/src/caja-main.c +++ b/src/caja-main.c @@ -278,4 +278,3 @@ main (int argc, char *argv[]) return retval; } - diff --git a/src/caja-navigation-window-menus.c b/src/caja-navigation-window-menus.c index 3d2ef60c..b3a6d948 100644 --- a/src/caja-navigation-window-menus.c +++ b/src/caja-navigation-window-menus.c @@ -65,7 +65,6 @@ static void schedule_refresh_go_menu (CajaNavigationWindow *window); - static void action_close_all_windows_callback (GtkAction *action, gpointer user_data) @@ -202,8 +201,6 @@ action_show_hide_toolbar_callback (GtkAction *action, G_GNUC_END_IGNORE_DEPRECATIONS; } - - static void action_show_hide_sidebar_callback (GtkAction *action, gpointer user_data) @@ -612,7 +609,6 @@ action_new_window_callback (GtkAction *action, caja_window_new_window (current_window); } - static void action_new_tab_callback (GtkAction *action, gpointer user_data) @@ -1065,7 +1061,6 @@ caja_navigation_window_initialize_actions (CajaNavigationWindow *window) caja_navigation_window_update_split_view_actions_sensitivity (window); } - /** * caja_window_initialize_menus * diff --git a/src/caja-navigation-window-pane.c b/src/caja-navigation-window-pane.c index 29018b50..19669411 100644 --- a/src/caja-navigation-window-pane.c +++ b/src/caja-navigation-window-pane.c @@ -107,7 +107,6 @@ search_bar_focus_in_callback (CajaSearchBar *bar, caja_window_set_active_pane (pane->window, pane); } - static void search_bar_activate_callback (CajaSearchBar *bar, CajaNavigationWindowPane *pane) @@ -742,7 +741,6 @@ caja_navigation_window_pane_setup (CajaNavigationWindowPane *pane) gtk_widget_set_size_request (pane->widget, 60, 60); } - void caja_navigation_window_pane_show_location_bar_temporarily (CajaNavigationWindowPane *pane) { diff --git a/src/caja-navigation-window-slot.c b/src/caja-navigation-window-slot.c index 7f89834c..1e78929e 100644 --- a/src/caja-navigation-window-slot.c +++ b/src/caja-navigation-window-slot.c @@ -124,7 +124,6 @@ query_editor_changed_callback (CajaSearchBar *bar, caja_directory_unref (directory); } - static void caja_navigation_window_slot_update_query_editor (CajaWindowSlot *slot) { diff --git a/src/caja-navigation-window-slot.h b/src/caja-navigation-window-slot.h index 6766b201..84d4b1a7 100644 --- a/src/caja-navigation-window-slot.h +++ b/src/caja-navigation-window-slot.h @@ -30,7 +30,6 @@ typedef struct CajaNavigationWindowSlot CajaNavigationWindowSlot; typedef struct CajaNavigationWindowSlotClass CajaNavigationWindowSlotClass; - #define CAJA_TYPE_NAVIGATION_WINDOW_SLOT (caja_navigation_window_slot_get_type()) #define CAJA_NAVIGATION_WINDOW_SLOT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), CAJA_NAVIGATION_WINDOW_SLOT_CLASS, CajaNavigationWindowSlotClass)) #define CAJA_NAVIGATION_WINDOW_SLOT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CAJA_TYPE_NAVIGATION_WINDOW_SLOT, CajaNavigationWindowSlot)) diff --git a/src/caja-navigation-window.c b/src/caja-navigation-window.c index 19174265..0768d326 100644 --- a/src/caja-navigation-window.c +++ b/src/caja-navigation-window.c @@ -91,7 +91,6 @@ static void mouse_forward_button_changed (gpointer callbac static void use_extra_mouse_buttons_changed (gpointer callback_data); static CajaWindowSlot *create_extra_pane (CajaNavigationWindow *window); - G_DEFINE_TYPE_WITH_PRIVATE (CajaNavigationWindow, caja_navigation_window, CAJA_TYPE_WINDOW) #define parent_class caja_navigation_window_parent_class @@ -1018,7 +1017,6 @@ caja_navigation_window_status_bar_showing (CajaNavigationWindow *window) return TRUE; } - void caja_navigation_window_hide_toolbar (CajaNavigationWindow *window) { diff --git a/src/caja-navigation-window.h b/src/caja-navigation-window.h index fb9d7bbe..ea5390b0 100644 --- a/src/caja-navigation-window.h +++ b/src/caja-navigation-window.h @@ -58,7 +58,6 @@ typedef struct _CajaNavigationWindow CajaNavigationWindow; typedef struct _CajaNavigationWindowClass CajaNavigationWindowClass; typedef struct _CajaNavigationWindowPrivate CajaNavigationWindowPrivate; - struct _CajaNavigationWindow { CajaWindow parent_object; @@ -72,7 +71,6 @@ struct _CajaNavigationWindow GList *sidebar_panels; }; - struct _CajaNavigationWindowClass { CajaWindowClass parent_spot; diff --git a/src/caja-notebook.c b/src/caja-notebook.c index e576bfcb..ded19ead 100644 --- a/src/caja-notebook.c +++ b/src/caja-notebook.c @@ -199,7 +199,6 @@ caja_notebook_constructed (GObject *object) gtk_widget_add_events (widget, GDK_SCROLL_MASK); } - void caja_notebook_sync_loading (CajaNotebook *notebook, CajaWindowSlot *slot) @@ -405,7 +404,6 @@ caja_notebook_add_tab (CajaNotebook *notebook, caja_notebook_sync_tab_label (notebook, slot); caja_notebook_sync_loading (notebook, slot); - /* FIXME gtk bug! */ /* FIXME: this should be fixed in gtk 2.12; check & remove this! */ /* The signal handler may have reordered the tabs */ diff --git a/src/caja-notes-viewer.c b/src/caja-notes-viewer.c index 65916f9e..10f03e0b 100644 --- a/src/caja-notes-viewer.c +++ b/src/caja-notes-viewer.c @@ -73,7 +73,6 @@ typedef struct GObjectClass parent; } CajaNotesViewerProviderClass; - G_DEFINE_TYPE_WITH_CODE (CajaNotesViewer, caja_notes_viewer, GTK_TYPE_SCROLLED_WINDOW, G_IMPLEMENT_INTERFACE (CAJA_TYPE_SIDEBAR, caja_notes_viewer_sidebar_iface_init)); @@ -86,7 +85,6 @@ G_DEFINE_TYPE_WITH_CODE (CajaNotesViewerProvider, caja_notes_viewer_provider, G_ G_IMPLEMENT_INTERFACE (CAJA_TYPE_SIDEBAR_PROVIDER, sidebar_provider_iface_init)); - struct _CajaNotesViewerDetails { GtkWidget *note_text_field; @@ -383,7 +381,6 @@ caja_notes_viewer_finalize (GObject *object) G_OBJECT_CLASS (caja_notes_viewer_parent_class)->finalize (object); } - static void caja_notes_viewer_class_init (CajaNotesViewerClass *class) { @@ -484,7 +481,6 @@ get_property_pages (CajaPropertyPageProvider *provider, char *uri; CajaNotesViewer *viewer; - /* Only show the property page if 1 file is selected */ if (!files || files->next != NULL) { diff --git a/src/caja-pathbar.c b/src/caja-pathbar.c index a0789029..332b6c1e 100644 --- a/src/caja-pathbar.c +++ b/src/caja-pathbar.c @@ -142,7 +142,6 @@ static gboolean caja_path_bar_update_path (CajaPathBar *path_bar, GFile *file_path, gboolean emit_signal); - static GtkWidget * get_slider_button (CajaPathBar *path_bar, const gchar *arrow_type) @@ -186,7 +185,6 @@ update_button_types (CajaPathBar *path_bar) } } - static void desktop_location_changed_callback (gpointer user_data) { @@ -431,7 +429,6 @@ caja_path_bar_class_init (CajaPathBarClass *path_bar_class) gtk_container_class_handle_border_width (container_class); } - static void caja_path_bar_finalize (GObject *object) { @@ -548,7 +545,6 @@ caja_path_bar_get_preferred_width (GtkWidget *widget, &slider_width, NULL); - if (path_bar->button_list) { *minimum += (path_bar->spacing + slider_width) * 2; *natural += (path_bar->spacing + slider_width) * 2; @@ -930,7 +926,6 @@ caja_path_bar_scroll (GtkWidget *widget, return FALSE; } - static void caja_path_bar_add (GtkContainer *container, GtkWidget *widget) @@ -1247,8 +1242,6 @@ caja_path_bar_state_flags_changed (GtkWidget *widget, } } - - /* Changes the icons wherever it is needed */ static void reload_icons (CajaPathBar *path_bar) @@ -1384,7 +1377,6 @@ button_drag_begin_cb (GtkWidget *widget, GINT_TO_POINTER (FALSE)); } - static CajaIconInfo * get_type_icon_info (ButtonData *button_data) { diff --git a/src/caja-pathbar.h b/src/caja-pathbar.h index fef82e7c..16966bf8 100644 --- a/src/caja-pathbar.h +++ b/src/caja-pathbar.h @@ -27,7 +27,6 @@ typedef struct _CajaPathBar CajaPathBar; typedef struct _CajaPathBarClass CajaPathBarClass; - #define CAJA_TYPE_PATH_BAR (caja_path_bar_get_type ()) #define CAJA_PATH_BAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CAJA_TYPE_PATH_BAR, CajaPathBar)) #define CAJA_PATH_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CAJA_TYPE_PATH_BAR, CajaPathBarClass)) diff --git a/src/caja-places-sidebar.c b/src/caja-places-sidebar.c index 1120caed..2cd22148 100644 --- a/src/caja-places-sidebar.c +++ b/src/caja-places-sidebar.c @@ -562,7 +562,6 @@ update_places (CajaPlacesSidebar *sidebar) location, mount_uri, last_uri, &last_iter, &select_path); - /* XDG directories */ xdg_dirs = NULL; for (index = 0; index < G_USER_N_DIRECTORIES; index++) { @@ -809,7 +808,6 @@ update_places (CajaPlacesSidebar *sidebar) } g_list_free (mounts); - /* add bookmarks */ bookmark_count = caja_bookmark_list_length (sidebar->bookmarks); @@ -1853,7 +1851,6 @@ bookmarks_check_popup_sensitivity (CajaPlacesSidebar *sidebar) } } - g_free (uri); } @@ -1906,7 +1903,6 @@ volume_mounted_cb (GVolume *volume, g_object_unref (G_OBJECT (mount)); } - eel_remove_weak_pointer (&(sidebar->go_to_after_mount_slot)); } @@ -3060,7 +3056,6 @@ bookmarks_button_press_event_cb (GtkWidget *widget, return FALSE; } - static void bookmarks_edited (GtkCellRenderer *cell, gchar *path_string, diff --git a/src/caja-places-sidebar.h b/src/caja-places-sidebar.h index 016f7573..c0026a0f 100644 --- a/src/caja-places-sidebar.h +++ b/src/caja-places-sidebar.h @@ -43,7 +43,6 @@ #define CAJA_PLACES_SIDEBAR_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS ((obj), CAJA_TYPE_PLACES_SIDEBAR, CajaPlacesSidebarClass)) - GType caja_places_sidebar_get_type (void); void caja_places_sidebar_register (void); diff --git a/src/caja-property-browser.c b/src/caja-property-browser.c index 565fc5f0..3351421e 100644 --- a/src/caja-property-browser.c +++ b/src/caja-property-browser.c @@ -168,7 +168,6 @@ static GdkPixbuf * make_color_drag_image (CajaPropertyBro const char *color_spec, gboolean trim_edges); - #define BROWSER_CATEGORIES_FILE_NAME "browser.xml" #define PROPERTY_BROWSER_WIDTH 540 @@ -196,10 +195,8 @@ static GtkTargetEntry drag_types[] = { "text/uri-list", 0, PROPERTY_TYPE } }; - G_DEFINE_TYPE_WITH_PRIVATE (CajaPropertyBrowser, caja_property_browser, GTK_TYPE_WINDOW) - /* Destroy the three dialogs for adding patterns/colors/emblems if any of them exist. */ static void @@ -433,7 +430,6 @@ caja_property_browser_init (CajaPropertyBrowser *property_browser) g_signal_connect_object (property_browser->details->add_button, "clicked", G_CALLBACK (add_new_button_callback), property_browser, 0); - /* now create the actual content, with the category pane and the content frame */ /* the actual contents are created when necessary */ @@ -581,7 +577,6 @@ caja_property_browser_drag_begin (GtkWidget *widget, } - /* drag and drop data get handler */ static void @@ -800,7 +795,6 @@ make_drag_image (CajaPropertyBrowser *property_browser, const char* file_name) return pixbuf; } - /* create a pixbuf and fill it with a color */ static GdkPixbuf* @@ -1274,7 +1268,6 @@ add_pattern_to_browser (GtkDialog *dialog, gint response_id, gpointer data) return; } - user_directory = caja_get_user_directory (); /* copy the image file to the patterns directory */ @@ -1305,7 +1298,6 @@ add_pattern_to_browser (GtkDialog *dialog, gint response_id, gpointer data) g_object_unref (dest); g_free (basename); - /* update the property browser's contents to show the new one */ caja_property_browser_update_contents (property_browser); @@ -1486,7 +1478,6 @@ show_color_selection_window (GtkWidget *widget, gpointer data) gtk_widget_show (GTK_WIDGET(property_browser->details->colors_dialog)); } - /* here's the routine to add a new color, by putting up a color selector */ static void @@ -1580,7 +1571,6 @@ emblem_dialog_clicked (GtkWidget *dialog, int which_button, CajaPropertyBrowser stripped_keyword = g_strstrip (g_strdup (new_keyword)); } - caja_emblem_install_custom_emblem (pixbuf, stripped_keyword, stripped_keyword, @@ -1948,7 +1938,6 @@ make_properties_from_directories (CajaPropertyBrowser *property_browser) blank = eel_image_table_add_empty_image (image_table); labeled_image_configure (EEL_LABELED_IMAGE (blank)); - num_images = eel_wrap_table_get_num_children (EEL_WRAP_TABLE (image_table)); g_assert (num_images > 0); eel_wrap_table_reorder_child (EEL_WRAP_TABLE (image_table), @@ -2373,7 +2362,6 @@ caja_property_browser_update_contents (CajaPropertyBrowser *property_browser) } gtk_widget_show (property_browser->details->add_button); - if (property_browser->details->remove_mode) { @@ -2488,7 +2476,6 @@ caja_property_browser_set_category (CajaPropertyBrowser *property_browser, caja_property_browser_update_contents (property_browser); } - /* here is the routine that populates the property browser with the appropriate information when the path changes */ @@ -2516,7 +2503,6 @@ emblems_changed_callback (GObject *signaller, caja_property_browser_update_contents (property_browser); } - static void emit_emblems_changed_signal (void) { diff --git a/src/caja-query-editor.c b/src/caja-query-editor.c index 0a20b04d..2c600c5d 100644 --- a/src/caja-query-editor.c +++ b/src/caja-query-editor.c @@ -74,7 +74,6 @@ typedef struct void *data; } CajaQueryEditorRow; - typedef struct { const char *name; @@ -526,7 +525,6 @@ tags_add_rows_from_query (CajaQueryEditor *editor, g_free (tags_str); } - /* Type */ static gboolean @@ -710,7 +708,6 @@ type_add_custom_type (CajaQueryEditorRow *row, -1); } - static void type_combo_changed (GtkComboBox *combo_box, CajaQueryEditorRow *row) { @@ -764,8 +761,6 @@ type_combo_changed (GtkComboBox *combo_box, CajaQueryEditorRow *row) } g_list_free (mime_infos); - - toplevel = gtk_widget_get_toplevel (GTK_WIDGET (combo_box)); dialog = gtk_dialog_new (); @@ -800,7 +795,6 @@ type_combo_changed (GtkComboBox *combo_box, CajaQueryEditorRow *row) selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)); gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE); - renderer = gtk_cell_renderer_text_new (); column = gtk_tree_view_column_new_with_attributes ("Name", renderer, @@ -991,7 +985,6 @@ remove_group_types_from_list (char **group_types, GList *mime_types) return mime_types; } - static void type_add_rows_from_query (CajaQueryEditor *editor, CajaQuery *query) @@ -1056,7 +1049,6 @@ type_add_rows_from_query (CajaQueryEditor *editor, /* End of row types */ - static GtkWidget *modtime_row_create_widgets(CajaQueryEditorRow *row) { GtkWidget *hbox = NULL; @@ -1195,7 +1187,6 @@ static void modtime_add_rows_from_query(CajaQueryEditor *editor, CajaQuery *quer { } - static GtkWidget *size_row_create_widgets(CajaQueryEditorRow *row) { GtkWidget *hbox = NULL; @@ -1382,7 +1373,6 @@ get_next_free_type (CajaQueryEditor *editor) gboolean found; GList *l; - for (type = 0; type < CAJA_QUERY_EDITOR_ROW_LAST; type++) { found = FALSE; diff --git a/src/caja-search-bar.c b/src/caja-search-bar.c index 9ae868c6..993880bb 100644 --- a/src/caja-search-bar.c +++ b/src/caja-search-bar.c @@ -56,7 +56,6 @@ EEL_CLASS_BOILERPLATE (CajaSearchBar, caja_search_bar, GTK_TYPE_EVENT_BOX) - static void finalize (GObject *object) { diff --git a/src/caja-self-check-functions.h b/src/caja-self-check-functions.h index ec503943..e2ec2158 100644 --- a/src/caja-self-check-functions.h +++ b/src/caja-self-check-functions.h @@ -26,7 +26,6 @@ * check functions in Caja proper. */ - #ifndef __CAJA_SELF_CHECK_FUNCTIONS_H__ #define __CAJA_SELF_CHECK_FUNCTIONS_H__ diff --git a/src/caja-side-pane.c b/src/caja-side-pane.c index 437709d2..44bd2df4 100644 --- a/src/caja-side-pane.c +++ b/src/caja-side-pane.c @@ -519,7 +519,6 @@ caja_side_pane_show_panel (CajaSidePane *side_pane, page_num); } - static void shortcut_clicked_callback (GtkWidget *button, gpointer user_data) diff --git a/src/caja-sidebar-title.c b/src/caja-sidebar-title.c index 38031d50..bcba35cc 100644 --- a/src/caja-sidebar-title.c +++ b/src/caja-sidebar-title.c @@ -290,7 +290,6 @@ caja_sidebar_title_select_text_color (CajaSidebarTitle *sidebar_title, setup_gc_with_fg (sidebar_title, LABEL_INFO_COLOR_ACTIVE, eel_gdk_rgba_is_dark (&color) ? light_info_color : dark_info_color); - /* If EelBackground is not set in the widget, we can safely * use the foreground color from the theme, because it will * always be displayed against the gtk background */ diff --git a/src/caja-spatial-window.h b/src/caja-spatial-window.h index 58d9b2a4..d892e729 100644 --- a/src/caja-spatial-window.h +++ b/src/caja-spatial-window.h @@ -61,7 +61,6 @@ struct _CajaSpatialWindowClass CajaWindowClass parent_spot; }; - GType caja_spatial_window_get_type (void); void caja_spatial_window_set_location_button (CajaSpatialWindow *window, GFile *location); diff --git a/src/caja-view-as-action.c b/src/caja-view-as-action.c index ad17ec19..69e8fb69 100644 --- a/src/caja-view-as-action.c +++ b/src/caja-view-as-action.c @@ -53,7 +53,6 @@ enum PROP_WINDOW }; - static void activate_nth_short_list_item (CajaWindow *window, guint index) { @@ -167,7 +166,6 @@ view_as_changed_callback (CajaWindow *window, } } - static void connect_proxy (GtkAction *action, GtkWidget *proxy) diff --git a/src/caja-window-manage-views.c b/src/caja-window-manage-views.c index f41d8e5f..1ba1a533 100644 --- a/src/caja-window-manage-views.c +++ b/src/caja-window-manage-views.c @@ -510,7 +510,6 @@ new_window_show_callback (GtkWidget *widget, user_data); } - void caja_window_slot_open_location_full (CajaWindowSlot *slot, GFile *location, @@ -754,7 +753,6 @@ caja_window_slot_open_location_with_selection (CajaWindowSlot *slot, flags, selection, NULL, NULL); } - void caja_window_slot_go_home (CajaWindowSlot *slot, gboolean new_tab) { @@ -833,7 +831,6 @@ report_nascent_content_view_failure_to_user (CajaWindowSlot *slot, g_free (message); } - const char * caja_window_slot_get_content_view_id (CajaWindowSlot *slot) { @@ -2226,7 +2223,6 @@ display_view_selection_failure (CajaWindow *window, CajaFile *file, g_free (detail_message); } - void caja_window_slot_stop_loading (CajaWindowSlot *slot) { diff --git a/src/caja-window-manage-views.h b/src/caja-window-manage-views.h index dbed9345..7bea55be 100644 --- a/src/caja-window-manage-views.h +++ b/src/caja-window-manage-views.h @@ -34,7 +34,6 @@ void caja_window_manage_views_close_slot (CajaWindowPane *pane, CajaWindowSlot *slot); - /* CajaWindowInfo implementation: */ void caja_window_report_load_underway (CajaWindow *window, CajaView *view); diff --git a/src/caja-window-menus.c b/src/caja-window-menus.c index 7737067e..3b65fa79 100644 --- a/src/caja-window-menus.c +++ b/src/caja-window-menus.c @@ -775,7 +775,6 @@ connect_proxy_cb (GtkUIManager *manager, g_signal_connect (proxy, "deselect", G_CALLBACK (menu_item_deselect_cb), window); - /* This is a way to easily get surfaces into the menu items */ icon = g_object_get_data (G_OBJECT (action), "menu-icon"); if (icon != NULL) diff --git a/src/caja-window-pane.c b/src/caja-window-pane.c index abc1388b..a4143b38 100644 --- a/src/caja-window-pane.c +++ b/src/caja-window-pane.c @@ -36,7 +36,6 @@ G_DEFINE_TYPE (CajaWindowPane, G_TYPE_OBJECT) #define parent_class caja_window_pane_parent_class - static inline CajaWindowSlot * get_first_inactive_slot (CajaWindowPane *pane) { @@ -198,7 +197,6 @@ real_sync_location_widgets (CajaWindowPane *pane) slot->location); } - void caja_window_pane_sync_location_widgets (CajaWindowPane *pane) { diff --git a/src/caja-window-pane.h b/src/caja-window-pane.h index 4f68b9eb..dc47a058 100644 --- a/src/caja-window-pane.h +++ b/src/caja-window-pane.h @@ -78,7 +78,6 @@ struct _CajaWindowPane GType caja_window_pane_get_type (void); CajaWindowPane *caja_window_pane_new (CajaWindow *window); - void caja_window_pane_show (CajaWindowPane *pane); void caja_window_pane_zoom_in (CajaWindowPane *pane); void caja_window_pane_zoom_to_level (CajaWindowPane *pane, CajaZoomLevel level); @@ -93,5 +92,4 @@ CajaWindowSlot* caja_window_pane_get_slot_for_content_box (CajaWindowPane *pane, void caja_window_pane_switch_to (CajaWindowPane *pane); void caja_window_pane_grab_focus (CajaWindowPane *pane); - #endif /* CAJA_WINDOW_PANE_H */ diff --git a/src/caja-window-private.h b/src/caja-window-private.h index 72e60b75..580cdb72 100644 --- a/src/caja-window-private.h +++ b/src/caja-window-private.h @@ -214,7 +214,6 @@ gboolean caja_add_to_history_list_no_notify (GFile GList * caja_get_history_list (void); void caja_window_bookmarks_preference_changed_callback (gpointer user_data); - /* sync window GUI with current slot. Used when changing slots, * and when updating the slot state. */ diff --git a/src/caja-window-slot.c b/src/caja-window-slot.c index 261b83b6..dab7c449 100644 --- a/src/caja-window-slot.c +++ b/src/caja-window-slot.c @@ -109,7 +109,6 @@ real_update_query_editor (CajaWindowSlot *slot) caja_directory_unref (directory); } - static void real_active (CajaWindowSlot *slot) { @@ -176,7 +175,6 @@ caja_window_slot_inactive (CajaWindowSlot *slot) inactive, (slot)); } - static void caja_window_slot_init (CajaWindowSlot *slot) { @@ -340,7 +338,6 @@ caja_window_slot_set_title (CajaWindowSlot *slot, } } - /* caja_window_slot_update_title: * * Re-calculate the slot title. diff --git a/src/caja-window-toolbars.c b/src/caja-window-toolbars.c index 87fa627f..7dba77e3 100644 --- a/src/caja-window-toolbars.c +++ b/src/caja-window-toolbars.c @@ -112,7 +112,6 @@ caja_navigation_window_initialize_toolbars (CajaNavigationWindow *window) caja_navigation_window_activate_spinner (window); } - static GList * get_extension_toolbar_items (CajaNavigationWindow *window) { diff --git a/src/caja-window.c b/src/caja-window.c index 8de4f27b..a180414c 100644 --- a/src/caja-window.c +++ b/src/caja-window.c @@ -1416,7 +1416,6 @@ load_view_as_menu (CajaWindow *window) window->details->view_as_action_group = NULL; } - refresh_stored_viewers (window); merge_id = gtk_ui_manager_new_merge_id (window->details->ui_manager); @@ -1605,7 +1604,6 @@ zoom_level_changed_callback (CajaView *view, caja_window_sync_zoom_widgets (window); } - /* These are called * A) when switching the view within the active slot * B) when switching the active slot @@ -1709,7 +1707,6 @@ caja_window_get_next_pane (CajaWindow *window) return next_pane; } - void caja_window_slot_set_viewed_file (CajaWindowSlot *slot, CajaFile *file) @@ -1988,7 +1985,6 @@ caja_window_get_history (CajaWindow *window) return g_list_copy_deep (history_list, caja_window_copy_history_item, NULL); } - static CajaWindowType caja_window_get_window_type (CajaWindow *window) { @@ -2101,7 +2097,6 @@ caja_window_get_extra_slot (CajaWindow *window) g_assert (CAJA_IS_WINDOW (window)); - /* return NULL if there is only one pane */ if (window->details->panes == NULL || window->details->panes->next == NULL) diff --git a/src/caja-x-content-bar.c b/src/caja-x-content-bar.c index c4b822f0..5e451d7b 100644 --- a/src/caja-x-content-bar.c +++ b/src/caja-x-content-bar.c @@ -110,7 +110,6 @@ caja_x_content_bar_set_x_content_type (CajaXContentBar *bar, const char *x_conte message = g_strdup_printf (_("The media has been detected as \"%s\"."), description); } - gtk_label_set_text (GTK_LABEL (bar->priv->label), message); gtk_widget_show (bar->priv->label); @@ -184,7 +183,6 @@ caja_x_content_bar_set_mount (CajaXContentBar *bar, GMount *mount) bar->priv->mount = mount != NULL ? g_object_ref (mount) : NULL; } - static void caja_x_content_bar_set_property (GObject *object, guint prop_id, diff --git a/src/caja-zoom-control.c b/src/caja-zoom-control.c index 125e04c3..8d504930 100644 --- a/src/caja-zoom-control.c +++ b/src/caja-zoom-control.c @@ -75,7 +75,6 @@ struct _CajaZoomControlPrivate gboolean marking_menu_items; }; - static guint signals[LAST_SIGNAL] = { 0 }; static gpointer accessible_parent_class; @@ -576,8 +575,6 @@ caja_zoom_control_scroll_event (GtkWidget *widget, GdkEventScroll *event) return TRUE; } - - static void caja_zoom_control_class_init (CajaZoomControlClass *class) { @@ -588,7 +585,6 @@ caja_zoom_control_class_init (CajaZoomControlClass *class) widget_class = GTK_WIDGET_CLASS (class); - gtk_widget_class_set_accessible_type (widget_class, caja_zoom_control_accessible_get_type ()); diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c index 9d096fd2..a90f884f 100644 --- a/src/file-manager/fm-desktop-icon-view.c +++ b/src/file-manager/fm-desktop-icon-view.c @@ -812,7 +812,6 @@ real_merge_menus (FMDirectoryView *view) view); G_GNUC_END_IGNORE_DEPRECATIONS; - gtk_ui_manager_insert_action_group (ui_manager, action_group, 0); g_object_unref (action_group); /* owned by ui manager */ diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index 7431c963..8ba1050d 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -153,7 +153,6 @@ enum PROP_WINDOW_SLOT }; - static guint signals[LAST_SIGNAL] = { 0 }; static GdkAtom copied_files_atom; @@ -498,7 +497,6 @@ file_and_directory_list_to_files (GList *fad_list) return g_list_reverse (res); } - static GList * file_and_directory_list_from_files (CajaDirectory *directory, GList *files) { @@ -523,7 +521,6 @@ file_and_directory_free (FileAndDirectory *fad) g_free (fad); } - static void file_and_directory_list_free (GList *list) { @@ -557,9 +554,6 @@ file_and_directory_hash (gconstpointer v) return GPOINTER_TO_UINT (fad->file) ^ GPOINTER_TO_UINT (fad->directory); } - - - static ScriptLaunchParameters * script_launch_parameters_new (CajaFile *file, FMDirectoryView *directory_view) @@ -807,7 +801,6 @@ action_open_close_parent_callback (GtkAction *action, caja_file_list_free (selection); } - static void action_open_alternate_callback (GtkAction *action, gpointer callback_data) @@ -1148,7 +1141,6 @@ action_invert_selection_callback (GtkAction *action, fm_directory_view_invert_selection (callback_data); } - static void pattern_select_response_cb (GtkWidget *dialog, int response, gpointer user_data) { @@ -1290,7 +1282,6 @@ action_reset_to_defaults_callback (GtkAction *action, fm_directory_view_reset_to_defaults (callback_data); } - static void hidden_files_mode_changed (CajaWindow *window, gpointer callback_data) @@ -1346,7 +1337,6 @@ query_name_entry_changed_cb (GtkWidget *entry, GtkWidget *button) gtk_widget_set_sensitive (button, sensitive); } - static void action_save_search_as_callback (GtkAction *action, gpointer callback_data) @@ -1460,7 +1450,6 @@ action_save_search_as_callback (GtkAction *action, } } - static void action_empty_trash_callback (GtkAction *action, gpointer callback_data) @@ -1819,7 +1808,6 @@ remove_directory_from_directory_list (FMDirectoryView *view, caja_directory_unref (directory); } - static void add_directory_to_scripts_directory_list (FMDirectoryView *view, CajaDirectory *directory) @@ -1980,7 +1968,6 @@ fm_directory_view_set_selection_locations (CajaView *caja_view, } } - void fm_directory_view_init_view_iface (CajaViewIface *iface) { @@ -2593,7 +2580,6 @@ done_loading (FMDirectoryView *view, view->details->loading = FALSE; } - typedef struct { GHashTable *debuting_files; GList *added_files; @@ -2723,7 +2709,6 @@ remove_not_really_moved_files (gpointer key, return TRUE; } - /* When this function is invoked, the file operation is over, but all * the icons may not have been added to the directory view yet, so * we can't select them yet. @@ -3171,8 +3156,6 @@ queue_pending_files (FMDirectoryView *view, } } - - *pending_list = g_list_concat (file_and_directory_list_from_files (directory, files), *pending_list); @@ -3545,7 +3528,6 @@ fm_directory_view_zoom_to_level (FMDirectoryView *view, zoom_to_level, (view, zoom_level)); } - CajaZoomLevel fm_directory_view_get_zoom_level (FMDirectoryView *view) { @@ -4013,7 +3995,6 @@ delayed_rename_file_hack_removed (RenameData *data) g_free (data); } - static void rename_file (FMDirectoryView *view, CajaFile *new_file) { @@ -4074,7 +4055,6 @@ typedef struct { GHashTable *added_locations; } NewFolderData; - static void track_newly_added_locations (FMDirectoryView *view, CajaFile *new_file, CajaDirectory *directory, gpointer user_data) @@ -4114,7 +4094,6 @@ new_folder_done (GFile *new_folder, gpointer user_data) screen = gtk_widget_get_screen (GTK_WIDGET (directory_view)); g_snprintf (screen_string, sizeof (screen_string), "%d", gdk_x11_screen_get_screen_number (screen)); - file = caja_file_get (new_folder); caja_file_set_metadata (file, CAJA_METADATA_KEY_SCREEN, @@ -4144,7 +4123,6 @@ new_folder_done (GFile *new_folder, gpointer user_data) g_free (data); } - static NewFolderData * new_folder_data_new (FMDirectoryView *directory_view) { @@ -4427,7 +4405,6 @@ escape_action_path (const char *action_path) return g_string_free (s, FALSE); } - static void add_submenu (GtkUIManager *ui_manager, GtkActionGroup *action_group, @@ -4762,7 +4739,6 @@ reset_open_with_menu (FMDirectoryView *view, GList *selection) add_x_content_apps (view, CAJA_FILE (selection->data), &applications); } - num_applications = g_list_length (applications); if (file_list_all_are_folders (selection)) { @@ -4874,7 +4850,6 @@ typedef struct GtkAction *action; } ExtensionActionCallbackData; - static void extension_action_callback_data_free (ExtensionActionCallbackData *data) { @@ -5351,7 +5326,6 @@ static void set_script_environment_variables(FMDirectoryView* view, GList* selec g_setenv("CAJA_SCRIPT_CURRENT_URI", uri, TRUE); g_setenv("NAUTILUS_SCRIPT_CURRENT_URI", uri, TRUE); // compatibilidad GNOME - g_free(uri); geometry_string = eel_gtk_window_get_geometry_string(GTK_WINDOW (fm_directory_view_get_containing_window (view))); @@ -5929,8 +5903,6 @@ update_directory_in_templates_menu (FMDirectoryView *view, return any_templates; } - - static void update_templates_menu (FMDirectoryView *view) { @@ -5991,7 +5963,6 @@ update_templates_menu (FMDirectoryView *view) g_free (templates_directory_uri); } - static void action_open_scripts_folder_callback (GtkAction *action, gpointer callback_data) @@ -7820,7 +7791,6 @@ real_merge_menus (FMDirectoryView *view) view->details->templates_invalid = TRUE; } - static gboolean can_paste_into_file (CajaFile *file) { @@ -7884,7 +7854,6 @@ clipboard_targets_received (GtkClipboard *clipboard, } } - selection = fm_directory_view_get_selection (view); count = g_list_length (selection); @@ -9144,7 +9113,6 @@ real_update_menus (FMDirectoryView *view) } gtk_action_set_sensitive (action, can_delete_files); - action = gtk_action_group_get_action (view->details->dir_action_group, FM_ACTION_RESTORE_FROM_TRASH); update_restore_from_trash_action (action, selection, FALSE); @@ -9218,7 +9186,6 @@ real_update_menus (FMDirectoryView *view) FM_ACTION_SAVE_SEARCH_AS); gtk_action_set_visible (action, show_save_search_as); - action = gtk_action_group_get_action (view->details->dir_action_group, FM_ACTION_SELECT_ALL); gtk_action_set_sensitive (action, !fm_directory_view_is_empty (view)); @@ -9283,7 +9250,6 @@ real_update_menus (FMDirectoryView *view) FM_ACTION_MOVE_TO_NEXT_PANE); gtk_action_set_sensitive (action, can_delete_files && next_pane_is_writable); - action = gtk_action_group_get_action (view->details->dir_action_group, FM_ACTION_COPY_TO_HOME); gtk_action_set_sensitive (action, can_copy_files); @@ -10263,7 +10229,6 @@ fm_directory_view_update_menus (FMDirectoryView *view) return; } - EEL_CALL_METHOD (FM_DIRECTORY_VIEW_CLASS, view, update_menus, (view)); @@ -10462,7 +10427,6 @@ revert_slashes (char *string) } } - static GdkDragAction ask_link_action (FMDirectoryView *view) { @@ -11034,7 +10998,6 @@ fm_directory_view_set_property (GObject *object, } } - gboolean fm_directory_view_handle_scroll_event (FMDirectoryView *directory_view, GdkEventScroll *event) @@ -11103,7 +11066,6 @@ fm_directory_view_scroll_event (GtkWidget *widget, return GTK_WIDGET_CLASS (parent_class)->scroll_event (widget, event); } - static void fm_directory_view_parent_set (GtkWidget *widget, GtkWidget *old_parent) diff --git a/src/file-manager/fm-ditem-page.c b/src/file-manager/fm-ditem-page.c index c1585597..fbf80fdd 100644 --- a/src/file-manager/fm-ditem-page.c +++ b/src/file-manager/fm-ditem-page.c @@ -354,7 +354,6 @@ build_grid (GtkWidget *container, entry = gtk_entry_new (); gtk_widget_set_hexpand (entry, TRUE); - if (item_entry->localized) { val = g_key_file_get_locale_string (key_file, @@ -477,7 +476,6 @@ build_grid: gtk_widget_show_all (GTK_WIDGET (box)); } - static void ditem_read_cb (GObject *source_object, GAsyncResult *res, diff --git a/src/file-manager/fm-empty-view.c b/src/file-manager/fm-empty-view.c index d14f4cd2..bca067ca 100644 --- a/src/file-manager/fm-empty-view.c +++ b/src/file-manager/fm-empty-view.c @@ -77,7 +77,6 @@ fm_empty_view_add_file (FMDirectoryView *view, CajaFile *file, CajaDirectory *di g_message ("entire loading: %.3f, cumulative %.3f", elaps, cumu); } - static void fm_empty_view_begin_loading (FMDirectoryView *view) { @@ -88,7 +87,6 @@ fm_empty_view_clear (FMDirectoryView *view) { } - static void fm_empty_view_file_changed (FMDirectoryView *view, CajaFile *file, CajaDirectory *directory) { @@ -106,7 +104,6 @@ fm_empty_view_get_selection (FMDirectoryView *view) return NULL; } - static GList * fm_empty_view_get_selection_for_file_transfer (FMDirectoryView *view) { @@ -217,7 +214,6 @@ fm_empty_view_click_policy_changed (FMDirectoryView *directory_view) { } - static int fm_empty_view_compare_files (FMDirectoryView *view, CajaFile *file1, CajaFile *file2) { @@ -332,7 +328,6 @@ fm_empty_view_get_id (CajaView *view) return FM_EMPTY_VIEW_ID; } - static void fm_empty_view_iface_init (CajaViewIface *iface) { @@ -345,7 +340,6 @@ fm_empty_view_iface_init (CajaViewIface *iface) iface->grab_focus = fm_empty_view_grab_focus; } - static void fm_empty_view_init (FMEmptyView *empty_view) { diff --git a/src/file-manager/fm-error-reporting.c b/src/file-manager/fm-error-reporting.c index 93cf77f4..1cb8a3bc 100644 --- a/src/file-manager/fm-error-reporting.c +++ b/src/file-manager/fm-error-reporting.c @@ -206,7 +206,6 @@ fm_report_error_setting_group (CajaFile *file, error->message); } - eel_show_error_dialog (_("The group could not be changed."), message, parent_window); g_free (file_name); diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c index b6345018..1843fd2e 100644 --- a/src/file-manager/fm-icon-view.c +++ b/src/file-manager/fm-icon-view.c @@ -116,7 +116,6 @@ struct FMIconViewDetails gulong clipboard_handler_id; }; - /* Note that the first item in this list is the default sort, * and that the items show up in the menu in the order they * appear in this list. @@ -483,7 +482,6 @@ action_tighter_layout_callback (GtkAction *action, G_GNUC_END_IGNORE_DEPRECATIONS; } - static gboolean fm_icon_view_using_auto_layout (FMIconView *icon_view) { @@ -558,7 +556,6 @@ fm_icon_view_clear (FMDirectoryView *view) g_slist_free (file_list); } - static gboolean should_show_file_on_screen (FMDirectoryView *view, CajaFile *file) { @@ -817,7 +814,6 @@ update_layout_menus (FMIconView *view) G_GNUC_END_IGNORE_DEPRECATIONS; } - static char * fm_icon_view_get_directory_sort_by (FMIconView *icon_view, CajaFile *file) @@ -1064,7 +1060,6 @@ fm_icon_view_real_get_directory_auto_layout (FMIconView *icon_view, CajaFile *file) { - return caja_file_get_boolean_metadata (file, CAJA_METADATA_KEY_ICON_VIEW_AUTO_LAYOUT, TRUE); } @@ -1651,7 +1646,6 @@ set_sort_criterion_by_sort_type (FMIconView *icon_view, fm_icon_view_reveal_selection (FM_DIRECTORY_VIEW (icon_view)); } - static void action_reversed_order_callback (GtkAction *action, gpointer user_data) @@ -2101,7 +2095,6 @@ fm_icon_view_get_selected_icon_locations (FMDirectoryView *view) (get_icon_container (FM_ICON_VIEW (view))); } - static void fm_icon_view_set_selection (FMDirectoryView *view, GList *selection) { @@ -2409,7 +2402,6 @@ sound_preview_type_supported (CajaFile *file) return FALSE; } - static gboolean should_preview_sound (CajaFile *file) { @@ -2542,7 +2534,6 @@ compare_files (FMDirectoryView *icon_view, return fm_icon_view_compare_files ((FMIconView *)icon_view, a, b); } - void fm_icon_view_filter_by_screen (FMIconView *icon_view, gboolean filter) @@ -2727,7 +2718,6 @@ icon_position_changed_callback (CajaIconContainer *container, g_free (position_string); } - g_ascii_dtostr (scale_string, sizeof (scale_string), position->scale); caja_file_set_metadata (file, CAJA_METADATA_KEY_ICON_SCALE, @@ -2938,7 +2928,6 @@ all_columns_same_width_changed_callback (gpointer callback_data) set_columns_same_width (icon_view); } - static void fm_icon_view_sort_directories_first_changed (FMDirectoryView *directory_view) { @@ -3259,8 +3248,6 @@ fm_icon_view_set_property (GObject *object, } } - - static void fm_icon_view_class_init (FMIconViewClass *klass) { @@ -3503,7 +3490,6 @@ fm_icon_view_supports_uri (const char *uri, view_info.startup_error_label = _(view_info.startup_error_label); \ view_info.display_location_label = _(view_info.display_location_label); \ - static CajaViewInfo fm_icon_view = { .id = FM_ICON_VIEW_ID, diff --git a/src/file-manager/fm-list-model.c b/src/file-manager/fm-list-model.c index a04b27f9..863efd2e 100644 --- a/src/file-manager/fm-list-model.c +++ b/src/file-manager/fm-list-model.c @@ -235,7 +235,6 @@ fm_list_model_get_path (GtkTreeModel *tree_model, GtkTreeIter *iter) GSequenceIter *ptr; FileEntry *file_entry; - model = (FMListModel *)tree_model; g_return_val_if_fail (iter->stamp == model->details->stamp, NULL); @@ -660,7 +659,6 @@ lookup_file (FMListModel *model, CajaFile *file, return ptr; } - struct GetIters { FMListModel *model; @@ -734,7 +732,6 @@ fm_list_model_get_first_iter_for_file (FMListModel *model, return res; } - gboolean fm_list_model_get_tree_iter_from_file (FMListModel *model, CajaFile *file, CajaDirectory *directory, @@ -1121,7 +1118,6 @@ fm_list_model_add_file (FMListModel *model, CajaFile *file, } } - file_entry->ptr = g_sequence_insert_sorted (files, file_entry, fm_list_model_file_entry_compare_func, model); @@ -1171,7 +1167,6 @@ fm_list_model_file_changed (FMListModel *model, CajaFile *file, return; } - pos_before = g_sequence_iter_get_position (ptr); g_sequence_sort_changed (ptr, fm_list_model_file_entry_compare_func, model); @@ -1493,8 +1488,6 @@ fm_list_model_unload_subdirectory (FMListModel *model, GtkTreeIter *iter) file_entry->reverse_map = NULL; } - - void fm_list_model_set_should_sort_directories_first (FMListModel *model, gboolean sort_directories_first) { diff --git a/src/file-manager/fm-list-model.h b/src/file-manager/fm-list-model.h index b63f8ae4..4e67b8c4 100644 --- a/src/file-manager/fm-list-model.h +++ b/src/file-manager/fm-list-model.h @@ -126,7 +126,6 @@ int fm_list_model_compare_func (FMListModel *model, CajaFile *file1, CajaFile *file2); - int fm_list_model_add_column (FMListModel *model, CajaColumn *column); diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c index 39e4bcdb..921128b0 100644 --- a/src/file-manager/fm-list-view.c +++ b/src/file-manager/fm-list-view.c @@ -153,7 +153,6 @@ static void fm_list_view_rename_callback (CajaFile *file, GError *error, gpointer callback_data); - G_DEFINE_TYPE_WITH_CODE (FMListView, fm_list_view, FM_TYPE_DIRECTORY_VIEW, G_IMPLEMENT_INTERFACE (CAJA_TYPE_VIEW, fm_list_view_iface_init)); @@ -246,7 +245,6 @@ activate_selected_items (FMListView *view) file_list = fm_list_view_get_selection (FM_DIRECTORY_VIEW (view)); - if (view->details->renaming_file) { /* We're currently renaming a file, wait until the rename is @@ -1051,7 +1049,6 @@ row_collapsed_callback (GtkTreeView *treeview, GtkTreeIter *iter, GtkTreePath *p -1); } - uri = caja_file_get_uri (file); caja_debug_log (FALSE, CAJA_DEBUG_LOG_DOMAIN_USER, "list view row collapsed window=%p: %s", @@ -1316,7 +1313,6 @@ sort_column_changed_callback (GtkTreeSortable *sortable, } } - reversed_attr = (reversed ? "true" : "false"); caja_file_set_metadata (file, CAJA_METADATA_KEY_LIST_VIEW_SORT_REVERSED, default_reversed_attr, reversed_attr); @@ -1849,7 +1845,6 @@ create_and_set_up_tree_view (FMListView *view) gtk_widget_show (GTK_WIDGET (view->details->tree_view)); gtk_container_add (GTK_CONTAINER (view), GTK_WIDGET (view->details->tree_view)); - atk_obj = gtk_widget_get_accessible (GTK_WIDGET (view->details->tree_view)); atk_object_set_name (atk_obj, _("List View")); } @@ -2112,7 +2107,6 @@ fm_list_view_rename_callback (CajaFile *file, g_object_unref (view); } - static void fm_list_view_file_changed (FMDirectoryView *view, CajaFile *file, CajaDirectory *directory) { @@ -2219,7 +2213,6 @@ fm_list_view_get_selection_for_file_transfer_foreach_func (GtkTreeModel *model, } } - static GList * fm_list_view_get_selection_for_file_transfer (FMDirectoryView *view) { @@ -2234,9 +2227,6 @@ fm_list_view_get_selection_for_file_transfer (FMDirectoryView *view) return g_list_reverse (selection_data.list); } - - - static guint fm_list_view_get_item_count (FMDirectoryView *view) { @@ -2334,7 +2324,6 @@ fm_list_view_remove_file (FMDirectoryView *view, CajaFile *file, CajaDirectory * } } - } static void @@ -3394,7 +3383,6 @@ fm_list_view_get_id (CajaView *view) return FM_LIST_VIEW_ID; } - static void fm_list_view_iface_init (CajaViewIface *iface) { @@ -3406,7 +3394,6 @@ fm_list_view_iface_init (CajaViewIface *iface) iface->get_title = NULL; } - static void fm_list_view_init (FMListView *list_view) { diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c index 944b18f0..0ab2bfc7 100644 --- a/src/file-manager/fm-properties-window.c +++ b/src/file-manager/fm-properties-window.c @@ -414,7 +414,6 @@ get_image_for_properties_window (FMPropertiesWindow *window, g_object_unref (icon); } - static void update_properties_window_icon (FMPropertiesWindow *window) { @@ -461,7 +460,6 @@ uri_is_local_image (const char *uri) return TRUE; } - static void reset_icon (FMPropertiesWindow *properties_window) { @@ -481,7 +479,6 @@ reset_icon (FMPropertiesWindow *properties_window) } } - static void fm_properties_window_drag_data_received (GtkWidget *widget, GdkDragContext *context, int x, int y, @@ -505,7 +502,6 @@ fm_properties_window_drag_data_received (GtkWidget *widget, GdkDragContext *cont uris = g_strsplit (gtk_selection_data_get_data (selection_data), "\r\n", 0); exactly_one = uris[0] != NULL && (uris[1] == NULL || uris[1][0] == '\0'); - if (!exactly_one) { eel_show_error_dialog (_("You cannot assign more than one custom icon at a time!"), @@ -1302,7 +1298,6 @@ file_list_get_string_attribute (GList *file_list, } } - static gboolean file_list_all_directories (GList *file_list) { @@ -1749,7 +1744,6 @@ tree_model_get_entry_index (GtkTreeModel *model, return -1; } - static void synch_groups_combo_box (GtkComboBox *combo_box, CajaFile *file) { @@ -2418,8 +2412,6 @@ attach_title_field (GtkGrid *grid, return attach_label (grid, NULL, title, FALSE, FALSE, TRUE); } - - #define INCONSISTENT_STATE_STRING \ "\xE2\x80\x92" @@ -2627,7 +2619,6 @@ should_show_file_type (FMPropertiesWindow *window) return FALSE; } - return TRUE; } @@ -2806,7 +2797,6 @@ paint_pie_chart (GtkWidget *widget, width = allocation.width; height = allocation.height; - free = (double)window->details->volume_free / (double)window->details->volume_capacity; used = 1.0 - free; @@ -2860,7 +2850,6 @@ paint_pie_chart (GtkWidget *widget, cairo_line_to (cr,xc,yc); } - gdk_cairo_set_source_rgba (cr, &window->details->free_color); cairo_fill_preserve(cr); @@ -2870,7 +2859,6 @@ paint_pie_chart (GtkWidget *widget, } } - /* Copied from gtk/gtkstyle.c */ static void @@ -3057,7 +3045,6 @@ _pie_style_shade (GdkRGBA *a, b->alpha = a->alpha; } - static GtkWidget* create_pie_widget (FMPropertiesWindow *window) { @@ -3109,7 +3096,6 @@ create_pie_widget (FMPropertiesWindow *window) } - if (!gtk_style_context_lookup_color (style, "chart_rgba_2", &window->details->free_color)) { window->details->free_color.red = FREE_FILL_R; window->details->free_color.green = FREE_FILL_G; @@ -3447,7 +3433,6 @@ files_has_changable_permissions_directory (FMPropertiesWindow *window) return FALSE; } - static gboolean files_has_file (FMPropertiesWindow *window) { @@ -3465,7 +3450,6 @@ files_has_file (FMPropertiesWindow *window) return FALSE; } - static void create_emblems_page (FMPropertiesWindow *window) { @@ -3810,7 +3794,6 @@ permission_button_update (FMPropertiesWindow *window, sensitive |= window->details->has_recursive_apply; } - g_signal_handlers_block_by_func (G_OBJECT (button), G_CALLBACK (permission_button_toggled), window); @@ -3970,7 +3953,6 @@ permission_to_vfs (PermissionType type, PermissionValue perm) return vfs_perm; } - static PermissionValue permission_from_vfs (PermissionType type, guint32 vfs_perm) { @@ -4306,7 +4288,6 @@ add_permissions_combo_box (FMPropertiesWindow *window, GtkGrid *grid, GTK_POS_RIGHT, 1, 1); } - static GtkWidget * append_special_execution_checkbox (FMPropertiesWindow *window, GtkGrid *grid, @@ -4695,7 +4676,6 @@ set_recursive_permissions_done (gpointer callback_data) g_object_unref (window); } - static void apply_recursive_clicked (GtkWidget *recursive_button, FMPropertiesWindow *window) @@ -5149,7 +5129,6 @@ create_open_with_page (FMPropertiesWindow *window) vbox, gtk_label_new (_("Open With"))); } - static FMPropertiesWindow * create_properties_window (StartupData *startup_data) { @@ -5405,7 +5384,6 @@ is_directory_ready_callback (CajaFile *file, } } - void fm_properties_window_present (GList *original_files, GtkWidget *parent_widget) @@ -5440,7 +5418,6 @@ fm_properties_window_present (GList *original_files, return; } - pending_key = get_pending_key (original_files); /* Look to see if we're already waiting for a window for this file. */ @@ -5474,7 +5451,6 @@ fm_properties_window_present (GList *original_files, _("Creating Properties window."), parent_window == NULL ? NULL : GTK_WINDOW (parent_window)); - for (l = startup_data->target_files; l != NULL; l = next) { next = l->next; caja_file_call_when_ready diff --git a/src/file-manager/fm-tree-model.c b/src/file-manager/fm-tree-model.c index 7d789edf..017d9f8c 100644 --- a/src/file-manager/fm-tree-model.c +++ b/src/file-manager/fm-tree-model.c @@ -2114,4 +2114,3 @@ fm_tree_model_tree_model_init (GtkTreeModelIface *iface) iface->unref_node = fm_tree_model_unref_node; } - diff --git a/src/file-manager/fm-tree-view.c b/src/file-manager/fm-tree-view.c index edc5b138..2e7cfbb5 100644 --- a/src/file-manager/fm-tree-view.c +++ b/src/file-manager/fm-tree-view.c @@ -74,7 +74,6 @@ typedef struct GObjectClass parent; } FMTreeViewProviderClass; - struct FMTreeViewDetails { CajaWindowInfo *window; @@ -157,7 +156,6 @@ notify_clipboard_info (CajaClipboardMonitor *monitor, } } - static gboolean show_iter_for_file (FMTreeView *view, CajaFile *file, GtkTreeIter *iter) { @@ -622,7 +620,6 @@ compare_rows (GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer call return result; } - static char * get_root_uri_callback (CajaTreeViewDragDest *dest, gpointer user_data) @@ -1266,7 +1263,6 @@ create_popup_menu (FMTreeView *view) G_CALLBACK (popup_menu_deactivated), view); - /* add the "open" menu item */ menu_item = eel_image_menu_item_new_from_icon ("document-open", _("_Open")); g_signal_connect (menu_item, "activate", @@ -1428,7 +1424,6 @@ create_tree (FMTreeView *view) fm_tree_model_add_root_uri (view->details->child_model, "trash:///", _("Trash"), icon, NULL); g_object_unref (icon); - volume_monitor = g_volume_monitor_get (); view->details->volume_monitor = volume_monitor; mounts = g_volume_monitor_get_mounts (volume_monitor); diff --git a/src/file-manager/fm-tree-view.h b/src/file-manager/fm-tree-view.h index c79057b8..23ca9106 100644 --- a/src/file-manager/fm-tree-view.h +++ b/src/file-manager/fm-tree-view.h @@ -25,7 +25,6 @@ /* fm-tree-view.h - tree view. */ - #ifndef FM_TREE_VIEW_H #define FM_TREE_VIEW_H diff --git a/src/file-manager/fm-widget-view.c b/src/file-manager/fm-widget-view.c index f0483d79..968672d6 100644 --- a/src/file-manager/fm-widget-view.c +++ b/src/file-manager/fm-widget-view.c @@ -381,7 +381,6 @@ fm_widget_view_get_id (CajaView *view) return FM_WIDGET_VIEW_ID; } - static void fm_widget_view_iface_init (CajaViewIface *iface) { @@ -394,7 +393,6 @@ fm_widget_view_iface_init (CajaViewIface *iface) iface->grab_focus = fm_widget_view_grab_focus; } - static void fm_widget_view_init (FMWidgetView *widget_view) { diff --git a/test/test-caja-directory-async.c b/test/test-caja-directory-async.c index 028cc6a2..683affdc 100644 --- a/test/test-caja-directory-async.c +++ b/test/test-caja-directory-async.c @@ -99,7 +99,6 @@ main (int argc, char **argv) CAJA_FILE_ATTRIBUTE_INFO, NULL, NULL); - gtk_main (); return 0; } diff --git a/test/test-caja-wrap-table.c b/test/test-caja-wrap-table.c index 8d6a4918..f6d4ec50 100644 --- a/test/test-caja-wrap-table.c +++ b/test/test-caja-wrap-table.c @@ -52,7 +52,6 @@ main (int argc, char* argv[]) NULL); #endif - /* Use caja_customization to make the emblem widgets */ customization_data = caja_customization_data_new ("emblems", TRUE, CAJA_ICON_SIZE_SMALL, diff --git a/test/test-copy.c b/test/test-copy.c index 1e85a3bf..3336671f 100644 --- a/test/test-copy.c +++ b/test/test-copy.c @@ -88,4 +88,3 @@ main (int argc, char* argv[]) return 0; } - diff --git a/test/test-eel-background.c b/test/test-eel-background.c index 53fed701..d9bcf08d 100644 --- a/test/test-eel-background.c +++ b/test/test-eel-background.c @@ -31,7 +31,6 @@ main (int argc, char *argv[]) #endif g_free (image_uri); - gtk_widget_show_all (window); gtk_main (); diff --git a/test/test-eel-image-table.c b/test/test-eel-image-table.c index 98c952fb..20238ac0 100644 --- a/test/test-eel-image-table.c +++ b/test/test-eel-image-table.c @@ -75,7 +75,6 @@ labeled_image_new (const char *text, return image; } - static void image_table_child_enter_callback (GtkWidget *image_table, GtkWidget *item, |