From 0274669179600ac77475eed9870d2eab52c2cf14 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 12 Jul 2009 23:33:07 -0400 Subject: Fix excessive whitespace. --- widgets/misc/e-activity-handler.c | 6 ---- widgets/misc/e-activity-handler.h | 2 -- widgets/misc/e-calendar-item.c | 55 ---------------------------- widgets/misc/e-calendar-item.h | 4 --- widgets/misc/e-calendar.c | 18 ---------- widgets/misc/e-calendar.h | 2 -- widgets/misc/e-canvas-background.h | 2 -- widgets/misc/e-canvas-utils.c | 2 -- widgets/misc/e-canvas-vbox.c | 1 - widgets/misc/e-canvas-vbox.h | 2 -- widgets/misc/e-canvas.c | 6 ---- widgets/misc/e-canvas.h | 3 -- widgets/misc/e-cell-date-edit.c | 28 --------------- widgets/misc/e-cell-date-edit.h | 5 --- widgets/misc/e-cell-percent.c | 1 - widgets/misc/e-config-page.c | 1 - widgets/misc/e-cursors.c | 2 -- widgets/misc/e-dateedit.c | 60 ------------------------------- widgets/misc/e-dropdown-button.c | 1 - widgets/misc/e-filter-bar.c | 7 ---- widgets/misc/e-filter-bar.h | 2 -- widgets/misc/e-gui-utils.c | 1 - widgets/misc/e-hsv-utils.c | 1 - widgets/misc/e-icon-entry.c | 1 - widgets/misc/e-image-chooser.c | 3 -- widgets/misc/e-image-chooser.h | 1 - widgets/misc/e-map.c | 65 ---------------------------------- widgets/misc/e-map.h | 1 - widgets/misc/e-multi-config-dialog.c | 6 ---- widgets/misc/e-pilot-settings.c | 3 -- widgets/misc/e-popup-menu.c | 1 - widgets/misc/e-popup-menu.h | 3 -- widgets/misc/e-printable.c | 1 - widgets/misc/e-reflow-model.c | 2 -- widgets/misc/e-reflow.c | 3 -- widgets/misc/e-reflow.h | 1 - widgets/misc/e-search-bar.c | 3 -- widgets/misc/e-search-bar.h | 1 - widgets/misc/e-selection-model-array.c | 1 - widgets/misc/e-selection-model-array.h | 1 - widgets/misc/e-selection-model.h | 3 -- widgets/misc/e-send-options.c | 4 --- widgets/misc/e-spinner.c | 1 - widgets/misc/e-task-widget.c | 1 - widgets/misc/e-unicode.h | 1 - widgets/misc/e-url-entry.c | 3 -- widgets/misc/test-calendar.c | 5 --- widgets/misc/test-dateedit.c | 6 ---- 48 files changed, 333 deletions(-) (limited to 'widgets/misc') diff --git a/widgets/misc/e-activity-handler.c b/widgets/misc/e-activity-handler.c index d397f142dd..ed5db04b18 100644 --- a/widgets/misc/e-activity-handler.c +++ b/widgets/misc/e-activity-handler.c @@ -34,7 +34,6 @@ #define ICON_SIZE 16 - struct _ActivityInfo { gchar *component_id; gint error_type; @@ -101,7 +100,6 @@ lookup_activity (GList *list, return NULL; } - /* ETaskWidget actions. */ static gint @@ -122,7 +120,6 @@ task_widget_button_press_event_callback (GtkWidget *widget, return TRUE; } - /* Creating and destroying ActivityInfos. */ static ActivityInfo * @@ -180,7 +177,6 @@ task_widget_new_from_activity_info (ActivityInfo *activity_info) return E_TASK_WIDGET (widget); } - /* Task Bar handling. */ static void @@ -227,7 +223,6 @@ task_bar_destroy_notify (gpointer data, priv->task_bars = g_slist_remove (priv->task_bars, task_bar_instance); } - /* GObject methods. */ static void @@ -296,7 +291,6 @@ e_activity_handler_init (EActivityHandler *activity_handler) activity_handler->priv = priv; } - EActivityHandler * e_activity_handler_new (void) { diff --git a/widgets/misc/e-activity-handler.h b/widgets/misc/e-activity-handler.h index 880972867e..3fd5c64d9a 100644 --- a/widgets/misc/e-activity-handler.h +++ b/widgets/misc/e-activity-handler.h @@ -35,7 +35,6 @@ G_BEGIN_DECLS #define E_IS_ACTIVITY_HANDLER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_ACTIVITY_HANDLER)) #define E_IS_ACTIVITY_HANDLER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_ACTIVITY_HANDLER)) - typedef struct _EActivityHandler EActivityHandler; typedef struct _EActivityHandlerPrivate EActivityHandlerPrivate; typedef struct _EActivityHandlerClass EActivityHandlerClass; @@ -53,7 +52,6 @@ struct _EActivityHandlerClass { GObjectClass parent_class; }; - GType e_activity_handler_get_type (void); EActivityHandler *e_activity_handler_new (void); diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c index 9c548947d6..41b5eea6ca 100644 --- a/widgets/misc/e-calendar-item.c +++ b/widgets/misc/e-calendar-item.c @@ -44,7 +44,6 @@ static const gint e_calendar_item_days_in_month[12] = { e_calendar_item_days_in_month[month] + (((month) == 1 \ && ((year) % 4 == 0 && ((year) % 100 != 0 || (year) % 400 == 0))) ? 1 : 0) - static void e_calendar_item_dispose (GObject *object); static void e_calendar_item_get_property(GObject *object, guint property_id, @@ -227,12 +226,10 @@ enum { LAST_SIGNAL }; - static guint e_calendar_item_signals[LAST_SIGNAL] = { 0 }; G_DEFINE_TYPE (ECalendarItem, e_calendar_item, GNOME_TYPE_CANVAS_ITEM) - static void e_calendar_item_class_init (ECalendarItemClass *class) { @@ -526,7 +523,6 @@ e_calendar_item_class_init (ECalendarItemClass *class) e_calendar_item_a11y_init (); } - static void e_calendar_item_init (ECalendarItem *calitem) { @@ -582,7 +578,6 @@ e_calendar_item_init (ECalendarItem *calitem) calitem->signal_emission_idle_id = 0; } - static void e_calendar_item_dispose (GObject *object) { @@ -619,7 +614,6 @@ e_calendar_item_dispose (GObject *object) G_OBJECT_CLASS (e_calendar_item_parent_class)->dispose (object); } - static void e_calendar_item_get_property (GObject *object, guint property_id, @@ -701,7 +695,6 @@ e_calendar_item_get_property (GObject *object, G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); } - static void e_calendar_item_set_property (GObject *object, guint property_id, @@ -853,7 +846,6 @@ e_calendar_item_realize (GnomeCanvasItem *item) e_calendar_item_style_set (GTK_WIDGET(item->canvas), calitem); } - static void e_calendar_item_unrealize (GnomeCanvasItem *item) { @@ -870,7 +862,6 @@ e_calendar_item_unrealize (GnomeCanvasItem *item) (* GNOME_CANVAS_ITEM_CLASS (e_calendar_item_parent_class)->unrealize) (item); } - static void e_calendar_item_unmap (GnomeCanvasItem *item) { @@ -887,7 +878,6 @@ e_calendar_item_unmap (GnomeCanvasItem *item) (* GNOME_CANVAS_ITEM_CLASS (e_calendar_item_parent_class)->unmap) (item); } - static void e_calendar_item_update (GnomeCanvasItem *item, double *affine, @@ -1018,7 +1008,6 @@ e_calendar_item_update (GnomeCanvasItem *item, pango_font_metrics_unref (font_metrics); } - /* * DRAWING ROUTINES - functions to paint the canvas item. */ @@ -1068,7 +1057,6 @@ e_calendar_item_draw (GnomeCanvasItem *canvas_item, bg = style->bg[GTK_STATE_NORMAL]; cr = gdk_cairo_create (drawable); - /* Clear the entire background. */ cairo_save (cr); gdk_cairo_set_source_color (cr, &base); @@ -1111,7 +1099,6 @@ e_calendar_item_draw (GnomeCanvasItem *canvas_item, - xthickness * 2, bar_height); - for (col = 0; col < calitem->cols; col++) { if (col != 0) { col_x = calitem->x1 + calitem->x_offset @@ -1126,7 +1113,6 @@ e_calendar_item_draw (GnomeCanvasItem *canvas_item, col_x - 1 - x); } - e_calendar_item_draw_month (calitem, drawable, x, y, width, height, row, col); } @@ -1138,7 +1124,6 @@ e_calendar_item_draw (GnomeCanvasItem *canvas_item, cairo_destroy (cr); } - static void layout_set_day_text (ECalendarItem *calitem, PangoLayout *layout, gint day_index) { @@ -1764,8 +1749,6 @@ e_calendar_item_get_week_number (ECalendarItem *calitem, return week_num + 1; } - - /* This is supposed to return the nearest item the the point and the distance. Since we are the only item we just return ourself and 0 for the distance. This is needed so that we get button/motion events. */ @@ -1978,7 +1961,6 @@ e_calendar_item_recalc_sizes (ECalendarItem *calitem) pango_context_get_language (pango_context)); layout = pango_layout_new (pango_context); - char_height = PANGO_PIXELS (pango_font_metrics_get_ascent (font_metrics)) + PANGO_PIXELS (pango_font_metrics_get_descent (font_metrics)); @@ -2052,7 +2034,6 @@ e_calendar_item_recalc_sizes (ECalendarItem *calitem) pango_font_metrics_unref (font_metrics); } - static void e_calendar_item_get_day_style (ECalendarItem *calitem, gint year, @@ -2100,8 +2081,6 @@ e_calendar_item_get_day_style (ECalendarItem *calitem, } } - - static gboolean e_calendar_item_button_press (ECalendarItem *calitem, GdkEvent *event) @@ -2192,7 +2171,6 @@ e_calendar_item_button_release (ECalendarItem *calitem, return FALSE; } - static gboolean e_calendar_item_motion (ECalendarItem *calitem, GdkEvent *event) @@ -2272,7 +2250,6 @@ e_calendar_item_motion (ECalendarItem *calitem, e_calendar_item_round_down_selection (calitem, &start_month, &start_day); - /* Check we don't go over the maximum number of days to select. */ if (calitem->selection_dragging_end) { e_calendar_item_check_selection_end (calitem, @@ -2304,7 +2281,6 @@ e_calendar_item_motion (ECalendarItem *calitem, return TRUE; } - static void e_calendar_item_check_selection_end (ECalendarItem *calitem, gint start_month, @@ -2345,7 +2321,6 @@ e_calendar_item_check_selection_end (ECalendarItem *calitem, } } - static void e_calendar_item_check_selection_start (ECalendarItem *calitem, gint *start_month, @@ -2384,7 +2359,6 @@ e_calendar_item_check_selection_start (ECalendarItem *calitem, } } - /* Converts a position within the item to a month & day. The month returned is 0 for the top-left month displayed. If the position is over the month heading -1 is returned for the day. @@ -2529,7 +2503,6 @@ e_calendar_item_convert_position_to_day (ECalendarItem *calitem, return TRUE; } - static void e_calendar_item_get_month_info (ECalendarItem *calitem, gint row, @@ -2568,7 +2541,6 @@ e_calendar_item_get_month_info (ECalendarItem *calitem, *first_day_offset = first_day_of_month; } - void e_calendar_item_get_first_month(ECalendarItem *calitem, gint *year, @@ -2578,7 +2550,6 @@ e_calendar_item_get_first_month(ECalendarItem *calitem, *month = calitem->month; } - static void e_calendar_item_preserve_day_selection (ECalendarItem *calitem, gint selected_day, @@ -2710,7 +2681,6 @@ e_calendar_item_get_max_days_sel (ECalendarItem *calitem) return calitem->max_days_selected; } - /* Set the maximum number of days selectable */ void e_calendar_item_set_max_days_sel (ECalendarItem *calitem, @@ -2720,7 +2690,6 @@ e_calendar_item_set_max_days_sel (ECalendarItem *calitem, gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (calitem)); } - /* Get the maximum number of days before whole weeks are selected */ gint e_calendar_item_get_days_start_week_sel(ECalendarItem *calitem) @@ -2728,7 +2697,6 @@ e_calendar_item_get_days_start_week_sel(ECalendarItem *calitem) return calitem->days_to_start_week_selection; } - /* Set the maximum number of days before whole weeks are selected */ void e_calendar_item_set_days_start_week_sel(ECalendarItem *calitem, @@ -2743,7 +2711,6 @@ e_calendar_item_get_display_popup (ECalendarItem *calitem) return calitem->display_popup; } - void e_calendar_item_set_display_popup (ECalendarItem *calitem, gboolean display) @@ -2751,7 +2718,6 @@ e_calendar_item_set_display_popup (ECalendarItem *calitem, calitem->display_popup = display; } - /* This will make sure that the given year & month are valid, i.e. if month is < 0 or > 11 the year and month will be updated accordingly. */ void @@ -2770,7 +2736,6 @@ e_calendar_item_normalize_date (ECalendarItem *calitem, } } - /* Adds or subtracts days from the selection. It is used when we switch months and the selection extends past the end of a month but we want to keep the number of days selected the same. days should not be more than 30. */ @@ -2799,7 +2764,6 @@ e_calendar_item_add_days_to_selection (ECalendarItem *calitem, } } - /* Gets the range of dates actually shown. Months are 0 to 11. This also includes the last days of the previous month and the first days of the following month, which are normally shown in gray. @@ -2830,7 +2794,6 @@ e_calendar_item_get_date_range (ECalendarItem *calitem, } *start_day = days_in_prev_month + 1 - first_day_offset; - /* Calculate the last day shown. This will be one of the greyed-out days after the last full month ends. */ e_calendar_item_get_month_info (calitem, calitem->rows - 1, @@ -2845,7 +2808,6 @@ e_calendar_item_get_date_range (ECalendarItem *calitem, return TRUE; } - /* Simple way to mark days so they appear bold. A more flexible interface may be added later. */ void @@ -2862,7 +2824,6 @@ e_calendar_item_clear_marks (ECalendarItem *calitem) item->x2, item->y2); } - /* add_day_style - whether bit-or with the actual style or change the style fully */ void e_calendar_item_mark_day (ECalendarItem *calitem, @@ -2886,7 +2847,6 @@ e_calendar_item_mark_day (ECalendarItem *calitem, gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (calitem)); } - void e_calendar_item_mark_days (ECalendarItem *calitem, gint start_year, @@ -2951,7 +2911,6 @@ e_calendar_item_mark_days (ECalendarItem *calitem, gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (calitem)); } - /* Rounds up the given day to the end of the week. */ static void e_calendar_item_round_up_selection (ECalendarItem *calitem, @@ -2985,7 +2944,6 @@ e_calendar_item_round_up_selection (ECalendarItem *calitem, } } - /* Rounds down the given day to the start of the week. */ static void e_calendar_item_round_down_selection (ECalendarItem *calitem, @@ -3024,7 +2982,6 @@ e_calendar_item_round_down_selection (ECalendarItem *calitem, } } - static gint e_calendar_item_get_inclusive_days (ECalendarItem *calitem, gint start_month_offset, @@ -3056,7 +3013,6 @@ e_calendar_item_get_inclusive_days (ECalendarItem *calitem, return days; } - /* If the day is off the end of the month it is set to the last day of the month. */ static void @@ -3075,7 +3031,6 @@ e_calendar_item_ensure_valid_day (ECalendarItem *calitem, *day = days_in_month; } - gboolean e_calendar_item_get_selection (ECalendarItem *calitem, GDate *start_date, @@ -3106,7 +3061,6 @@ e_calendar_item_get_selection (ECalendarItem *calitem, return TRUE; } - static void e_calendar_item_set_selection_if_emission (ECalendarItem *calitem, GDate *start_date, @@ -3161,7 +3115,6 @@ e_calendar_item_set_selection_if_emission (ECalendarItem *calitem, + end_month - calitem->month; new_end_day = end_day; - if (!calitem->selection_set || calitem->selection_start_month_offset != new_start_month_offset || calitem->selection_start_day != new_start_day @@ -3312,7 +3265,6 @@ e_calendar_item_ensure_days_visible (ECalendarItem *calitem, return need_update; } - static void e_calendar_item_show_popup_menu (ECalendarItem *calitem, GdkEventButton *event, @@ -3371,7 +3323,6 @@ e_calendar_item_show_popup_menu (ECalendarItem *calitem, gtk_widget_destroy (menu); } - static void e_calendar_item_on_menu_item_activate (GtkWidget *menuitem, ECalendarItem *calitem) @@ -3387,7 +3338,6 @@ e_calendar_item_on_menu_item_activate (GtkWidget *menuitem, e_calendar_item_set_first_month (calitem, year, month); } - static void e_calendar_item_position_menu (GtkMenu *menu, gint *x, @@ -3412,7 +3362,6 @@ e_calendar_item_position_menu (GtkMenu *menu, *y = CLAMP (*y, 0, screen_height - requisition.height); } - /* Sets the function to call to get the colors to use for a particular day. */ void e_calendar_item_set_style_callback (ECalendarItem *calitem, @@ -3430,7 +3379,6 @@ e_calendar_item_set_style_callback (ECalendarItem *calitem, calitem->style_callback_destroy = destroy; } - static void e_calendar_item_date_range_changed (ECalendarItem *calitem) { @@ -3440,7 +3388,6 @@ e_calendar_item_date_range_changed (ECalendarItem *calitem) e_calendar_item_queue_signal_emission (calitem); } - static void e_calendar_item_queue_signal_emission (ECalendarItem *calitem) { @@ -3449,7 +3396,6 @@ e_calendar_item_queue_signal_emission (ECalendarItem *calitem) } } - static gboolean e_calendar_item_signal_emission_idle_cb (gpointer data) { @@ -3483,7 +3429,6 @@ e_calendar_item_signal_emission_idle_cb (gpointer data) return FALSE; } - /* Sets a callback to use to get the current time. This is useful if the application needs to use its own timezone data rather than rely on the Unix timezone. */ diff --git a/widgets/misc/e-calendar-item.h b/widgets/misc/e-calendar-item.h index 936e86ebab..0ab34b3bdd 100644 --- a/widgets/misc/e-calendar-item.h +++ b/widgets/misc/e-calendar-item.h @@ -70,7 +70,6 @@ G_BEGIN_DECLS #define E_CALENDAR_ITEM_XPAD_BEFORE_CELLS 1 #define E_CALENDAR_ITEM_XPAD_AFTER_CELLS 4 - /* These index our colors array. */ typedef enum { @@ -110,7 +109,6 @@ typedef void (*ECalendarItemStyleCallback) (ECalendarItem *calitem, typedef struct tm (*ECalendarItemGetTimeCallback) (ECalendarItem *calitem, gpointer data); - #define E_CALENDAR_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ e_calendar_item_get_type (), ECalendarItem)) #define E_CALENDAR_ITEM_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k),\ @@ -265,7 +263,6 @@ struct _ECalendarItemClass void (* selection_preview_changed) (ECalendarItem *calitem); }; - GType e_calendar_item_get_type (void); /* FIXME: months are 0-11 throughout, but 1-12 may be better. */ @@ -368,7 +365,6 @@ gint e_calendar_item_get_week_number (ECalendarItem *calitem, gint year); void e_calendar_item_style_set (GtkWidget *widget, ECalendarItem *calitem); - G_END_DECLS #endif /* _E_CALENDAR_ITEM_H_ */ diff --git a/widgets/misc/e-calendar.c b/widgets/misc/e-calendar.c index a0adf46cf5..fd17c67aab 100644 --- a/widgets/misc/e-calendar.c +++ b/widgets/misc/e-calendar.c @@ -99,7 +99,6 @@ static void e_calendar_stop_auto_move (ECalendar *cal); G_DEFINE_TYPE (ECalendar, e_calendar, E_CANVAS_TYPE) - static void e_calendar_class_init (ECalendarClass *class) { @@ -120,7 +119,6 @@ e_calendar_class_init (ECalendarClass *class) widget_class->focus = e_calendar_focus; } - static void e_calendar_init (ECalendar *cal) { @@ -202,7 +200,6 @@ e_calendar_init (ECalendar *cal) cal->timeout_id = 0; } - /** * e_calendar_new: * @Returns: a new #ECalendar. @@ -222,7 +219,6 @@ e_calendar_new (void) return cal; } - static void e_calendar_destroy (GtkObject *object) { @@ -242,7 +238,6 @@ e_calendar_destroy (GtkObject *object) (* GTK_OBJECT_CLASS (e_calendar_parent_class)->destroy) (object); } - static void e_calendar_realize (GtkWidget *widget) { @@ -254,7 +249,6 @@ e_calendar_realize (GtkWidget *widget) &widget->style->bg[GTK_STATE_NORMAL]); } - static void e_calendar_style_set (GtkWidget *widget, GtkStyle *previous_style) @@ -274,7 +268,6 @@ e_calendar_style_set (GtkWidget *widget, e_calendar_item_style_set (widget, e_calendar->calitem); } - static void e_calendar_size_request (GtkWidget *widget, GtkRequisition *requisition) @@ -298,7 +291,6 @@ e_calendar_size_request (GtkWidget *widget, requisition->height = height + style->ythickness * 2; } - static void e_calendar_size_allocate (GtkWidget *widget, GtkAllocation *allocation) @@ -339,7 +331,6 @@ e_calendar_size_allocate (GtkWidget *widget, "y2", new_y2, NULL); - /* Position the arrow buttons. */ arrow_button_size = PANGO_PIXELS (pango_font_metrics_get_ascent (font_metrics)) @@ -391,7 +382,6 @@ e_calendar_set_minimum_size (ECalendar *cal, gtk_widget_queue_resize (GTK_WIDGET (cal)); } - void e_calendar_set_maximum_size (ECalendar *cal, gint rows, @@ -410,7 +400,6 @@ e_calendar_set_maximum_size (ECalendar *cal, gtk_widget_queue_resize (GTK_WIDGET (cal)); } - /* Returns the border size on each side of the month displays. */ void e_calendar_get_border_size (ECalendar *cal, @@ -435,7 +424,6 @@ e_calendar_get_border_size (ECalendar *cal, } } - static void e_calendar_on_prev_pressed (ECalendar *cal) { @@ -462,7 +450,6 @@ e_calendar_start_auto_move (ECalendar *cal, } - static gboolean e_calendar_auto_move_handler (gpointer data) { @@ -489,21 +476,18 @@ e_calendar_auto_move_handler (gpointer data) return TRUE; } - static void e_calendar_on_prev_released (ECalendar *cal) { e_calendar_stop_auto_move (cal); } - static void e_calendar_on_next_released (ECalendar *cal) { e_calendar_stop_auto_move (cal); } - static void e_calendar_stop_auto_move (ECalendar *cal) { @@ -527,7 +511,6 @@ e_calendar_on_next_clicked (ECalendar *cal) cal->calitem->month + 1); } - static gint e_calendar_drag_motion (GtkWidget *widget, GdkDragContext *context, @@ -542,7 +525,6 @@ e_calendar_drag_motion (GtkWidget *widget, return FALSE; } - static void e_calendar_drag_leave (GtkWidget *widget, GdkDragContext *context, diff --git a/widgets/misc/e-calendar.h b/widgets/misc/e-calendar.h index 911e9ee22a..2ee002807a 100644 --- a/widgets/misc/e-calendar.h +++ b/widgets/misc/e-calendar.h @@ -41,7 +41,6 @@ G_BEGIN_DECLS #define E_CALENDAR_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, e_calendar_get_type (), ECalendarClass) #define E_IS_CALENDAR(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, e_calendar_get_type ()) - typedef struct _ECalendar ECalendar; typedef struct _ECalendarClass ECalendarClass; @@ -73,7 +72,6 @@ struct _ECalendarClass ECanvasClass parent_class; }; - GType e_calendar_get_type (void); GtkWidget* e_calendar_new (void); diff --git a/widgets/misc/e-canvas-background.h b/widgets/misc/e-canvas-background.h index 562987e7d7..7e3ac19a13 100644 --- a/widgets/misc/e-canvas-background.h +++ b/widgets/misc/e-canvas-background.h @@ -42,7 +42,6 @@ G_BEGIN_DECLS * y2 double RW If you need the rectangle to have negative coordinates, use an affine. */ - #define E_CANVAS_BACKGROUND_TYPE (e_canvas_background_get_type ()) #define E_CANVAS_BACKGROUND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_CANVAS_BACKGROUND_TYPE, ECanvasBackground)) #define E_CANVAS_BACKGROUND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_CANVAS_BACKGROUND_TYPE, ECanvasBackgroundClass)) @@ -64,7 +63,6 @@ struct _ECanvasBackgroundClass { void (*style_set) (ECanvasBackground *eti, GtkStyle *previous_style); }; - /* Standard Gtk function */ GType e_canvas_background_get_type (void); diff --git a/widgets/misc/e-canvas-utils.c b/widgets/misc/e-canvas-utils.c index cae41d859f..e69bb9c980 100644 --- a/widgets/misc/e-canvas-utils.c +++ b/widgets/misc/e-canvas-utils.c @@ -63,7 +63,6 @@ compute_offset(gint top, gint bottom, gint page_top, gint page_bottom) return offset; } - static void e_canvas_show_area (GnomeCanvas *canvas, double x1, double y1, double x2, double y2) { @@ -96,7 +95,6 @@ e_canvas_item_show_area (GnomeCanvasItem *item, double x1, double y1, double x2, e_canvas_show_area(item->canvas, x1, y1, x2, y2); } - static gboolean e_canvas_area_shown (GnomeCanvas *canvas, double x1, double y1, double x2, double y2) { diff --git a/widgets/misc/e-canvas-vbox.c b/widgets/misc/e-canvas-vbox.c index bb0bd775e9..a7e8191bc4 100644 --- a/widgets/misc/e-canvas-vbox.c +++ b/widgets/misc/e-canvas-vbox.c @@ -264,7 +264,6 @@ e_canvas_vbox_real_add_item(ECanvasVbox *e_canvas_vbox, GnomeCanvasItem *item) } } - static void e_canvas_vbox_real_add_item_start(ECanvasVbox *e_canvas_vbox, GnomeCanvasItem *item) { diff --git a/widgets/misc/e-canvas-vbox.h b/widgets/misc/e-canvas-vbox.h index fb049c3e9c..b41b8f80ec 100644 --- a/widgets/misc/e-canvas-vbox.h +++ b/widgets/misc/e-canvas-vbox.h @@ -45,7 +45,6 @@ G_BEGIN_DECLS #define E_IS_CANVAS_VBOX(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_CANVAS_VBOX_TYPE)) #define E_IS_CANVAS_VBOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_CANVAS_VBOX_TYPE)) - typedef struct _ECanvasVbox ECanvasVbox; typedef struct _ECanvasVboxClass ECanvasVboxClass; @@ -83,5 +82,4 @@ GType e_canvas_vbox_get_type (void); G_END_DECLS - #endif /* __E_CANVAS_VBOX_H__ */ diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c index 53e3eafeec..aeb26344ab 100644 --- a/widgets/misc/e-canvas.c +++ b/widgets/misc/e-canvas.c @@ -143,7 +143,6 @@ e_canvas_new (void) return GTK_WIDGET (g_object_new (E_CANVAS_TYPE, NULL)); } - /* Emits an event for an item in the canvas, be it the current item, grabbed * item, or focused item, as appropriate. */ @@ -279,7 +278,6 @@ e_canvas_key (GtkWidget *widget, GdkEventKey *event) return emit_event (canvas, &full_event); } - /* This routine invokes the point method of the item. The argument x, y should * be in the parent's item-relative coordinate system. This routine applies the * inverse of the item's transform, maintaining the affine invariant. @@ -546,7 +544,6 @@ e_canvas_visibility (GtkWidget *widget, GdkEventVisibility *event, ECanvas *canv return FALSE; } - /** * e_canvas_item_grab_focus: * @item: A canvas item. @@ -664,7 +661,6 @@ e_canvas_style_set (GtkWidget *widget, GtkStyle *previous_style) ec_style_set_recursive (GNOME_CANVAS_ITEM (gnome_canvas_root (GNOME_CANVAS (widget))), previous_style); } - static void e_canvas_realize (GtkWidget *widget) { @@ -797,7 +793,6 @@ e_canvas_item_set_reflow_callback (GnomeCanvasItem *item, ECanvasItemReflowFunc g_object_set_data(G_OBJECT(item), "ECanvasItem::reflow_callback", (gpointer) func); } - void e_canvas_item_set_selection_callback (GnomeCanvasItem *item, ECanvasItemSelectionFunc func) { @@ -1004,7 +999,6 @@ void e_canvas_hide_tooltip (ECanvas *canvas) } } - static gboolean grab_cancelled_check (gpointer data) { diff --git a/widgets/misc/e-canvas.h b/widgets/misc/e-canvas.h index 58994d6e29..a78824e1ef 100644 --- a/widgets/misc/e-canvas.h +++ b/widgets/misc/e-canvas.h @@ -50,7 +50,6 @@ typedef gint (*ECanvasItemSelectionCompareFunc) (GnomeCanvasItem gpointer data2, gint flags); - typedef struct _ECanvas ECanvas; typedef struct _ECanvasClass ECanvasClass; @@ -101,7 +100,6 @@ struct _ECanvasClass void (* reflow) (ECanvas *canvas); }; - GType e_canvas_get_type (void); GtkWidget *e_canvas_new (void); @@ -147,5 +145,4 @@ void e_canvas_hide_tooltip (ECanvas G_END_DECLS - #endif /* __E_CANVAS_H__ */ diff --git a/widgets/misc/e-cell-date-edit.c b/widgets/misc/e-cell-date-edit.c index 38aaf590c6..dfbe183f88 100644 --- a/widgets/misc/e-cell-date-edit.c +++ b/widgets/misc/e-cell-date-edit.c @@ -25,7 +25,6 @@ * window to edit it. */ - #ifdef HAVE_CONFIG_H #include #endif @@ -99,7 +98,6 @@ static void e_cell_date_edit_update_cell (ECellDateEdit *ecde, static void e_cell_date_edit_on_time_selected (GtkTreeSelection *selection, ECellDateEdit *ecde); static void e_cell_date_edit_hide_popup (ECellDateEdit *ecde); - /* Our arguments. */ enum { PROP_0, @@ -114,7 +112,6 @@ enum { G_DEFINE_TYPE (ECellDateEdit, e_cell_date_edit, E_CELL_POPUP_TYPE) - static void e_cell_date_edit_class_init (ECellDateEditClass *class) { @@ -207,7 +204,6 @@ e_cell_date_edit_class_init (ECellDateEditClass *class) G_PARAM_READWRITE)); } - static void e_cell_date_edit_init (ECellDateEdit *ecde) { @@ -328,7 +324,6 @@ e_cell_date_edit_init (ECellDateEdit *ecde) G_CALLBACK (e_cell_date_edit_on_ok_clicked), ecde); - g_signal_connect((ecde->popup_window), "key_press_event", G_CALLBACK (e_cell_date_edit_key_press), @@ -339,7 +334,6 @@ e_cell_date_edit_init (ECellDateEdit *ecde) ecde); } - /** * e_cell_date_edit_new: * @@ -353,7 +347,6 @@ e_cell_date_edit_new (void) return g_object_new (e_cell_date_edit_get_type (), NULL); } - /* * GtkObject::destroy method */ @@ -370,7 +363,6 @@ e_cell_date_edit_destroy (GtkObject *object) GTK_OBJECT_CLASS (e_cell_date_edit_parent_class)->destroy (object); } - static void e_cell_date_edit_get_property (GObject *object, guint property_id, @@ -408,7 +400,6 @@ e_cell_date_edit_get_property (GObject *object, G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); } - static void e_cell_date_edit_set_property (GObject *object, guint property_id, @@ -481,7 +472,6 @@ e_cell_date_edit_set_property (GObject *object, G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); } - static gint e_cell_date_edit_do_popup (ECellPopup *ecp, GdkEvent *event, @@ -502,7 +492,6 @@ e_cell_date_edit_do_popup (ECellPopup *ecp, return TRUE; } - static void e_cell_date_edit_set_popup_values (ECellDateEdit *ecde) { @@ -562,7 +551,6 @@ e_cell_date_edit_set_popup_values (ECellDateEdit *ecde) e_cell_text_free_text (ecell_text, cell_text); } - static void e_cell_date_edit_select_matching_time (ECellDateEdit *ecde, gchar *time) @@ -602,7 +590,6 @@ e_cell_date_edit_select_matching_time (ECellDateEdit *ecde, } } - static void e_cell_date_edit_show_popup (ECellDateEdit *ecde, gint row, @@ -626,7 +613,6 @@ e_cell_date_edit_show_popup (ECellDateEdit *ecde, e_cell_popup_set_shown (E_CELL_POPUP (ecde), TRUE); } - /* Calculates the size and position of the popup window (like GtkCombo). */ static void e_cell_date_edit_get_popup_pos (ECellDateEdit *ecde, @@ -710,7 +696,6 @@ e_cell_date_edit_get_popup_pos (ECellDateEdit *ecde, *height = popup_requisition.height; } - /* This handles key press events in the popup window. If the Escape key is pressed we hide the popup, and do not change the cell contents. */ static gint @@ -727,7 +712,6 @@ e_cell_date_edit_key_press (GtkWidget *popup_window, return TRUE; } - /* This handles button press events in the popup window. If the button is pressed outside the popup, we hide it and do not change the cell contents. */ @@ -746,7 +730,6 @@ e_cell_date_edit_button_press (GtkWidget *popup_window, return TRUE; } - /* Clears the time list and rebuilds it using the lower_hour, upper_hour and use_24_hour_format settings. */ static void @@ -792,7 +775,6 @@ e_cell_date_edit_rebuild_time_list (ECellDateEdit *ecde) ecde->need_time_list_rebuild = FALSE; } - static void e_cell_date_edit_on_ok_clicked (GtkWidget *button, ECellDateEdit *ecde) @@ -837,7 +819,6 @@ e_cell_date_edit_on_ok_clicked (GtkWidget *button, e_cell_date_edit_hide_popup (ecde); } - static void e_cell_date_edit_show_time_invalid_warning (ECellDateEdit *ecde) { @@ -868,7 +849,6 @@ e_cell_date_edit_show_time_invalid_warning (ECellDateEdit *ecde) gtk_widget_destroy (dialog); } - static void e_cell_date_edit_on_now_clicked (GtkWidget *button, ECellDateEdit *ecde) @@ -892,7 +872,6 @@ e_cell_date_edit_on_now_clicked (GtkWidget *button, e_cell_date_edit_hide_popup (ecde); } - static void e_cell_date_edit_on_none_clicked (GtkWidget *button, ECellDateEdit *ecde) @@ -901,7 +880,6 @@ e_cell_date_edit_on_none_clicked (GtkWidget *button, e_cell_date_edit_hide_popup (ecde); } - static void e_cell_date_edit_on_today_clicked (GtkWidget *button, ECellDateEdit *ecde) @@ -929,7 +907,6 @@ e_cell_date_edit_on_today_clicked (GtkWidget *button, e_cell_date_edit_hide_popup (ecde); } - static void e_cell_date_edit_update_cell (ECellDateEdit *ecde, const gchar *text) @@ -957,7 +934,6 @@ e_cell_date_edit_update_cell (ECellDateEdit *ecde, e_cell_text_free_text (ecell_text, old_text); } - static void e_cell_date_edit_on_time_selected (GtkTreeSelection *selection, ECellDateEdit *ecde) { @@ -977,7 +953,6 @@ e_cell_date_edit_on_time_selected (GtkTreeSelection *selection, ECellDateEdit *e g_free (list_item_text); } - static void e_cell_date_edit_hide_popup (ECellDateEdit *ecde) { @@ -986,7 +961,6 @@ e_cell_date_edit_hide_popup (ECellDateEdit *ecde) e_cell_popup_set_shown (E_CELL_POPUP (ecde), FALSE); } - /* These freeze and thaw the rebuilding of the time list. They are useful when setting several properties which result in rebuilds of the list, e.g. the lower_hour, upper_hour and use_24_hour_format properties. */ @@ -998,7 +972,6 @@ e_cell_date_edit_freeze (ECellDateEdit *ecde) ecde->freeze_count++; } - void e_cell_date_edit_thaw (ECellDateEdit *ecde) { @@ -1012,7 +985,6 @@ e_cell_date_edit_thaw (ECellDateEdit *ecde) } } - /* Sets a callback to use to get the current time. This is useful if the application needs to use its own timezone data rather than rely on the Unix timezone. */ diff --git a/widgets/misc/e-cell-date-edit.h b/widgets/misc/e-cell-date-edit.h index 2e125fece3..72fe952e31 100644 --- a/widgets/misc/e-cell-date-edit.h +++ b/widgets/misc/e-cell-date-edit.h @@ -38,7 +38,6 @@ #define E_IS_CELL_DATE_EDIT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_CELL_DATE_EDIT_TYPE)) #define E_IS_CELL_DATE_EDIT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_CELL_DATE_EDIT_TYPE)) - typedef struct _ECellDateEdit ECellDateEdit; typedef struct _ECellDateEditClass ECellDateEditClass; @@ -82,18 +81,15 @@ struct _ECellDateEditClass { ECellPopupClass parent_class; }; - GType e_cell_date_edit_get_type (void); ECell *e_cell_date_edit_new (void); - /* These freeze and thaw the rebuilding of the time list. They are useful when setting several properties which result in rebuilds of the list, e.g. the lower_hour, upper_hour and use_24_hour_format properties. */ void e_cell_date_edit_freeze (ECellDateEdit *ecde); void e_cell_date_edit_thaw (ECellDateEdit *ecde); - /* Sets a callback to use to get the current time. This is useful if the application needs to use its own timezone data rather than rely on the Unix timezone. */ @@ -102,5 +98,4 @@ void e_cell_date_edit_set_get_time_callback(ECellDateEdit *ecde, gpointer data, GDestroyNotify destroy); - #endif /* _E_CELL_DATE_EDIT_H_ */ diff --git a/widgets/misc/e-cell-percent.c b/widgets/misc/e-cell-percent.c index 35dbb611ed..3ed995421b 100644 --- a/widgets/misc/e-cell-percent.c +++ b/widgets/misc/e-cell-percent.c @@ -40,7 +40,6 @@ G_DEFINE_TYPE (ECellPercent, e_cell_percent, E_CELL_TEXT_TYPE) - static gchar * ecp_get_text (ECellText *cell, ETableModel *model, gint col, gint row) { diff --git a/widgets/misc/e-config-page.c b/widgets/misc/e-config-page.c index 00fb991578..922a26960c 100644 --- a/widgets/misc/e-config-page.c +++ b/widgets/misc/e-config-page.c @@ -46,4 +46,3 @@ e_config_page_new (void) return g_object_new (e_config_page_get_type (), NULL); } - diff --git a/widgets/misc/e-cursors.c b/widgets/misc/e-cursors.c index ddf5f1ac26..e8f4221b60 100644 --- a/widgets/misc/e-cursors.c +++ b/widgets/misc/e-cursors.c @@ -61,7 +61,6 @@ static CursorDef cursors [] = { { NULL, 0, 0, NULL } }; - static void create_bitmap_and_mask_from_xpm (GdkBitmap **bitmap, GdkBitmap **mask, const gchar **xpm) { @@ -150,7 +149,6 @@ e_cursors_shutdown (void) gdk_cursor_unref (cursors [i].cursor); } - /* Returns a cursor given its type */ GdkCursor * e_cursor_get (ECursorType type) diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c index 1d69016b20..e7b1a0555e 100644 --- a/widgets/misc/e-dateedit.c +++ b/widgets/misc/e-dateedit.c @@ -23,7 +23,6 @@ * time field with popups for entering a date. */ - #ifdef HAVE_CONFIG_H #include #endif @@ -113,10 +112,8 @@ enum { LAST_SIGNAL }; - static gint date_edit_signals [LAST_SIGNAL] = { 0 }; - static void e_date_edit_class_init (EDateEditClass *class); static void e_date_edit_init (EDateEdit *dedit); static void create_children (EDateEdit *dedit); @@ -191,7 +188,6 @@ static gboolean e_date_edit_set_time_internal (EDateEdit *dedit, gint hour, gint minute); - static GtkHBoxClass *parent_class; /** @@ -223,7 +219,6 @@ e_date_edit_get_type (void) return date_edit_type; } - static void e_date_edit_class_init (EDateEditClass *class) { @@ -249,7 +244,6 @@ e_date_edit_class_init (EDateEditClass *class) class->changed = NULL; } - static void e_date_edit_init (EDateEdit *dedit) { @@ -282,7 +276,6 @@ e_date_edit_init (EDateEdit *dedit) e_date_edit_set_time (dedit, 0); } - /** * e_date_edit_new: * @@ -304,7 +297,6 @@ e_date_edit_new (void) return GTK_WIDGET (dedit); } - static void create_children (EDateEdit *dedit) { @@ -480,7 +472,6 @@ create_children (EDateEdit *dedit) G_CALLBACK (on_date_popup_none_button_clicked), dedit); } - static void e_date_edit_dispose (GObject *object) { @@ -504,7 +495,6 @@ e_date_edit_dispose (GObject *object) (* G_OBJECT_CLASS (parent_class)->dispose) (object); } - /* GtkWidget::mnemonic_activate() handler for the EDateEdit */ static gboolean e_date_edit_mnemonic_activate (GtkWidget *widget, gboolean group_cycling) @@ -530,7 +520,6 @@ e_date_edit_grab_focus (GtkWidget *widget) gtk_widget_grab_focus (GTK_BIN (dedit->priv->time_combo)->child); } - /** * e_date_edit_set_editable: * @dedit: an #EDateEdit widget. @@ -553,7 +542,6 @@ e_date_edit_set_editable (EDateEdit *dedit, gboolean editable) gtk_widget_set_sensitive (priv->date_button, editable); } - /** * e_date_edit_get_time: * @dedit: an #EDateEdit widget. @@ -600,7 +588,6 @@ e_date_edit_get_time (EDateEdit *dedit) return mktime (&tmp_tm); } - /** * e_date_edit_set_time: * @dedit: the EDateEdit widget @@ -664,7 +651,6 @@ e_date_edit_set_time (EDateEdit *dedit, date_edit_signals [CHANGED], 0); } - /** * e_date_edit_get_date: * @dedit: an #EDateEdit widget. @@ -701,7 +687,6 @@ e_date_edit_get_date (EDateEdit *dedit, return TRUE; } - /** * e_date_edit_set_date: * @dedit: an #EDateEdit widget. @@ -734,7 +719,6 @@ e_date_edit_set_date (EDateEdit *dedit, date_edit_signals [CHANGED], 0); } - /** * e_date_edit_get_time_of_day: * @dedit: an #EDateEdit widget. @@ -769,7 +753,6 @@ e_date_edit_get_time_of_day (EDateEdit *dedit, } } - /** * e_date_edit_set_time_of_day: * @dedit: an #EDateEdit widget. @@ -854,7 +837,6 @@ e_date_edit_get_show_date (EDateEdit *dedit) return dedit->priv->show_date; } - /** * e_date_edit_set_show_date: * @dedit: an #EDateEdit widget. @@ -895,7 +877,6 @@ e_date_edit_set_show_date (EDateEdit *dedit, gtk_widget_hide (priv->space); } - /** * e_date_edit_get_show_time: * @dedit: an #EDateEdit widget @@ -911,7 +892,6 @@ e_date_edit_get_show_time (EDateEdit *dedit) return dedit->priv->show_time; } - /** * e_date_edit_set_show_time: * @dedit: an #EDateEdit widget @@ -938,7 +918,6 @@ e_date_edit_set_show_time (EDateEdit *dedit, e_date_edit_update_time_combo_state (dedit); } - /** * e_date_edit_get_make_time_insensitive: * @dedit: an #EDateEdit widget @@ -956,7 +935,6 @@ e_date_edit_get_make_time_insensitive (EDateEdit *dedit) return dedit->priv->make_time_insensitive; } - /** * e_date_edit_set_make_time_insensitive: * @dedit: an #EDateEdit widget @@ -988,7 +966,6 @@ e_date_edit_set_make_time_insensitive (EDateEdit *dedit, e_date_edit_update_time_combo_state (dedit); } - /** * e_date_edit_get_week_start_day: * @dedit: an #EDateEdit widget @@ -1011,7 +988,6 @@ e_date_edit_get_week_start_day (EDateEdit *dedit) return week_start_day; } - /** * e_date_edit_set_week_start_day: * @dedit: an #EDateEdit widget @@ -1030,7 +1006,6 @@ e_date_edit_set_week_start_day (EDateEdit *dedit, NULL); } - /* Whether we show week numbers in the date popup. */ gboolean e_date_edit_get_show_week_numbers (EDateEdit *dedit) @@ -1046,7 +1021,6 @@ e_date_edit_get_show_week_numbers (EDateEdit *dedit) return show_week_numbers; } - void e_date_edit_set_show_week_numbers (EDateEdit *dedit, gboolean show_week_numbers) @@ -1058,7 +1032,6 @@ e_date_edit_set_show_week_numbers (EDateEdit *dedit, NULL); } - /* Whether we use 24 hour format in the time field & popup. */ gboolean e_date_edit_get_use_24_hour_format (EDateEdit *dedit) @@ -1068,7 +1041,6 @@ e_date_edit_get_use_24_hour_format (EDateEdit *dedit) return dedit->priv->use_24_hour_format; } - void e_date_edit_set_use_24_hour_format (EDateEdit *dedit, gboolean use_24_hour_format) @@ -1085,7 +1057,6 @@ e_date_edit_set_use_24_hour_format (EDateEdit *dedit, e_date_edit_update_time_entry (dedit); } - /* Whether we allow the date to be set to 'None'. e_date_edit_get_time() will return (time_t) -1 in this case. */ gboolean @@ -1096,7 +1067,6 @@ e_date_edit_get_allow_no_date_set (EDateEdit *dedit) return GTK_WIDGET_VISIBLE (dedit->priv->none_button); } - void e_date_edit_set_allow_no_date_set (EDateEdit *dedit, gboolean allow_no_date_set) @@ -1121,7 +1091,6 @@ e_date_edit_set_allow_no_date_set (EDateEdit *dedit, } } - /* The range of time to show in the time combo popup. */ void e_date_edit_get_time_popup_range (EDateEdit *dedit, @@ -1134,7 +1103,6 @@ e_date_edit_get_time_popup_range (EDateEdit *dedit, *upper_hour = dedit->priv->upper_hour; } - void e_date_edit_set_time_popup_range (EDateEdit *dedit, gint lower_hour, @@ -1161,7 +1129,6 @@ e_date_edit_set_time_popup_range (EDateEdit *dedit, e_date_edit_update_time_entry (dedit); } - /* The arrow button beside the date field has been clicked, so we show the popup with the ECalendar in. */ static void @@ -1171,7 +1138,6 @@ on_date_button_clicked (GtkWidget *widget, e_date_edit_show_date_popup (dedit); } - static void e_date_edit_show_date_popup (EDateEdit *dedit) { @@ -1217,7 +1183,6 @@ e_date_edit_show_date_popup (EDateEdit *dedit) gdk_window_focus (priv->cal_popup->window, GDK_CURRENT_TIME); } - /* This positions the date popup below and to the left of the arrow button, just before it is shown. */ static void @@ -1256,7 +1221,6 @@ position_date_popup (EDateEdit *dedit) gtk_window_move (GTK_WINDOW (dedit->priv->cal_popup), x, y); } - /* A date has been selected in the date popup, so we set the date field and hide the popup. */ static void @@ -1275,7 +1239,6 @@ on_date_popup_date_selected (ECalendarItem *calitem, g_date_get_day (&start_date)); } - static void on_date_popup_now_button_clicked (GtkWidget *button, EDateEdit *dedit) @@ -1284,7 +1247,6 @@ on_date_popup_now_button_clicked (GtkWidget *button, e_date_edit_set_time (dedit, 0); } - static void on_date_popup_today_button_clicked (GtkWidget *button, EDateEdit *dedit) @@ -1308,7 +1270,6 @@ on_date_popup_today_button_clicked (GtkWidget *button, tmp_tm.tm_mon + 1, tmp_tm.tm_mday); } - static void on_date_popup_none_button_clicked (GtkWidget *button, EDateEdit *dedit) @@ -1317,7 +1278,6 @@ on_date_popup_none_button_clicked (GtkWidget *button, e_date_edit_set_time (dedit, -1); } - /* A key has been pressed while the date popup is showing. If it is the Escape key we hide the popup. */ static gint @@ -1336,7 +1296,6 @@ on_date_popup_key_press (GtkWidget *widget, return TRUE; } - /* A mouse button has been pressed while the date popup is showing. Any button press events used to select days etc. in the popup will have have been handled elsewhere, so here we just hide the popup. @@ -1373,7 +1332,6 @@ on_date_popup_button_press (GtkWidget *widget, return TRUE; } - /* A delete event has been received for the date popup, so we hide it and return TRUE so it doesn't get destroyed. */ static gint @@ -1384,7 +1342,6 @@ on_date_popup_delete_event (GtkWidget *widget, return TRUE; } - /* Hides the date popup, removing any grabs. */ static void hide_date_popup (EDateEdit *dedit) @@ -1395,7 +1352,6 @@ hide_date_popup (EDateEdit *dedit) gdk_keyboard_ungrab (GDK_CURRENT_TIME); } - /* Clears the time popup and rebuilds it using the lower_hour, upper_hour and use_24_hour_format settings. */ static void @@ -1451,7 +1407,6 @@ rebuild_time_popup (EDateEdit *dedit) } } - static gboolean e_date_edit_parse_date (EDateEdit *dedit, const gchar *date_text, @@ -1475,7 +1430,6 @@ e_date_edit_parse_date (EDateEdit *dedit, return TRUE; } - static gboolean e_date_edit_parse_time (EDateEdit *dedit, const gchar *time_text, @@ -1493,7 +1447,6 @@ e_date_edit_parse_time (EDateEdit *dedit, return TRUE; } - /* Returns TRUE if the string is empty or is "None" in the current locale. It ignores whitespace. */ static gboolean @@ -1514,7 +1467,6 @@ field_set_to_none (const gchar *text) return FALSE; } - static void on_date_edit_time_selected (GtkComboBox *combo, EDateEdit *dedit) @@ -1530,7 +1482,6 @@ on_date_edit_time_selected (GtkComboBox *combo, e_date_edit_check_time_changed (dedit); } - static gint on_date_entry_key_press (GtkWidget *widget, GdkEventKey *event, @@ -1555,7 +1506,6 @@ on_date_entry_key_press (GtkWidget *widget, return FALSE; } - static gint on_time_entry_key_press (GtkWidget *widget, GdkEventKey *event, @@ -1611,7 +1561,6 @@ on_time_entry_key_release (GtkWidget *widget, return FALSE; } - static gint on_date_entry_focus_out (GtkEntry *entry, GdkEventFocus *event, @@ -1647,7 +1596,6 @@ on_date_entry_focus_out (GtkEntry *entry, return FALSE; } - static gint on_time_entry_focus_out (GtkEntry *entry, GdkEventFocus *event, @@ -1750,7 +1698,6 @@ e_date_edit_update_date_entry (EDateEdit *dedit) add_relation (dedit, priv->date_button); } - /* This sets the text in the time entry according to the current settings. */ static void e_date_edit_update_time_entry (EDateEdit *dedit) @@ -1827,7 +1774,6 @@ e_date_edit_update_time_entry (EDateEdit *dedit) add_relation (dedit, priv->time_combo); } - static void e_date_edit_update_time_combo_state (EDateEdit *dedit) { @@ -1882,7 +1828,6 @@ e_date_edit_update_time_combo_state (EDateEdit *dedit) gtk_widget_hide (priv->space); } - /* Parses the date, and if it is different from the current settings it updates the settings and emits a "date_changed" signal. */ static void @@ -1909,7 +1854,6 @@ e_date_edit_check_date_changed (EDateEdit *dedit) tmp_tm.tm_mday = 0; } - date_changed = e_date_edit_set_date_internal (dedit, valid, none, tmp_tm.tm_year, tmp_tm.tm_mon, @@ -1920,7 +1864,6 @@ e_date_edit_check_date_changed (EDateEdit *dedit) date_edit_signals [CHANGED], 0); } - /* Parses the time, and if it is different from the current settings it updates the settings and emits a "time_changed" signal. */ static void @@ -1953,7 +1896,6 @@ e_date_edit_check_time_changed (EDateEdit *dedit) } } - /** * e_date_edit_date_is_valid: * @dedit: an #EDateEdit widget. @@ -1981,7 +1923,6 @@ e_date_edit_date_is_valid (EDateEdit *dedit) return TRUE; } - /** * e_date_edit_time_is_valid: * @dedit: an #EDateEdit widget. @@ -2072,7 +2013,6 @@ e_date_edit_set_date_internal (EDateEdit *dedit, return date_changed; } - static gboolean e_date_edit_set_time_internal (EDateEdit *dedit, gboolean valid, diff --git a/widgets/misc/e-dropdown-button.c b/widgets/misc/e-dropdown-button.c index 98c64f4ea7..0ff0c99fef 100644 --- a/widgets/misc/e-dropdown-button.c +++ b/widgets/misc/e-dropdown-button.c @@ -141,7 +141,6 @@ e_dropdown_button_class_init (EDropdownButtonClass *klass) toggle_class->toggled = impl_toggled; } - static void e_dropdown_button_init (EDropdownButton *dropdown_button) { diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c index 87725cd498..42fc03882f 100644 --- a/widgets/misc/e-filter-bar.c +++ b/widgets/misc/e-filter-bar.c @@ -52,12 +52,10 @@ enum { PROP_STATE }; - /* Callbacks. */ static void rule_changed (FilterRule *rule, gpointer user_data); - /* rule editor thingy */ static void rule_editor_destroyed (EFilterBar *efb, GObject *deadbeef) @@ -498,7 +496,6 @@ free_items (ESearchBarItem *items) for (i = 0; items[i].id != -1; i++) g_free (items[i].text); - g_free (items); } @@ -705,7 +702,6 @@ set_property (GObject *object, guint property_id, const GValue *value, GParamSpe if (!strcmp ((gchar *)node->name, "filter-bar")) { FilterRule *rule = NULL; - view_id = xml_get_prop_int (node, "view_id"); scope = xml_get_prop_int (node, "searchscope"); item_id = xml_get_prop_int (node, "item_id"); @@ -736,7 +732,6 @@ set_property (GObject *object, guint property_id, const GValue *value, GParamSpe } } - if (rule_set) { esb->block_search = TRUE; e_search_bar_set_text (esb, _("Advanced Search")); @@ -765,7 +760,6 @@ set_property (GObject *object, guint property_id, const GValue *value, GParamSpe /* set the text first (it doesn't emit a signal) */ - /* now set the item_id and subitem_id */ item_id = xml_get_prop_int (node, "item_id"); subitem_id = xml_get_prop_int (node, "subitem_id"); @@ -804,7 +798,6 @@ set_property (GObject *object, guint property_id, const GValue *value, GParamSpe xmlFree (text); - break; } diff --git a/widgets/misc/e-filter-bar.h b/widgets/misc/e-filter-bar.h index f25a66fa73..8659f0a638 100644 --- a/widgets/misc/e-filter-bar.h +++ b/widgets/misc/e-filter-bar.h @@ -113,7 +113,6 @@ const gchar * strings[] = { }; #endif - GType e_filter_bar_get_type (void); EFilterBar *e_filter_bar_new (RuleContext *context, @@ -136,5 +135,4 @@ e_filter_bar_new_construct (RuleContext *context, G_END_DECLS - #endif /* __E_FILTER_BAR_H__ */ diff --git a/widgets/misc/e-gui-utils.c b/widgets/misc/e-gui-utils.c index 9110e14257..6cd4958127 100644 --- a/widgets/misc/e-gui-utils.c +++ b/widgets/misc/e-gui-utils.c @@ -94,7 +94,6 @@ e_container_change_tab_order_destroy_notify(gpointer data) g_list_free(list); } - static gint e_container_change_tab_order_callback(GtkContainer *container, GtkDirectionType direction, diff --git a/widgets/misc/e-hsv-utils.c b/widgets/misc/e-hsv-utils.c index b42271fb19..3a2e4500e0 100644 --- a/widgets/misc/e-hsv-utils.c +++ b/widgets/misc/e-hsv-utils.c @@ -175,4 +175,3 @@ e_rgb_to_hsv (gdouble r, gdouble g, gdouble b, } } - diff --git a/widgets/misc/e-icon-entry.c b/widgets/misc/e-icon-entry.c index 0fb4540161..2ed50e242f 100644 --- a/widgets/misc/e-icon-entry.c +++ b/widgets/misc/e-icon-entry.c @@ -353,7 +353,6 @@ set_cursor (GtkWidget *widget, GdkEventCrossing *event, gpointer dummy) else gdk_window_set_cursor (widget->window, gdk_cursor_new (GDK_LEFT_PTR)); - } GtkWidget * diff --git a/widgets/misc/e-image-chooser.c b/widgets/misc/e-image-chooser.c index 3c83cb1048..2893cae1d1 100644 --- a/widgets/misc/e-image-chooser.c +++ b/widgets/misc/e-image-chooser.c @@ -50,7 +50,6 @@ enum { LAST_SIGNAL }; - static gint image_chooser_signals [LAST_SIGNAL] = { 0 }; static void e_image_chooser_init (EImageChooser *chooser); @@ -119,7 +118,6 @@ e_image_chooser_get_type (void) return eic_type; } - static void e_image_chooser_class_init (EImageChooserClass *klass) { @@ -219,7 +217,6 @@ e_image_chooser_dispose (GObject *object) (* G_OBJECT_CLASS (parent_class)->dispose) (object); } - static gboolean set_image_from_data (EImageChooser *chooser, gchar *data, gint length) diff --git a/widgets/misc/e-image-chooser.h b/widgets/misc/e-image-chooser.h index be2d427291..ece1419633 100644 --- a/widgets/misc/e-image-chooser.h +++ b/widgets/misc/e-image-chooser.h @@ -52,7 +52,6 @@ struct _EImageChooserClass /* signals */ void (*changed) (EImageChooser *chooser); - }; GtkWidget *e_image_chooser_new (void); diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c index 82ce1c17aa..d9114a5e82 100644 --- a/widgets/misc/e-map.c +++ b/widgets/misc/e-map.c @@ -37,13 +37,11 @@ #define SCROLL_STEP_SIZE 32 - /* */ #define E_MAP_GET_WIDTH(map) gdk_pixbuf_get_width(((EMapPrivate *) E_MAP(map)->priv)->map_render_pixbuf) #define E_MAP_GET_HEIGHT(map) gdk_pixbuf_get_height(((EMapPrivate *) E_MAP(map)->priv)->map_render_pixbuf) - /* Zoom state - keeps track of animation hacks */ typedef enum @@ -55,7 +53,6 @@ typedef enum } EMapZoomState; - /* Private part of the EMap structure */ typedef struct @@ -82,7 +79,6 @@ typedef struct } EMapPrivate; - /* Internal prototypes */ static void e_map_class_init (EMapClass *class); @@ -116,12 +112,10 @@ static void repaint_point (EMap *map, EMapPoint *point); static GtkWidgetClass *parent_class; - /* ----------------- * * Widget management * * ----------------- */ - /** * e_map_get_type: * @void: @@ -200,7 +194,6 @@ e_map_class_init (EMapClass *class) widget_class->key_press_event = e_map_key_press; } - /* Object initialization function for the map view */ static void @@ -223,7 +216,6 @@ e_map_init (EMap *view) GTK_WIDGET_UNSET_FLAGS (view, GTK_NO_WINDOW); } - /* Destroy handler for the map view */ static void @@ -245,7 +237,6 @@ e_map_destroy (GtkObject *object) (*GTK_OBJECT_CLASS (parent_class)->destroy) (object); } - /* Finalize handler for the map view */ static void @@ -285,7 +276,6 @@ e_map_finalize (GObject *object) (*G_OBJECT_CLASS (parent_class)->finalize) (object); } - /* Unmap handler for the map view */ static void @@ -298,7 +288,6 @@ e_map_unmap (GtkWidget *widget) (*GTK_WIDGET_CLASS (parent_class)->unmap) (widget); } - /* Realize handler for the map view */ static void @@ -335,7 +324,6 @@ e_map_realize (GtkWidget *widget) update_render_pixbuf (E_MAP (widget), GDK_INTERP_BILINEAR, TRUE); } - /* Unrealize handler for the map view */ static void @@ -348,7 +336,6 @@ e_map_unrealize (GtkWidget *widget) (*GTK_WIDGET_CLASS (parent_class)->unrealize) (widget); } - /* Size_request handler for the map view */ static void @@ -370,7 +357,6 @@ e_map_size_request (GtkWidget *widget, GtkRequisition *requisition) requisition->height = gdk_pixbuf_get_height (priv->map_pixbuf); } - /* Size_allocate handler for the map view */ static void @@ -403,7 +389,6 @@ e_map_size_allocate (GtkWidget *widget, GtkAllocation *allocation) update_render_pixbuf (view, GDK_INTERP_BILINEAR, TRUE); } - /* Button press handler for the map view */ static gint @@ -413,7 +398,6 @@ e_map_button_press (GtkWidget *widget, GdkEventButton *event) return TRUE; } - /* Button release handler for the map view */ static gint @@ -425,7 +409,6 @@ e_map_button_release (GtkWidget *widget, GdkEventButton *event) return TRUE; } - /* Motion handler for the map view */ static gint @@ -446,7 +429,6 @@ e_map_motion (GtkWidget *widget, GdkEventMotion *event) */ } - /* Expose handler for the map view */ static gint @@ -464,7 +446,6 @@ e_map_expose (GtkWidget *widget, GdkEventExpose *event) return TRUE; } - /* Set_scroll_adjustments handler for the map view */ static void @@ -529,7 +510,6 @@ e_map_set_scroll_adjustments (GtkWidget *widget, GtkAdjustment *hadj, GtkAdjustm if (need_adjust) adjustment_changed_cb (NULL, view); } - /* Key press handler for the map view */ static gint @@ -601,12 +581,10 @@ e_map_key_press (GtkWidget *widget, GdkEventKey *event) return TRUE; } - /* ---------------- * * Widget interface * * ---------------- */ - /** * e_map_new: * @void: @@ -630,10 +608,8 @@ e_map_new (void) return (E_MAP (widget)); } - /* --- Coordinate translation --- */ - /* These functions translate coordinates between longitude/latitude and * the image x/y offsets, using the equidistant cylindrical projection. * @@ -660,7 +636,6 @@ e_map_window_to_world (EMap *map, double win_x, double win_y, double *world_long ((double) height / 2.0) * 90.0; } - void e_map_world_to_window (EMap *map, double world_longitude, double world_latitude, double *win_x, double *win_y) { @@ -685,10 +660,8 @@ e_map_world_to_window (EMap *map, double world_longitude, double world_latitude, #endif } - /* --- Zoom --- */ - gdouble e_map_get_magnification (EMap *map) { @@ -699,7 +672,6 @@ e_map_get_magnification (EMap *map) else return 1.0; } - void e_map_zoom_to_location (EMap *map, double longitude, double latitude) { @@ -720,7 +692,6 @@ e_map_zoom_to_location (EMap *map, double longitude, double latitude) zoom_do (map); } - void e_map_zoom_out (EMap *map) { @@ -738,28 +709,24 @@ e_map_zoom_out (EMap *map) priv->zoom_state = E_MAP_ZOOMED_OUT; } - void e_map_set_smooth_zoom (EMap *map, gboolean state) { ((EMapPrivate *) map->priv)->smooth_zoom = state; } - gboolean e_map_get_smooth_zoom (EMap *map) { return (((EMapPrivate *) map->priv)->smooth_zoom); } - void e_map_freeze (EMap *map) { ((EMapPrivate *) map->priv)->frozen = TRUE; } - void e_map_thaw (EMap *map) { @@ -767,10 +734,8 @@ e_map_thaw (EMap *map) update_and_paint (map); } - /* --- Point manipulation --- */ - EMapPoint * e_map_add_point (EMap *map, gchar *name, double longitude, double latitude, guint32 color_rgba) { @@ -796,7 +761,6 @@ e_map_add_point (EMap *map, gchar *name, double longitude, double latitude, guin return point; } - void e_map_remove_point (EMap *map, EMapPoint *point) { @@ -817,7 +781,6 @@ e_map_remove_point (EMap *map, EMapPoint *point) g_free (point); } - void e_map_point_get_location (EMapPoint *point, double *longitude, double *latitude) { @@ -825,21 +788,18 @@ e_map_point_get_location (EMapPoint *point, double *longitude, double *latitude) *latitude = point->latitude; } - gchar * e_map_point_get_name (EMapPoint *point) { return point->name; } - guint32 e_map_point_get_color_rgba (EMapPoint *point) { return point->rgba; } - void e_map_point_set_color_rgba (EMap *map, EMapPoint *point, guint32 color_rgba) { @@ -854,21 +814,18 @@ e_map_point_set_color_rgba (EMap *map, EMapPoint *point, guint32 color_rgba) } } - void e_map_point_set_data (EMapPoint *point, gpointer data) { point->user_data = data; } - gpointer e_map_point_get_data (EMapPoint *point) { return point->user_data; } - gboolean e_map_point_is_in_view (EMap *map, EMapPoint *point) { @@ -887,7 +844,6 @@ e_map_point_is_in_view (EMap *map, EMapPoint *point) return FALSE; } - EMapPoint * e_map_get_closest_point (EMap *map, double longitude, double latitude, gboolean in_view) { @@ -918,12 +874,10 @@ e_map_get_closest_point (EMap *map, double longitude, double latitude, gboolean return point_chosen; } - /* ------------------ * * Internal functions * * ------------------ */ - static void repaint_visible (EMap *map) { @@ -937,7 +891,6 @@ repaint_visible (EMap *map) request_paint_area (map, &area); } - static void update_and_paint (EMap *map) { @@ -945,7 +898,6 @@ update_and_paint (EMap *map) repaint_visible (map); } - static gint load_map_background (EMap *view, gchar *name) { @@ -965,7 +917,6 @@ load_map_background (EMap *view, gchar *name) return TRUE; } - static void update_render_pixbuf (EMap *map, GdkInterpType interp, gboolean render_overlays) { @@ -1032,7 +983,6 @@ update_render_pixbuf (EMap *map, GdkInterpType interp, gboolean render_overlays) set_scroll_area (map); } - /* Queues a repaint of the specified area in window coordinates */ static void @@ -1106,7 +1056,6 @@ put_pixel_with_clipping (GdkPixbuf *pixbuf, gint x, gint y, guint rgba) } } - /* Redraw point in client pixbuf */ static void @@ -1140,7 +1089,6 @@ update_render_point (EMap *map, EMapPoint *point) put_pixel_with_clipping (pb, px + 1, py + 1, 0x000000ff); } - /* Repaint point on X server */ static void @@ -1160,7 +1108,6 @@ repaint_point (EMap *map, EMapPoint *point) request_paint_area (map, &area); } - static void center_at (EMap *map, gint x, gint y, gboolean scroll) { @@ -1187,7 +1134,6 @@ center_at (EMap *map, gint x, gint y, gboolean scroll) } } - static void smooth_center_at (EMap *map, gint x, gint y) { @@ -1218,7 +1164,6 @@ smooth_center_at (EMap *map, gint x, gint y) } } - /* Scrolls the view to the specified offsets. Does not perform range checking! */ static void @@ -1321,7 +1266,6 @@ scroll_to (EMap *view, gint x, gint y) } } - static gint divide_seq[] = { /* Dividends for divisor of 2 */ @@ -1397,7 +1341,6 @@ static gint divide_seq[] = 0 }; - typedef enum { AXIS_X, @@ -1405,7 +1348,6 @@ typedef enum } AxisType; - static void blowup_window_area (GdkWindow *window, gint area_x, gint area_y, gint target_x, gint target_y, gint total_width, gint total_height, gfloat zoom_factor) { @@ -1419,7 +1361,6 @@ blowup_window_area (GdkWindow *window, gint area_x, gint area_y, gint target_x, gint i, j; gint line; - /* Set up the GC we'll be using */ gc = gdk_gc_new (window); @@ -1541,7 +1482,6 @@ blowup_window_area (GdkWindow *window, gint area_x, gint area_y, gint target_x, g_object_unref (gc); } - static void zoom_in_smooth (EMap *map) { @@ -1598,7 +1538,6 @@ zoom_in_smooth (EMap *map) request_paint_area (map, &area); } - static void zoom_in (EMap *map) { @@ -1624,7 +1563,6 @@ zoom_in (EMap *map) request_paint_area (map, &area); } - static void zoom_out (EMap *map) { @@ -1654,7 +1592,6 @@ zoom_out (EMap *map) repaint_visible (map); } - static void zoom_do (EMap *map) { @@ -1681,7 +1618,6 @@ zoom_do (EMap *map) set_scroll_area(map); } - /* Callback used when an adjustment is changed */ static void @@ -1696,7 +1632,6 @@ adjustment_changed_cb (GtkAdjustment *adj, gpointer data) scroll_to (view, priv->hadj->value, priv->vadj->value); } - static void set_scroll_area (EMap *view) { diff --git a/widgets/misc/e-map.h b/widgets/misc/e-map.h index df3f70a343..6c0e44e93b 100644 --- a/widgets/misc/e-map.h +++ b/widgets/misc/e-map.h @@ -67,7 +67,6 @@ struct _EMapPoint gpointer user_data; }; - /* --- Widget --- */ GType e_map_get_type (void); diff --git a/widgets/misc/e-multi-config-dialog.c b/widgets/misc/e-multi-config-dialog.c index eaf843dfb2..1f31ff8cc4 100644 --- a/widgets/misc/e-multi-config-dialog.c +++ b/widgets/misc/e-multi-config-dialog.c @@ -111,7 +111,6 @@ set_page_timeout_callback (gpointer data) return FALSE; } - /* Button handling. */ static void @@ -120,7 +119,6 @@ do_close (EMultiConfigDialog *dialog) gtk_widget_destroy (GTK_WIDGET (dialog)); } - /* ETable signals. */ static void @@ -142,7 +140,6 @@ table_cursor_change_callback (ETable *etable, priv->set_page_timeout_page = row; } - /* GObject methods. */ static void @@ -164,7 +161,6 @@ impl_finalize (GObject *object) (* G_OBJECT_CLASS (e_multi_config_dialog_parent_class)->finalize) (object); } - /* GtkDialog methods. */ static void @@ -210,7 +206,6 @@ canvas_realize (GtkWidget *widget, EMultiConfigDialog *dialog) { } - static ETableMemoryStoreColumnInfo columns[] = { E_TABLE_MEMORY_STORE_STRING, E_TABLE_MEMORY_STORE_PIXBUF, @@ -312,7 +307,6 @@ e_multi_config_dialog_new (void) return g_object_new (e_multi_config_dialog_get_type (), NULL); } - void e_multi_config_dialog_add_page (EMultiConfigDialog *dialog, const gchar *title, diff --git a/widgets/misc/e-pilot-settings.c b/widgets/misc/e-pilot-settings.c index 1bed8630c5..0327ca84ff 100644 --- a/widgets/misc/e-pilot-settings.c +++ b/widgets/misc/e-pilot-settings.c @@ -37,13 +37,11 @@ struct _EPilotSettingsPrivate GtkWidget *cat_btn; }; - static void class_init (EPilotSettingsClass *klass); static void init (EPilotSettings *ps); static GObjectClass *parent_class = NULL; - GType e_pilot_settings_get_type (void) { @@ -86,7 +84,6 @@ init (EPilotSettings *ps) ps->priv = priv; } - static void build_ui (EPilotSettings *ps, ESourceList *source_list) { diff --git a/widgets/misc/e-popup-menu.c b/widgets/misc/e-popup-menu.c index 20b570df24..129a52e0ca 100644 --- a/widgets/misc/e-popup-menu.c +++ b/widgets/misc/e-popup-menu.c @@ -72,7 +72,6 @@ e_popup_menu_create (EPopupMenu *menu_list, NULL); } - GtkMenu * e_popup_menu_create_with_domain (EPopupMenu *menu_list, guint32 disable_mask, diff --git a/widgets/misc/e-popup-menu.h b/widgets/misc/e-popup-menu.h index 75246ebda6..627ed611a6 100644 --- a/widgets/misc/e-popup-menu.h +++ b/widgets/misc/e-popup-menu.h @@ -32,7 +32,6 @@ G_BEGIN_DECLS #define E_POPUP_SEPARATOR { (gchar *) "", NULL, (NULL), NULL, 0 } #define E_POPUP_TERMINATOR { NULL, NULL, (NULL), NULL, 0 } - /* In the following, CC = custom closure */ #define E_POPUP_ITEM(name,fn,disable_mask) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), NULL, NULL, 0, 0, 0, 0 } @@ -47,7 +46,6 @@ G_BEGIN_DECLS #define E_POPUP_PIXMAP_WIDGET_ITEM_CC(name,pixmap_widget,fn,closure,disable_mask) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), (pixmap_widget), (closure), 0, 0, 0, 1 } #define E_POPUP_PIXMAP_WIDGET_SUBMENU(name,pixmap_widget,submenu,disable_mask) { (gchar *) (name), NULL, NULL, (submenu), (disable_mask), (pixmap_widget), NULL, 0, 0, 0, 0 } - #define E_POPUP_TOGGLE_ITEM(name,fn,disable_mask,value) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), NULL, NULL, 1, 0, value, 0 } #define E_POPUP_TOGGLE_ITEM_CC(name,fn,closure,disable_mask,value) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), NULL, (closure), 1, 0, value, 1 } #define E_POPUP_TOGGLE_ITEM_CC(name,fn,closure,disable_mask,value) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), NULL, (closure), 1, 0, value, 1 } @@ -67,7 +65,6 @@ G_BEGIN_DECLS #define E_POPUP_RADIO_PIXMAP_WIDGET_ITEM(name,pixmap_widget,fn,disable_mask) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), (pixmap_widget), NULL, 0, 1, value, 0 } #define E_POPUP_RADIO_PIXMAP_WIDGET_ITEM_CC(name,pixmap_widget,fn,closure,disable_mask) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), (pixmap_widget), (closure), 0, 1, value, 1 } - typedef struct _EPopupMenu EPopupMenu; struct _EPopupMenu { diff --git a/widgets/misc/e-printable.c b/widgets/misc/e-printable.c index 05a219f901..b42080886a 100644 --- a/widgets/misc/e-printable.c +++ b/widgets/misc/e-printable.c @@ -28,7 +28,6 @@ #include "e-printable.h" - #define EP_CLASS(e) ((EPrintableClass *)((GtkObject *)e)->klass) G_DEFINE_TYPE (EPrintable, e_printable, GTK_TYPE_OBJECT) diff --git a/widgets/misc/e-reflow-model.c b/widgets/misc/e-reflow-model.c index 2bf5e4990d..1eaccdad09 100644 --- a/widgets/misc/e-reflow-model.c +++ b/widgets/misc/e-reflow-model.c @@ -32,7 +32,6 @@ G_DEFINE_TYPE (EReflowModel, e_reflow_model, G_TYPE_OBJECT) d(static gint depth = 0;) - enum { MODEL_CHANGED, COMPARISON_CHANGED, @@ -322,7 +321,6 @@ e_reflow_model_item_removed (EReflowModel *e_reflow_model, d(depth--); } - /** * e_reflow_model_item_changed: * @e_reflow_model: the reflow model to notify of the change diff --git a/widgets/misc/e-reflow.c b/widgets/misc/e-reflow.c index c20edfc5e4..63e92dbe2b 100644 --- a/widgets/misc/e-reflow.c +++ b/widgets/misc/e-reflow.c @@ -229,7 +229,6 @@ cursor_changed (ESelectionModel *selection, gint row, gint col, EReflow *reflow) } - static void incarnate (EReflow *reflow) { @@ -699,7 +698,6 @@ column_width_changed (EReflow *reflow) g_signal_emit (reflow, signals[COLUMN_WIDTH_CHANGED], 0, reflow->column_width); } - /* Virtual functions */ @@ -1425,7 +1423,6 @@ e_reflow_class_init (EReflowClass *klass) 0.0, G_MAXDOUBLE, 0.0, G_PARAM_READABLE)); - g_object_class_install_property (object_class, PROP_HEIGHT, g_param_spec_double ("height", _( "Height" ), diff --git a/widgets/misc/e-reflow.h b/widgets/misc/e-reflow.h index 19e6d4a709..ab27051d40 100644 --- a/widgets/misc/e-reflow.h +++ b/widgets/misc/e-reflow.h @@ -47,7 +47,6 @@ G_BEGIN_DECLS #define E_IS_REFLOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_REFLOW_TYPE)) #define E_IS_REFLOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_REFLOW_TYPE)) - typedef struct EReflowPriv EReflowPriv; typedef struct _EReflow EReflow; diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c index b2f1a314e2..1783ebf375 100644 --- a/widgets/misc/e-search-bar.c +++ b/widgets/misc/e-search-bar.c @@ -328,7 +328,6 @@ paint_search_text (GtkWidget *widget, ESearchBar *esb) else /* no query in search entry .. so set the current option */ text = get_selected_item_label (menu_widget); - if (text && *text) { gchar *t; @@ -1000,7 +999,6 @@ e_search_bar_construct (ESearchBar *search_bar, else gtk_box_pack_start (GTK_BOX(search_bar->entry_box), search_bar->icon_entry, TRUE, TRUE, 0); - gtk_widget_show_all (search_bar->entry_box); gtk_widget_set_sensitive (search_bar->clear_button, FALSE); @@ -1465,7 +1463,6 @@ e_search_bar_set_search_scope (ESearchBar *search_bar, gint id) emit_query_changed (search_bar); } - /** * e_search_bar_get_item_id: * @search_bar: A search bar. diff --git a/widgets/misc/e-search-bar.h b/widgets/misc/e-search-bar.h index 336c27608d..82bc1ba0da 100644 --- a/widgets/misc/e-search-bar.h +++ b/widgets/misc/e-search-bar.h @@ -190,5 +190,4 @@ gchar *e_search_bar_get_text (ESearchBar *search_bar); void e_search_bar_scope_enable (ESearchBar *search_bar, gint did, gboolean state); G_END_DECLS - #endif /* __E_SEARCH_BAR_H__ */ diff --git a/widgets/misc/e-selection-model-array.c b/widgets/misc/e-selection-model-array.c index 90922b5560..84a18eb925 100644 --- a/widgets/misc/e-selection-model-array.c +++ b/widgets/misc/e-selection-model-array.c @@ -542,7 +542,6 @@ e_selection_model_array_get_row_count (ESelectionModelArray *esma) return 0; } - static void e_selection_model_array_init (ESelectionModelArray *esma) { diff --git a/widgets/misc/e-selection-model-array.h b/widgets/misc/e-selection-model-array.h index 3f69fca342..2f7687b578 100644 --- a/widgets/misc/e-selection-model-array.h +++ b/widgets/misc/e-selection-model-array.h @@ -89,5 +89,4 @@ gint e_selection_model_array_get_row_count (ESelectionModelArray *esm); G_END_DECLS - #endif /* _E_SELECTION_MODEL_ARRAY_H_ */ diff --git a/widgets/misc/e-selection-model.h b/widgets/misc/e-selection-model.h index c87ccf960e..fb62b1fc9f 100644 --- a/widgets/misc/e-selection-model.h +++ b/widgets/misc/e-selection-model.h @@ -94,7 +94,6 @@ typedef struct { } ESelectionModelClass; - GType e_selection_model_get_type (void); void e_selection_model_do_something (ESelectionModel *esm, guint row, @@ -128,7 +127,6 @@ void e_selection_model_select_all (ESelectionModel *esm); void e_selection_model_invert_selection (ESelectionModel *esm); gint e_selection_model_row_count (ESelectionModel *esm); - /* Private virtual Functions */ void e_selection_model_change_one_row (ESelectionModel *esm, gint row, @@ -160,6 +158,5 @@ void e_selection_model_selection_changed (ESelectionModel *selection); G_END_DECLS - #endif /* _E_SELECTION_MODEL_H_ */ diff --git a/widgets/misc/e-send-options.c b/widgets/misc/e-send-options.c index fa84e86cc8..eff79544fd 100644 --- a/widgets/misc/e-send-options.c +++ b/widgets/misc/e-send-options.c @@ -37,7 +37,6 @@ #include "e-dateedit.h" #include "e-send-options.h" - struct _ESendOptionsDialogPrivate { /* Glade XML data */ GladeXML *xml; @@ -380,7 +379,6 @@ page_changed_cb (GtkNotebook *notebook, GtkNotebookPage *page, gint num, gpointe e_send_options_fill_widgets_with_data (sod); } - static void init_widgets (ESendOptionsDialog *sod) { @@ -399,7 +397,6 @@ init_widgets (ESendOptionsDialog *sod) if (priv->global) g_signal_connect (priv->notebook, "switch-page", G_CALLBACK (page_changed_cb), sod); - } static gboolean @@ -733,7 +730,6 @@ e_sendoptions_dialog_init (GObject *object) ESendOptionsDialogPrivate *priv; ESendOptionsData *new; - sod = E_SENDOPTIONS_DIALOG (object); new = g_new0 (ESendOptionsData, 1); new->gopts = g_new0 (ESendOptionsGeneral, 1); diff --git a/widgets/misc/e-spinner.c b/widgets/misc/e-spinner.c index bf71e4e50c..3e7b732def 100644 --- a/widgets/misc/e-spinner.c +++ b/widgets/misc/e-spinner.c @@ -800,7 +800,6 @@ e_spinner_stop (ESpinner *spinner) } } - /* * e_spinner_set_timeout: * @spinner: a #ESpinner diff --git a/widgets/misc/e-task-widget.c b/widgets/misc/e-task-widget.c index bf3cefcf24..7d583c3ffa 100644 --- a/widgets/misc/e-task-widget.c +++ b/widgets/misc/e-task-widget.c @@ -29,7 +29,6 @@ #include - #define SPACING 2 struct _ETaskWidgetPrivate { diff --git a/widgets/misc/e-unicode.h b/widgets/misc/e-unicode.h index 77d1a351cb..737c5088eb 100644 --- a/widgets/misc/e-unicode.h +++ b/widgets/misc/e-unicode.h @@ -109,4 +109,3 @@ G_END_DECLS #endif - diff --git a/widgets/misc/e-url-entry.c b/widgets/misc/e-url-entry.c index 2dd47ebb8f..6900bd12f3 100644 --- a/widgets/misc/e-url-entry.c +++ b/widgets/misc/e-url-entry.c @@ -45,7 +45,6 @@ static gboolean mnemonic_activate (GtkWidget *widget, gboolean group_cycling); static gpointer parent_class = NULL; - GType e_url_entry_get_type (void) { @@ -87,7 +86,6 @@ class_init (EUrlEntryClass *class) widget_class->mnemonic_activate = mnemonic_activate; } - static void init (EUrlEntry *url_entry) { @@ -151,7 +149,6 @@ e_url_entry_new (void) return g_object_new (E_TYPE_URL_ENTRY, NULL); } - GtkWidget * e_url_entry_get_entry (EUrlEntry *url_entry) { diff --git a/widgets/misc/test-calendar.c b/widgets/misc/test-calendar.c index 20b8773c34..c9cc8e7891 100644 --- a/widgets/misc/test-calendar.c +++ b/widgets/misc/test-calendar.c @@ -43,7 +43,6 @@ static GtkTargetEntry target_table[] = { static guint n_targets = sizeof(target_table) / sizeof(target_table[0]); - static void on_date_range_changed (ECalendarItem *calitem); static void on_selection_changed (ECalendarItem *calitem); @@ -84,13 +83,11 @@ main (gint argc, gchar **argv) g_signal_connect (calitem, "selection_changed", G_CALLBACK (on_selection_changed), NULL); - gtk_drag_dest_set (cal, GTK_DEST_DEFAULT_ALL, target_table, n_targets, GDK_ACTION_COPY | GDK_ACTION_MOVE); - vbox = gtk_vbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), cal, TRUE, TRUE, 0); gtk_widget_show (vbox); @@ -103,7 +100,6 @@ main (gint argc, gchar **argv) return 0; } - static void on_date_range_changed (ECalendarItem *calitem) { @@ -125,7 +121,6 @@ on_date_range_changed (ECalendarItem *calitem) E_CALENDAR_ITEM_MARK_BOLD, FALSE); } - static void on_selection_changed (ECalendarItem *calitem) { diff --git a/widgets/misc/test-dateedit.c b/widgets/misc/test-dateedit.c index 745c982b8d..c7b973904a 100644 --- a/widgets/misc/test-dateedit.c +++ b/widgets/misc/test-dateedit.c @@ -167,7 +167,6 @@ main (gint argc, gchar **argv) return 0; } - static void delete_event_cb (GtkWidget *widget, GdkEventAny *event, @@ -178,7 +177,6 @@ delete_event_cb (GtkWidget *widget, gtk_main_quit (); } - static void on_get_date_clicked (GtkWidget *button, EDateEdit *dedit) @@ -198,7 +196,6 @@ on_get_date_clicked (GtkWidget *button, g_print (" Time invalid\n"); } - static void on_toggle_24_hour_clicked (GtkWidget *button, EDateEdit *dedit) @@ -206,7 +203,6 @@ on_toggle_24_hour_clicked (GtkWidget *button, e_date_edit_set_use_24_hour_format (dedit, !e_date_edit_get_use_24_hour_format (dedit)); } - #if 0 static void on_date_changed (EDateEdit *dedit, @@ -226,7 +222,6 @@ on_date_changed (EDateEdit *dedit, } } - static void on_time_changed (EDateEdit *dedit, gchar *name) @@ -246,7 +241,6 @@ on_time_changed (EDateEdit *dedit, } #endif - static void on_changed (EDateEdit *dedit, gchar *name) -- cgit v1.2.3