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 /eel | |
parent | bdc5cf66eff8c52cf422cf7b0143ff3489bbb7b0 (diff) | |
download | caja-0a4384ca8c93b62bdf393cd1f3698bab1999fc6f.tar.bz2 caja-0a4384ca8c93b62bdf393cd1f3698bab1999fc6f.tar.xz |
Use a blank line at most
Diffstat (limited to 'eel')
32 files changed, 0 insertions, 129 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 */ - |