diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-07-13 11:33:07 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-07-14 23:26:22 +0800 |
| commit | 374bd42f69aca2e132fd854c9619f3d7491f1f96 (patch) | |
| tree | bf50b5daa8664d4d793b82f6b6ec59d0686553e0 /widgets | |
| parent | 573eb0880a80e04737cb4497931ca6588272686e (diff) | |
| download | gsoc2013-evolution-374bd42f69aca2e132fd854c9619f3d7491f1f96.tar gsoc2013-evolution-374bd42f69aca2e132fd854c9619f3d7491f1f96.tar.gz gsoc2013-evolution-374bd42f69aca2e132fd854c9619f3d7491f1f96.tar.bz2 gsoc2013-evolution-374bd42f69aca2e132fd854c9619f3d7491f1f96.tar.lz gsoc2013-evolution-374bd42f69aca2e132fd854c9619f3d7491f1f96.tar.xz gsoc2013-evolution-374bd42f69aca2e132fd854c9619f3d7491f1f96.tar.zst gsoc2013-evolution-374bd42f69aca2e132fd854c9619f3d7491f1f96.zip | |
Fix excessive whitespace.
Diffstat (limited to 'widgets')
134 files changed, 0 insertions, 594 deletions
diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.c b/widgets/e-timezone-dialog/e-timezone-dialog.c index ea30c1701e..4625a63e1c 100644 --- a/widgets/e-timezone-dialog/e-timezone-dialog.c +++ b/widgets/e-timezone-dialog/e-timezone-dialog.c @@ -186,7 +186,6 @@ e_timezone_dialog_finalize (GObject *object) (* G_OBJECT_CLASS (e_timezone_dialog_parent_class)->finalize) (object); } - static void e_timezone_dialog_add_timezones (ETimezoneDialog *etd) { @@ -256,7 +255,6 @@ e_timezone_dialog_add_timezones (ETimezoneDialog *etd) g_list_free (list_items); } - ETimezoneDialog * e_timezone_dialog_construct (ETimezoneDialog *etd) { @@ -377,7 +375,6 @@ get_widgets (ETimezoneDialog *etd) && priv->preview_label); } - /** * e_timezone_dialog_new: * @@ -428,7 +425,6 @@ format_utc_offset (gint utc_offset, sprintf (buffer, "%s %s%02i:%02i:%02i", _("UTC"), sign, hours, minutes, seconds); } - static gchar * zone_display_name_with_offset (icaltimezone *zone) { @@ -488,7 +484,6 @@ on_map_timeout (gpointer data) return TRUE; } - static gboolean on_map_motion (GtkWidget *widget, GdkEventMotion *event, gpointer data) { @@ -525,7 +520,6 @@ on_map_motion (GtkWidget *widget, GdkEventMotion *event, gpointer data) return TRUE; } - static gboolean on_map_leave (GtkWidget *widget, GdkEventCrossing *event, gpointer data) { @@ -554,7 +548,6 @@ on_map_leave (GtkWidget *widget, GdkEventCrossing *event, gpointer data) return FALSE; } - static gboolean on_map_visibility_changed (GtkWidget *w, GdkEventVisibility *event, gpointer data) @@ -581,7 +574,6 @@ on_map_visibility_changed (GtkWidget *w, GdkEventVisibility *event, return FALSE; } - static gboolean on_map_button_pressed (GtkWidget *w, GdkEventButton *event, gpointer data) { @@ -616,7 +608,6 @@ on_map_button_pressed (GtkWidget *w, GdkEventButton *event, gpointer data) return TRUE; } - /* Returns the translated timezone location of the given EMapPoint, e.g. "Europe/London". */ static icaltimezone * @@ -655,7 +646,6 @@ get_zone_from_point (ETimezoneDialog *etd, g_return_val_if_reached(NULL); } - /** * e_timezone_dialog_get_timezone: * @etd: the timezone dialog @@ -716,7 +706,6 @@ e_timezone_dialog_set_timezone (ETimezoneDialog *etd, g_free (display); } - GtkWidget * e_timezone_dialog_get_toplevel (ETimezoneDialog *etd) { @@ -730,7 +719,6 @@ e_timezone_dialog_get_toplevel (ETimezoneDialog *etd) return priv->app; } - static void set_map_timezone (ETimezoneDialog *etd, icaltimezone *zone) { @@ -757,7 +745,6 @@ set_map_timezone (ETimezoneDialog *etd, icaltimezone *zone) priv->point_selected = point; } - static void on_combo_changed (GtkComboBox *combo_box, ETimezoneDialog *etd) { diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.h b/widgets/e-timezone-dialog/e-timezone-dialog.h index 8992d40c2d..fb4ae52375 100644 --- a/widgets/e-timezone-dialog/e-timezone-dialog.h +++ b/widgets/e-timezone-dialog/e-timezone-dialog.h @@ -37,7 +37,6 @@ #define E_IS_TIMEZONE_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_TIMEZONE_DIALOG)) #define E_IS_TIMEZONE_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_TIMEZONE_DIALOG)) - typedef struct _ETimezoneDialog ETimezoneDialog; typedef struct _ETimezoneDialogClass ETimezoneDialogClass; typedef struct _ETimezoneDialogPrivate ETimezoneDialogPrivate; @@ -53,7 +52,6 @@ struct _ETimezoneDialogClass { GObjectClass parent_class; }; - GType e_timezone_dialog_get_type (void); ETimezoneDialog *e_timezone_dialog_construct (ETimezoneDialog *etd); diff --git a/widgets/menus/gal-define-views-dialog.h b/widgets/menus/gal-define-views-dialog.h index ab499d45d5..a510679567 100644 --- a/widgets/menus/gal-define-views-dialog.h +++ b/widgets/menus/gal-define-views-dialog.h @@ -69,5 +69,4 @@ GType gal_define_views_dialog_get_type (void); G_END_DECLS - #endif /* __GAL_DEFINE_VIEWS_DIALOG_H__ */ diff --git a/widgets/menus/gal-define-views-model.h b/widgets/menus/gal-define-views-model.h index c408fea067..cc7b7a5aa4 100644 --- a/widgets/menus/gal-define-views-model.h +++ b/widgets/menus/gal-define-views-model.h @@ -45,12 +45,10 @@ typedef struct { guint editable : 1; } GalDefineViewsModel; - typedef struct { ETableModelClass parent_class; } GalDefineViewsModelClass; - GType gal_define_views_model_get_type (void); ETableModel *gal_define_views_model_new (void); diff --git a/widgets/menus/gal-view-collection.c b/widgets/menus/gal-view-collection.c index a854d4bffa..5719e17f6b 100644 --- a/widgets/menus/gal-view-collection.c +++ b/widgets/menus/gal-view-collection.c @@ -636,7 +636,6 @@ gal_view_collection_get_view_id_by_index (GalViewCollection *collection, gint n) return g_strdup (collection->view_data[n]->id); } - void gal_view_collection_append (GalViewCollection *collection, GalView *view) diff --git a/widgets/menus/gal-view-collection.h b/widgets/menus/gal-view-collection.h index d443aa9bc2..5667b3d7c9 100644 --- a/widgets/menus/gal-view-collection.h +++ b/widgets/menus/gal-view-collection.h @@ -100,7 +100,6 @@ void gal_view_collection_add_factory (GalViewColl void gal_view_collection_display_view (GalViewCollection *collection, GalView *view); - /* Query the view collection. */ gint gal_view_collection_get_count (GalViewCollection *collection); GalView *gal_view_collection_get_view (GalViewCollection *collection, @@ -143,8 +142,6 @@ const gchar *gal_view_collection_get_default_view (GalViewCol void gal_view_collection_set_default_view (GalViewCollection *collection, const gchar *id); - G_END_DECLS - #endif /* _GAL_VIEW_COLLECTION_H_ */ diff --git a/widgets/menus/gal-view-etable.h b/widgets/menus/gal-view-etable.h index 201c1573ef..0cbebba699 100644 --- a/widgets/menus/gal-view-etable.h +++ b/widgets/menus/gal-view-etable.h @@ -72,7 +72,6 @@ void gal_view_etable_attach_tree (GalViewEtable *view, ETree *tree); void gal_view_etable_detach (GalViewEtable *view); - G_END_DECLS #endif /* _GAL_VIEW_ETABLE_H_ */ diff --git a/widgets/menus/gal-view-factory.h b/widgets/menus/gal-view-factory.h index 41b7564de0..f8743999cf 100644 --- a/widgets/menus/gal-view-factory.h +++ b/widgets/menus/gal-view-factory.h @@ -71,5 +71,4 @@ GalView *gal_view_factory_new_view (GalViewFactory *factory, G_END_DECLS - #endif /* _GAL_VIEW_FACTORY_H_ */ diff --git a/widgets/menus/gal-view-instance-save-as-dialog.c b/widgets/menus/gal-view-instance-save-as-dialog.c index 610c03a663..76871594e2 100644 --- a/widgets/menus/gal-view-instance-save-as-dialog.c +++ b/widgets/menus/gal-view-instance-save-as-dialog.c @@ -108,7 +108,6 @@ gvisad_setup_validate_button (GalViewInstanceSaveAsDialog *dialog) } } - static void gvisad_setup_radio_buttons (GalViewInstanceSaveAsDialog *dialog) { @@ -155,7 +154,6 @@ gvisad_entry_changed (GtkWidget *widget, GalViewInstanceSaveAsDialog *dialog) gvisad_setup_validate_button (dialog); } - /* Method override implementations */ static void gal_view_instance_save_as_dialog_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) diff --git a/widgets/menus/gal-view-instance-save-as-dialog.h b/widgets/menus/gal-view-instance-save-as-dialog.h index 600aa6765a..64e97afde8 100644 --- a/widgets/menus/gal-view-instance-save-as-dialog.h +++ b/widgets/menus/gal-view-instance-save-as-dialog.h @@ -82,5 +82,4 @@ void gal_view_instance_save_as_dialog_save (GalViewInstanceSaveAsDial G_END_DECLS - #endif /* __GAL_VIEW_INSTANCE_SAVE_AS_DIALOG_H__ */ diff --git a/widgets/menus/gal-view-instance.h b/widgets/menus/gal-view-instance.h index 960bf940c6..00f5065d35 100644 --- a/widgets/menus/gal-view-instance.h +++ b/widgets/menus/gal-view-instance.h @@ -90,7 +90,6 @@ GalView *gal_view_instance_get_current_view (GalViewInstance *inst void gal_view_instance_set_custom_view (GalViewInstance *instance, GalView *view); - /* Returns true if this instance has ever been used before. */ gboolean gal_view_instance_exists (GalViewInstance *instance); diff --git a/widgets/menus/gal-view-new-dialog.c b/widgets/menus/gal-view-new-dialog.c index e3a24726c5..9d061ed401 100644 --- a/widgets/menus/gal-view-new-dialog.c +++ b/widgets/menus/gal-view-new-dialog.c @@ -254,7 +254,6 @@ gal_view_new_dialog_set_property (GObject *object, guint prop_id, const GValue * } } - static void gal_view_new_dialog_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { diff --git a/widgets/menus/gal-view-new-dialog.h b/widgets/menus/gal-view-new-dialog.h index 06bcb96bb9..364e1ae472 100644 --- a/widgets/menus/gal-view-new-dialog.h +++ b/widgets/menus/gal-view-new-dialog.h @@ -75,5 +75,4 @@ GtkWidget *gal_view_new_dialog_construct (GalViewNewDialog *dialog, G_END_DECLS - #endif /* __GAL_VIEW_NEW_DIALOG_H__ */ diff --git a/widgets/menus/gal-view.c b/widgets/menus/gal-view.c index 7b52d74864..b410d8ec42 100644 --- a/widgets/menus/gal-view.c +++ b/widgets/menus/gal-view.c @@ -33,7 +33,6 @@ G_DEFINE_TYPE (GalView, gal_view, G_TYPE_OBJECT) d(static gint depth = 0;) - enum { CHANGED, LAST_SIGNAL diff --git a/widgets/menus/gal-view.h b/widgets/menus/gal-view.h index 8973733a3b..099a92704c 100644 --- a/widgets/menus/gal-view.h +++ b/widgets/menus/gal-view.h @@ -88,7 +88,6 @@ GalView *gal_view_clone (GalView *view); /* Changed signal */ void gal_view_changed (GalView *view); - G_END_DECLS #endif /* _GAL_VIEW_H_ */ 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 c281e7436b..d6b50209a7 100644 --- a/widgets/misc/e-calendar.h +++ b/widgets/misc/e-calendar.h @@ -56,7 +56,6 @@ G_BEGIN_DECLS (G_TYPE_INSTANCE_GET_CLASS \ ((obj), E_TYPE_CALENDAR, ECalendarClass)) - typedef struct _ECalendar ECalendar; typedef struct _ECalendarClass ECalendarClass; @@ -88,7 +87,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-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 <config.h> #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-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-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-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-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-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/ea-calendar-cell.c b/widgets/misc/ea-calendar-cell.c index af9471c5af..05d0dcce6b 100644 --- a/widgets/misc/ea-calendar-cell.c +++ b/widgets/misc/ea-calendar-cell.c @@ -328,7 +328,6 @@ component_interface_get_extents (AtkComponent *component, g_return_if_fail (EA_IS_CALENDAR_CELL (component)); - g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(component)); if (!g_obj) /* defunct object*/ diff --git a/widgets/misc/ea-calendar-item.h b/widgets/misc/ea-calendar-item.h index 36cc671a3b..b5271a9f8b 100644 --- a/widgets/misc/ea-calendar-item.h +++ b/widgets/misc/ea-calendar-item.h @@ -64,5 +64,4 @@ gint e_calendar_item_get_n_days_from_week_start (ECalendarItem *calitem, G_END_DECLS - #endif /* __EA_CALENDAR_ITEM_H__ */ diff --git a/widgets/misc/test-calendar.c b/widgets/misc/test-calendar.c index ed670a817c..458d60f90a 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) diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c index 9fd01f9874..af79261c64 100644 --- a/widgets/table/e-cell-combo.c +++ b/widgets/table/e-cell-combo.c @@ -70,7 +70,6 @@ #define d(x) - /* The height to make the popup list if there aren't any items in it. */ #define E_CELL_COMBO_LIST_EMPTY_HEIGHT 15 @@ -120,7 +119,6 @@ e_cell_combo_class_init (ECellComboClass *klass) ecpc->popup = e_cell_combo_do_popup; } - static void e_cell_combo_init (ECellCombo *ecc) { @@ -191,7 +189,6 @@ e_cell_combo_init (ECellCombo *ecc) G_CALLBACK (e_cell_combo_key_press), ecc); } - /** * e_cell_combo_new: * @@ -207,7 +204,6 @@ e_cell_combo_new (void) return (ECell*) ecc; } - /* * GObject::dispose method */ @@ -223,8 +219,6 @@ e_cell_combo_dispose (GObject *object) G_OBJECT_CLASS (e_cell_combo_parent_class)->dispose (object); } - - void e_cell_combo_set_popdown_strings (ECellCombo *ecc, GList *strings) @@ -247,7 +241,6 @@ e_cell_combo_set_popdown_strings (ECellCombo *ecc, } } - static gint e_cell_combo_do_popup (ECellPopup *ecp, GdkEvent *event, @@ -287,7 +280,6 @@ e_cell_combo_do_popup (ECellPopup *ecp, return TRUE; } - static void e_cell_combo_select_matching_item (ECellCombo *ecc) { @@ -362,7 +354,6 @@ e_cell_combo_show_popup (ECellCombo *ecc, gint row, gint view_col) d(g_print("%s: popup_shown = TRUE\n", __FUNCTION__)); } - /* Calculates the size and position of the popup window (like GtkCombo). */ static void e_cell_combo_get_popup_pos (ECellCombo *ecc, @@ -555,7 +546,6 @@ e_cell_combo_button_press (GtkWidget *popup_window, return TRUE; } - /* This handles button release events in the popup window. If the button is released inside the list, we want to hide the popup window and update the cell with the new selection. */ @@ -592,7 +582,6 @@ e_cell_combo_button_release (GtkWidget *popup_window, return TRUE; } - /* 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 @@ -627,7 +616,6 @@ e_cell_combo_key_press (GtkWidget *popup_window, return TRUE; } - static void e_cell_combo_update_cell (ECellCombo *ecc) { @@ -665,7 +653,6 @@ e_cell_combo_update_cell (ECellCombo *ecc) g_free (text); } - static void e_cell_combo_restart_edit (ECellCombo *ecc) { @@ -678,5 +665,3 @@ e_cell_combo_restart_edit (ECellCombo *ecc) #endif } - - diff --git a/widgets/table/e-cell-combo.h b/widgets/table/e-cell-combo.h index fafda30031..728addeed9 100644 --- a/widgets/table/e-cell-combo.h +++ b/widgets/table/e-cell-combo.h @@ -39,7 +39,6 @@ #define E_IS_CELL_COMBO(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_CELL_COMBO_TYPE)) #define E_IS_CELL_COMBO_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_CELL_COMBO_TYPE)) - typedef struct { ECellPopup parent; @@ -52,7 +51,6 @@ typedef struct { ECellPopupClass parent_class; } ECellComboClass; - GType e_cell_combo_get_type (void); ECell *e_cell_combo_new (void); diff --git a/widgets/table/e-cell-date-edit.c b/widgets/table/e-cell-date-edit.c index 9207437cb3..1848b2808a 100644 --- a/widgets/table/e-cell-date-edit.c +++ b/widgets/table/e-cell-date-edit.c @@ -25,7 +25,6 @@ * window to edit it. */ - #ifdef HAVE_CONFIG_H #include <config.h> #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/table/e-cell-date-edit.h b/widgets/table/e-cell-date-edit.h index 2e125fece3..72fe952e31 100644 --- a/widgets/table/e-cell-date-edit.h +++ b/widgets/table/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/table/e-cell-hbox.h b/widgets/table/e-cell-hbox.h index def14d81ed..fda96de9e2 100644 --- a/widgets/table/e-cell-hbox.h +++ b/widgets/table/e-cell-hbox.h @@ -63,7 +63,6 @@ void e_cell_hbox_append (ECellHbox *vbox, gint model_col, gint size); - G_END_DECLS #endif /* _E_CELL_HBOX_H_ */ diff --git a/widgets/table/e-cell-percent.c b/widgets/table/e-cell-percent.c index 35dbb611ed..3ed995421b 100644 --- a/widgets/table/e-cell-percent.c +++ b/widgets/table/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/table/e-cell-popup.c b/widgets/table/e-cell-popup.c index 298f67db82..45c6d07377 100644 --- a/widgets/table/e-cell-popup.c +++ b/widgets/table/e-cell-popup.c @@ -45,10 +45,8 @@ #define E_CELL_POPUP_ARROW_XPAD 3 #define E_CELL_POPUP_ARROW_YPAD 3 - static void e_cell_popup_dispose (GObject *object); - static ECellView* ecp_new_view (ECell *ecell, ETableModel *table_model, void *e_table_item_view); @@ -143,7 +141,6 @@ e_cell_popup_class_init (ECellPopupClass *klass) gal_a11y_e_cell_popup_new); } - static void e_cell_popup_init (ECellPopup *ecp) { @@ -151,7 +148,6 @@ e_cell_popup_init (ECellPopup *ecp) ecp->popup_model = NULL; } - /** * e_cell_popup_new: * @@ -167,7 +163,6 @@ e_cell_popup_new (void) return (ECell*) ecp; } - /* * GtkObject::destroy method */ @@ -183,8 +178,6 @@ e_cell_popup_dispose (GObject *object) G_OBJECT_CLASS (e_cell_popup_parent_class)->dispose (object); } - - /* * ECell::new_view method */ @@ -211,7 +204,6 @@ ecp_new_view (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view return (ECellView*) ecp_view; } - /* * ECell::kill_view method */ @@ -231,7 +223,6 @@ ecp_kill_view (ECellView *ecv) g_free (ecp_view); } - /* * ECell::realize method */ @@ -246,7 +237,6 @@ ecp_realize (ECellView *ecv) (* E_CELL_CLASS (e_cell_popup_parent_class)->realize) (ecv); } - /* * ECell::unrealize method */ @@ -261,7 +251,6 @@ ecp_unrealize (ECellView *ecv) (* E_CELL_CLASS (e_cell_popup_parent_class)->unrealize) (ecv); } - /* * ECell::draw method */ @@ -321,7 +310,6 @@ ecp_draw (ECellView *ecv, GdkDrawable *drawable, } } - /* * ECell::event method */ @@ -364,7 +352,6 @@ ecp_event (ECellView *ecv, GdkEvent *event, gint model_col, gint view_col, row, flags, actions); } - /* * ECell::height method */ @@ -376,7 +363,6 @@ ecp_height (ECellView *ecv, gint model_col, gint view_col, gint row) return e_cell_height (ecp_view->child_view, model_col, view_col, row); } - /* * ECellView::enter_edit method */ @@ -388,7 +374,6 @@ ecp_enter_edit (ECellView *ecv, gint model_col, gint view_col, gint row) return e_cell_enter_edit (ecp_view->child_view, model_col, view_col, row); } - /* * ECellView::leave_edit method */ @@ -402,7 +387,6 @@ ecp_leave_edit (ECellView *ecv, gint model_col, gint view_col, gint row, edit_context); } - static void ecp_print (ECellView *ecv, GtkPrintContext *context, gint model_col, gint view_col, gint row, double width, double height) @@ -413,7 +397,6 @@ ecp_print (ECellView *ecv, GtkPrintContext *context, width, height); } - static gdouble ecp_print_height (ECellView *ecv, GtkPrintContext *context, gint model_col, gint view_col, gint row, @@ -425,7 +408,6 @@ ecp_print_height (ECellView *ecv, GtkPrintContext *context, view_col, row, width); } - static gint ecp_max_width (ECellView *ecv, gint model_col, @@ -436,7 +418,6 @@ ecp_max_width (ECellView *ecv, return e_cell_max_width (ecp_view->child_view, model_col, view_col); } - static void ecp_show_tooltip (ECellView *ecv, gint model_col, @@ -459,8 +440,6 @@ ecp_get_bg_color (ECellView *ecell_view, gint row) return e_cell_get_bg_color (ecp_view->child_view, row); } - - ECell* e_cell_popup_get_child (ECellPopup *ecp) { @@ -469,7 +448,6 @@ e_cell_popup_get_child (ECellPopup *ecp) return ecp->child; } - void e_cell_popup_set_child (ECellPopup *ecp, ECell *child) @@ -483,7 +461,6 @@ e_cell_popup_set_child (ECellPopup *ecp, g_object_ref (child); } - static gint e_cell_popup_do_popup (ECellPopupView *ecp_view, GdkEvent *event, diff --git a/widgets/table/e-cell-popup.h b/widgets/table/e-cell-popup.h index a8ce08f44f..4ea1127da6 100644 --- a/widgets/table/e-cell-popup.h +++ b/widgets/table/e-cell-popup.h @@ -66,7 +66,6 @@ typedef struct { ETableModel *popup_model; } ECellPopup; - typedef struct { ECellClass parent_class; @@ -74,14 +73,12 @@ typedef struct { gint (*popup) (ECellPopup *ecp, GdkEvent *event, gint row, gint view_col); } ECellPopupClass; - struct _ECellPopupView { ECellView cell_view; ECellView *child_view; }; - GType e_cell_popup_get_type (void); ECell *e_cell_popup_new (void); diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c index 78065025f3..5c7d931321 100644 --- a/widgets/table/e-cell-text.c +++ b/widgets/table/e-cell-text.c @@ -91,7 +91,6 @@ enum { PROP_BG_COLOR_COLUMN }; - enum { E_SELECTION_PRIMARY, E_SELECTION_CLIPBOARD @@ -121,7 +120,6 @@ typedef struct { gint ref_count; } ECellTextLineBreaks; - typedef struct _CellEdit CellEdit; typedef struct { @@ -137,7 +135,6 @@ typedef struct { */ CellEdit *edit; - gint xofs, yofs; /* This gets added to the x and y for the cell text. */ double ellipsis_width[2]; /* The width of the ellipsis. */ @@ -361,13 +358,11 @@ ect_new_view (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view text_view->cell_view.kill_view_cb = NULL; text_view->cell_view.kill_view_cb_data = NULL; - text_view->canvas = canvas; text_view->xofs = 0.0; text_view->yofs = 0.0; - return (ECellView *)text_view; } @@ -454,7 +449,6 @@ ect_free_color (gchar *color_spec, GdkColor *color, GdkColormap *colormap) } } - static PangoAttrList* build_attr_list (ECellTextView *text_view, gint row, gint text_length) { @@ -513,7 +507,6 @@ layout_with_preedit (ECellTextView *text_view, gint row, const gchar *text, gint gint text_length = strlen (text); gint mlen = MIN(edit->selection_start,text_length); - gtk_im_context_get_preedit_string (edit->im_context, &preedit_string,&preedit_attrs, NULL); @@ -659,7 +652,6 @@ generate_layout (ECellTextView *text_view, gint model_col, gint view_col, gint r return layout; } - static void draw_pango_rectangle (GdkDrawable *drawable, GdkGC *gc, gint x1, gint y1, PangoRectangle rect) { @@ -875,7 +867,6 @@ ect_get_bg_color(ECellView *ecell_view, gint row) return color_spec; } - /* * Selects the entire string */ @@ -1344,7 +1335,6 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context, gchar *string; double ty, ly, text_width = 0.0, text_height = 0.0; - cr = gtk_print_context_get_cairo_context (context); string = e_cell_text_get_text(ect, ecell_view->e_table_model, model_col, row); @@ -1793,8 +1783,6 @@ e_cell_text_class_init (ECellTextClass *klass) G_TYPE_POINTER, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT); - - g_object_class_install_property (object_class, PROP_STRIKEOUT_COLUMN, g_param_spec_int ("strikeout_column", _("Strikeout Column"), @@ -1852,7 +1840,6 @@ e_cell_text_class_init (ECellTextClass *klass) gal_a11y_e_cell_registry_add_cell_type (NULL, E_CELL_TEXT_TYPE, gal_a11y_e_cell_text_new); } - /* IM Context Callbacks */ static void @@ -2065,7 +2052,6 @@ e_cell_text_new (const gchar *fontname, GtkJustification justify) return (ECell *) ect; } - /* fixme: Handle Font attributes */ /* position is in BYTES */ diff --git a/widgets/table/e-cell-text.h b/widgets/table/e-cell-text.h index f3ecc415b4..740db82880 100644 --- a/widgets/table/e-cell-text.h +++ b/widgets/table/e-cell-text.h @@ -128,4 +128,3 @@ G_END_DECLS #endif /* _E_CELL_TEXT_H_ */ - diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c index 02a7425e41..d83e6775b9 100644 --- a/widgets/table/e-cell-toggle.c +++ b/widgets/table/e-cell-toggle.c @@ -139,7 +139,6 @@ etog_draw (ECellView *ecell_view, GdkDrawable *drawable, if (E_TABLE_ITEM (ecell_view->e_table_item_view)->alternating_row_colors && (row % 2) == 0) cache_seq += 3; - image = toggle->images[value]; if ((x2 - x1) < gdk_pixbuf_get_width (image)){ diff --git a/widgets/table/e-cell-toggle.h b/widgets/table/e-cell-toggle.h index 96e3d01a55..09b458f43c 100644 --- a/widgets/table/e-cell-toggle.h +++ b/widgets/table/e-cell-toggle.h @@ -61,4 +61,3 @@ G_END_DECLS #endif /* _E_CELL_TOGGLE_H_ */ - diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c index 2156aa9917..a22cf6d04b 100644 --- a/widgets/table/e-cell-tree.c +++ b/widgets/table/e-cell-tree.c @@ -51,10 +51,8 @@ #include "tree-expanded.xpm" #include "tree-unexpanded.xpm" - G_DEFINE_TYPE (ECellTree, e_cell_tree, E_CELL_TYPE) - typedef struct { ECellView cell_view; ECellView *subcell_view; @@ -887,7 +885,6 @@ e_cell_tree_construct (ECellTree *ect, ect->draw_lines = draw_lines; } - /** * e_cell_tree_new: * @open_pixbuf: pixbuf to be used instead of the '-' icon. diff --git a/widgets/table/e-cell-tree.h b/widgets/table/e-cell-tree.h index 36d4a85541..465af77ca2 100644 --- a/widgets/table/e-cell-tree.h +++ b/widgets/table/e-cell-tree.h @@ -42,7 +42,6 @@ G_BEGIN_DECLS #define E_IS_CELL_TREE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_CELL_TREE_TYPE)) #define E_IS_CELL_TREE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_CELL_TREE_TYPE)) - typedef struct { ECell parent; @@ -75,4 +74,3 @@ G_END_DECLS #endif /* _E_CELL_TREE_H_ */ - diff --git a/widgets/table/e-cell-vbox.c b/widgets/table/e-cell-vbox.c index 210cc84139..db12ed14e9 100644 --- a/widgets/table/e-cell-vbox.c +++ b/widgets/table/e-cell-vbox.c @@ -178,7 +178,6 @@ ecv_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col break; } - for (i = 0; i < vbox_view->subcell_view_count; i++) { gint height = e_cell_height (vbox_view->subcell_views[i], vbox_view->model_cols[i], view_col, row); if (y < subcell_offset + height) @@ -373,7 +372,6 @@ ecv_print (ECellView *ecell_view, GnomePrintContext *context, width -= subcell_offset; } - e_cell_print (vbox_view->subcell_view, context, model_col, view_col, row, width, height); } @@ -454,7 +452,6 @@ e_cell_vbox_init (ECellVbox *ecv) ecv->subcell_count = 0; } - /** * e_cell_vbox_new: * diff --git a/widgets/table/e-cell-vbox.h b/widgets/table/e-cell-vbox.h index 58aa523c58..7762e62869 100644 --- a/widgets/table/e-cell-vbox.h +++ b/widgets/table/e-cell-vbox.h @@ -65,7 +65,6 @@ void e_cell_vbox_append (ECellVbox *vbox, ECell *subcell, gint model_col); - G_END_DECLS #endif /* _E_CELL_VBOX_H_ */ diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c index d2d1534611..b6397cf914 100644 --- a/widgets/table/e-table-click-to-add.c +++ b/widgets/table/e-table-click-to-add.c @@ -172,7 +172,6 @@ etcta_drop_message (ETableClickToAdd *etcta) etcta->message = NULL; } - static void etcta_dispose (GObject *object) { diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c index cc61d1eb46..9fd2f7ea20 100644 --- a/widgets/table/e-table-config.c +++ b/widgets/table/e-table-config.c @@ -504,7 +504,6 @@ do_sort_and_group_config_dialog (ETableConfig *config, gboolean is_sort) ? config->sort [0].combo : config->group [0].combo)); - if (is_sort) dialog = GTK_DIALOG (config->dialog_sort); else @@ -592,7 +591,6 @@ do_fields_config_dialog (ETableConfig *config) config_fields_info_update (config); } - static ETableMemoryStoreColumnInfo store_columns[] = { E_TABLE_MEMORY_STORE_STRING, E_TABLE_MEMORY_STORE_INTEGER, @@ -974,7 +972,6 @@ configure_group_dialog (ETableConfig *config, GladeXML *gui) config->group [i].e_table_config = config; } - for (l = config->column_names; l; l = l->next){ gchar *label = l->data; @@ -1131,7 +1128,6 @@ config_button_down (GtkWidget *widget, ETableConfig *config) if (columns == NULL) return; - new_shown = g_new (int, config->temp_state->col_count); new_expansions = g_new (double, config->temp_state->col_count); diff --git a/widgets/table/e-table-config.h b/widgets/table/e-table-config.h index 72357fb8f6..c3f994a635 100644 --- a/widgets/table/e-table-config.h +++ b/widgets/table/e-table-config.h @@ -50,7 +50,6 @@ typedef struct { gpointer e_table_config; } ETableConfigSortWidgets; - typedef struct { GObject parent; diff --git a/widgets/table/e-table-defines.h b/widgets/table/e-table-defines.h index de23cb994d..d7b261160b 100644 --- a/widgets/table/e-table-defines.h +++ b/widgets/table/e-table-defines.h @@ -37,5 +37,4 @@ G_BEGIN_DECLS G_END_DECLS - #endif diff --git a/widgets/table/e-table-example-2.c b/widgets/table/e-table-example-2.c index 391873b043..f5dc15d74d 100644 --- a/widgets/table/e-table-example-2.c +++ b/widgets/table/e-table-example-2.c @@ -331,8 +331,6 @@ create_table () gtk_widget_show_all (window); } - - gint main (gint argc, gchar *argv []) { diff --git a/widgets/table/e-table-field-chooser-dialog.h b/widgets/table/e-table-field-chooser-dialog.h index 8d12eb34db..e2d1c2ef9b 100644 --- a/widgets/table/e-table-field-chooser-dialog.h +++ b/widgets/table/e-table-field-chooser-dialog.h @@ -43,7 +43,6 @@ G_BEGIN_DECLS #define E_IS_TABLE_FIELD_CHOOSER_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TABLE_FIELD_CHOOSER_DIALOG_TYPE)) #define E_IS_TABLE_FIELD_CHOOSER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TABLE_FIELD_CHOOSER_DIALOG_TYPE)) - typedef struct _ETableFieldChooserDialog ETableFieldChooserDialog; typedef struct _ETableFieldChooserDialogClass ETableFieldChooserDialogClass; @@ -63,11 +62,9 @@ struct _ETableFieldChooserDialogClass GtkDialogClass parent_class; }; - GtkWidget *e_table_field_chooser_dialog_new(void); GType e_table_field_chooser_dialog_get_type (void); G_END_DECLS - #endif /* __E_TABLE_FIELD_CHOOSER_DIALOG_H__ */ diff --git a/widgets/table/e-table-field-chooser.h b/widgets/table/e-table-field-chooser.h index 71e17244f1..996ae9f9b6 100644 --- a/widgets/table/e-table-field-chooser.h +++ b/widgets/table/e-table-field-chooser.h @@ -44,7 +44,6 @@ G_BEGIN_DECLS #define E_IS_TABLE_FIELD_CHOOSER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TABLE_FIELD_CHOOSER_TYPE)) #define E_IS_TABLE_FIELD_CHOOSER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TABLE_FIELD_CHOOSER_TYPE)) - typedef struct _ETableFieldChooser ETableFieldChooser; typedef struct _ETableFieldChooserClass ETableFieldChooserClass; @@ -70,7 +69,6 @@ struct _ETableFieldChooserClass GtkVBoxClass parent_class; }; - GtkWidget *e_table_field_chooser_new(void); GType e_table_field_chooser_get_type (void); diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c index 29cd2b94d7..2a62f70d95 100644 --- a/widgets/table/e-table-group-container.c +++ b/widgets/table/e-table-group-container.c @@ -64,7 +64,6 @@ enum { static EPrintable * etgc_get_printable (ETableGroup *etg); - static void e_table_group_container_child_node_free (ETableGroupContainer *etgc, ETableGroupContainerChildNode *child_node) @@ -197,7 +196,6 @@ e_table_group_container_new (GnomeCanvasGroup *parent, ETableHeader *full_header return E_TABLE_GROUP (etgc); } - static gint etgc_event (GnomeCanvasItem *item, GdkEvent *event) { @@ -1019,7 +1017,6 @@ etgc_reflow (GnomeCanvasItem *item, gint flags) if (frozen) return; - if (GTK_OBJECT_FLAGS(etgc)& GNOME_CANVAS_ITEM_REALIZED){ gdouble running_height = 0; gdouble running_width = 0; @@ -1139,15 +1136,12 @@ e_table_group_apply_to_leafs (ETableGroup *etg, ETableGroupLeafFn fn, gpointer c } } - typedef struct { ETableGroupContainer *etgc; GList *child; EPrintable *child_printable; } ETGCPrintContext; - - #define CHECK(x) if((x) == -1) return -1; #if 0 diff --git a/widgets/table/e-table-group-container.h b/widgets/table/e-table-group-container.h index 168b2f8a5a..911b7f3290 100644 --- a/widgets/table/e-table-group-container.h +++ b/widgets/table/e-table-group-container.h @@ -93,7 +93,6 @@ typedef struct { gint count; } ETableGroupContainerChildNode; - ETableGroup *e_table_group_container_new (GnomeCanvasGroup *parent, ETableHeader *full_header, ETableHeader *header, ETableModel *model, ETableSortInfo *sort_info, gint n); void e_table_group_container_construct (GnomeCanvasGroup *parent, ETableGroupContainer *etgc, diff --git a/widgets/table/e-table-group-leaf.h b/widgets/table/e-table-group-leaf.h index 8d05874c01..d34f0343b0 100644 --- a/widgets/table/e-table-group-leaf.h +++ b/widgets/table/e-table-group-leaf.h @@ -83,7 +83,6 @@ ETableGroup *e_table_group_leaf_new (GnomeCanvasGroup *parent, ETableSortInfo *sort_info); GType e_table_group_leaf_get_type (void); - G_END_DECLS #endif /* _E_TABLE_GROUP_LEAF_H_ */ diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c index 190fccb846..0bcbc2b694 100644 --- a/widgets/table/e-table-header-item.c +++ b/widgets/table/e-table-header-item.c @@ -874,7 +874,6 @@ ethi_realize (GnomeCanvasItem *item) { (gchar *) TARGET_ETABLE_COL_TYPE, 0, TARGET_ETABLE_COL_HEADER }, }; - if (GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)-> realize) (*GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)->realize)(item); @@ -947,7 +946,6 @@ ethi_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint wi gint col; GHashTable *arrows = g_hash_table_new (NULL, NULL); - if (ethi->sort_info) { gint length = e_table_sort_info_grouping_get_count(ethi->sort_info); gint i; diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c index 5d6ed5cb36..c87ae40f79 100644 --- a/widgets/table/e-table-header-utils.c +++ b/widgets/table/e-table-header-utils.c @@ -276,7 +276,6 @@ e_table_draw_elided_string (GdkDrawable *drawable, GdkGC *gc, GtkWidget *widget, else arrow_width = ARROW_WIDTH; - lines = pango_layout_get_lines (layout); line = lines->data; diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c index 7448a355f7..729e7982c6 100644 --- a/widgets/table/e-table-item.c +++ b/widgets/table/e-table-item.c @@ -107,7 +107,6 @@ enum { #define DOUBLE_CLICK_TIME 250 #define TRIPLE_CLICK_TIME 500 - static gint eti_get_height (ETableItem *eti); static gint eti_row_height (ETableItem *eti, gint row); static void e_table_item_focus (ETableItem *eti, gint col, gint row, GdkModifierType state); @@ -596,7 +595,6 @@ eti_remove_header_model (ETableItem *eti) } g_object_unref (eti->header); - eti->header_structure_change_id = 0; eti->header_dim_change_id = 0; eti->header_request_width_id = 0; @@ -691,7 +689,6 @@ calculate_height_cache (ETableItem *eti) confirm_height_cache(eti); } - /* * eti_row_height: * @@ -1686,7 +1683,6 @@ eti_realize (GnomeCanvasItem *item) if (GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->realize) (*GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->realize)(item); - eti->rows = e_table_model_row_count (eti->table_model); /* @@ -1812,8 +1808,6 @@ eti_unrealize (GnomeCanvasItem *item) (*GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->unrealize)(item); } - - static void eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint width, gint height) { @@ -2496,7 +2490,6 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) } #endif - if (!find_cell (eti, e->button.x, e->button.y, &col, &row, &x1, &y1)) return TRUE; @@ -2505,7 +2498,6 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) "cursor_col", &cursor_col, NULL); - d(g_print("%s: GDK_BUTTON_RELEASE received, button %d, line: %d\n" "eti_editing: %s, row:%d:%d, col:%d:%d\n", __FUNCTION__, e->button.button, __LINE__, eti_editing(eti)?"true":"false", cursor_row, view_to_model_row(eti, row), cursor_col, view_to_model_col(eti, col))); @@ -3348,7 +3340,6 @@ eti_selection_row_change (ESelectionModel *selection, gint row, ETableItem *eti) } } - /** * e_table_item_enter_edit * @eti: %ETableItem which will start being edited diff --git a/widgets/table/e-table-item.h b/widgets/table/e-table-item.h index 92e8e0c2fd..cd3bf1d26b 100644 --- a/widgets/table/e-table-item.h +++ b/widgets/table/e-table-item.h @@ -187,7 +187,6 @@ typedef struct { } ETableItemClass; GType e_table_item_get_type (void); - /* * Focus */ diff --git a/widgets/table/e-table-memory-store.c b/widgets/table/e-table-memory-store.c index 95ea4bee99..2775d2d461 100644 --- a/widgets/table/e-table-memory-store.c +++ b/widgets/table/e-table-memory-store.c @@ -86,7 +86,6 @@ free_value (ETableMemoryStore *etms, gint col, gpointer value) } } - static gint etms_column_count (ETableModel *etm) { @@ -323,7 +322,6 @@ e_table_memory_store_construct (ETableMemoryStore *etms, ETableMemoryStoreColumn return E_TABLE_MODEL (etms); } - void e_table_memory_store_adopt_value_at (ETableMemoryStore *etms, gint col, gint row, gpointer value) { diff --git a/widgets/table/e-table-memory.h b/widgets/table/e-table-memory.h index 07a79b6856..8de51b7c5e 100644 --- a/widgets/table/e-table-memory.h +++ b/widgets/table/e-table-memory.h @@ -48,7 +48,6 @@ struct ETableMemoryClass { ETableModelClass parent_class; }; - GType e_table_memory_get_type (void); void e_table_memory_construct (ETableMemory *etable); ETableMemory *e_table_memory_new (void); diff --git a/widgets/table/e-table-model.c b/widgets/table/e-table-model.c index 2badb768c9..3962550dd8 100644 --- a/widgets/table/e-table-model.c +++ b/widgets/table/e-table-model.c @@ -36,7 +36,6 @@ d(static gint depth = 0;) - G_DEFINE_TYPE (ETableModel, e_table_model, G_TYPE_OBJECT) enum { @@ -68,7 +67,6 @@ e_table_model_column_count (ETableModel *e_table_model) return ETM_CLASS (e_table_model)->column_count (e_table_model); } - /** * e_table_model_row_count: * @e_table_model: the e-table-model to operate on @@ -171,7 +169,6 @@ e_table_model_is_cell_editable (ETableModel *e_table_model, gint col, gint row) return ETM_CLASS (e_table_model)->is_cell_editable (e_table_model, col, row); } - gpointer e_table_model_duplicate_value (ETableModel *e_table_model, gint col, gconstpointer value) { @@ -289,7 +286,6 @@ e_table_model_class_init (ETableModelClass *klass) g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - e_table_model_signals [MODEL_CHANGED] = g_signal_new ("model_changed", G_TYPE_FROM_CLASS (object_class), diff --git a/widgets/table/e-table-model.h b/widgets/table/e-table-model.h index 571c2f8a12..e319b1ff42 100644 --- a/widgets/table/e-table-model.h +++ b/widgets/table/e-table-model.h @@ -69,7 +69,6 @@ typedef struct { /* Return an allocated string. */ gchar *(*value_to_string) (ETableModel *etm, gint col, gconstpointer value); - /* * Signals */ @@ -124,7 +123,6 @@ gchar *e_table_model_get_save_id (ETableModel *etm, /**/ gboolean e_table_model_has_change_pending (ETableModel *etm); - /**/ void *e_table_model_duplicate_value (ETableModel *e_table_model, gint col, diff --git a/widgets/table/e-table-one.c b/widgets/table/e-table-one.c index a604e7a590..07da209088 100644 --- a/widgets/table/e-table-one.c +++ b/widgets/table/e-table-one.c @@ -144,7 +144,6 @@ one_dispose (GObject *object) { ETableOne *one = E_TABLE_ONE (object); - if (one->data) { gint i; gint col_count; diff --git a/widgets/table/e-table-selection-model.h b/widgets/table/e-table-selection-model.h index 380f49cccd..ab504ac711 100644 --- a/widgets/table/e-table-selection-model.h +++ b/widgets/table/e-table-selection-model.h @@ -68,5 +68,4 @@ ETableSelectionModel *e_table_selection_model_new (void); G_END_DECLS - #endif /* _E_TABLE_SELECTION_MODEL_H_ */ diff --git a/widgets/table/e-table-simple.h b/widgets/table/e-table-simple.h index c93b313a82..81752a517f 100644 --- a/widgets/table/e-table-simple.h +++ b/widgets/table/e-table-simple.h @@ -95,7 +95,6 @@ ETableModel *e_table_simple_new (ETableSimpleColumnCountFn ETableSimpleValueToStringFn value_to_string, void *data); - /* Helper functions for if your values are all just strings. */ void *e_table_simple_string_duplicate_value (ETableModel *etm, gint col, diff --git a/widgets/table/e-table-sort-info.c b/widgets/table/e-table-sort-info.c index bed0c5d679..e4a3874bf0 100644 --- a/widgets/table/e-table-sort-info.c +++ b/widgets/table/e-table-sort-info.c @@ -251,7 +251,6 @@ e_table_sort_info_grouping_set_nth (ETableSortInfo *info, gint n, ETableSortCo e_table_sort_info_group_info_changed(info); } - /** * e_table_sort_info_get_count: * @info: The ETableSortInfo object @@ -472,4 +471,3 @@ e_table_sort_info_get_can_group (ETableSortInfo *info) return info->can_group; } - diff --git a/widgets/table/e-table-sorted-variable.c b/widgets/table/e-table-sorted-variable.c index 4676db8ac4..a65046234a 100644 --- a/widgets/table/e-table-sorted-variable.c +++ b/widgets/table/e-table-sorted-variable.c @@ -119,7 +119,6 @@ etsv_insert_idle(ETableSortedVariable *etsv) return FALSE; } - static void etsv_add (ETableSubsetVariable *etssv, gint row) diff --git a/widgets/table/e-table-sorter.c b/widgets/table/e-table-sorter.c index 766d94dd58..2124ea4019 100644 --- a/widgets/table/e-table-sorter.c +++ b/widgets/table/e-table-sorter.c @@ -306,7 +306,6 @@ ets_clean(ETableSorter *ets) ets->needs_sorting = -1; } - static void ets_sort(ETableSorter *ets) { @@ -380,7 +379,6 @@ ets_backsort(ETableSorter *ets) } } - static gint ets_model_to_sorted (ESorter *es, gint row) { @@ -445,7 +443,6 @@ ets_get_sorted_to_model_array (ESorter *es, gint **array, gint *count) } } - static gboolean ets_needs_sorting(ESorter *es) { diff --git a/widgets/table/e-table-sorting-utils.c b/widgets/table/e-table-sorting-utils.c index cf1b503b09..344a7cf6b1 100644 --- a/widgets/table/e-table-sorting-utils.c +++ b/widgets/table/e-table-sorting-utils.c @@ -176,7 +176,6 @@ e_table_sorting_utils_affects_sort (ETableSortInfo *sort_info, return FALSE; } - /* FIXME: This could be done in time log n instead of time n with a binary search. */ gint e_table_sorting_utils_insert(ETableModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, gint *map_table, gint rows, gint row) @@ -214,9 +213,6 @@ e_table_sorting_utils_check_position (ETableModel *source, ETableSortInfo *sort_ return i; } - - - /* This takes source rows. */ static gint etsu_tree_compare(ETreeModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, ETreePath path1, ETreePath path2) diff --git a/widgets/table/e-table-sorting-utils.h b/widgets/table/e-table-sorting-utils.h index d348d4b6b1..318c331e53 100644 --- a/widgets/table/e-table-sorting-utils.h +++ b/widgets/table/e-table-sorting-utils.h @@ -33,8 +33,6 @@ gboolean e_table_sorting_utils_affects_sort (ETableSortInfo *sort_info, ETableHeader *full_header, gint col); - - void e_table_sorting_utils_sort (ETableModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, @@ -53,8 +51,6 @@ gint e_table_sorting_utils_check_position (ETableModel *source, gint rows, gint view_row); - - void e_table_sorting_utils_tree_sort (ETreeModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, diff --git a/widgets/table/e-table-state.c b/widgets/table/e-table-state.c index 6cbdcbacb9..9f24f30d28 100644 --- a/widgets/table/e-table-state.c +++ b/widgets/table/e-table-state.c @@ -262,7 +262,6 @@ e_table_state_save_to_node (ETableState *state, e_xml_set_double_prop_by_name(new_node, (const guchar *)"expansion", expansion); } - e_table_sort_info_save_to_node(state->sort_info, node); return node; diff --git a/widgets/table/e-table-without.h b/widgets/table/e-table-without.h index 799c107d20..ce4745cff9 100644 --- a/widgets/table/e-table-without.h +++ b/widgets/table/e-table-without.h @@ -82,6 +82,5 @@ void e_table_without_show (ETableWithout *etw, void e_table_without_show_all (ETableWithout *etw); G_END_DECLS - #endif /* _E_TABLE_WITHOUT_H_ */ diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c index bf18fbb224..86ba47434d 100644 --- a/widgets/table/e-table.c +++ b/widgets/table/e-table.c @@ -53,7 +53,6 @@ #include "e-table-subset.h" #include "e-table-utils.h" - #define COLUMN_HEADER_HEIGHT 16 G_DEFINE_TYPE (ETable, e_table, GTK_TYPE_TABLE) @@ -958,7 +957,6 @@ et_build_groups (ETable *et) g_signal_connect (G_OBJECT (et->group), "start_drag", G_CALLBACK (group_start_drag), et); - if (!(et->is_grouped) && was_grouped) et_disconnect_model (et); @@ -1228,7 +1226,6 @@ e_table_setup_table (ETable *e_table, ETableHeader *full_header, ETableHeader *h gtk_widget_show (GTK_WIDGET (e_table->table_canvas)); - e_table->white_item = gnome_canvas_item_new( gnome_canvas_root(e_table->table_canvas), e_canvas_background_get_type(), @@ -1430,7 +1427,6 @@ e_table_get_state_object (ETable *e_table) state->sort_info = e_table->sort_info; g_object_ref(state->sort_info); - state->col_count = e_table_header_count (e_table->header); full_col_count = e_table_header_count (e_table->full_header); state->columns = g_new(int, state->col_count); @@ -1563,7 +1559,6 @@ et_real_construct (ETable *e_table, ETableModel *etm, ETableExtras *ete, g_signal_connect (G_OBJECT (e_table->sort_info), "sort_info_changed", G_CALLBACK (sort_info_changed), e_table); - g_value_set_object (val, e_table->sort_info); g_object_set_property (G_OBJECT(e_table->header), "sort_info", val); g_free (val); @@ -2073,7 +2068,6 @@ e_table_invert_selection (ETable *table) e_selection_model_invert_selection (E_SELECTION_MODEL (table->selection)); } - /** * e_table_get_printable: * @e_table: #ETable to query @@ -2914,7 +2908,6 @@ scroll_timeout (gpointer data) et->last_drop_y, et->last_drop_time); - return TRUE; } @@ -3000,7 +2993,6 @@ et_drag_motion(GtkWidget *widget, y, time); - if (y < 20) direction |= ET_SCROLL_UP; if (y > widget->allocation.height - 20) diff --git a/widgets/table/e-tree-memory-callbacks.c b/widgets/table/e-tree-memory-callbacks.c index e961a067ca..dc7c28804b 100644 --- a/widgets/table/e-tree-memory-callbacks.c +++ b/widgets/table/e-tree-memory-callbacks.c @@ -50,7 +50,6 @@ etmc_column_count (ETreeModel *etm) return 0; } - static gboolean etmc_has_save_id (ETreeModel *etm) { @@ -130,7 +129,6 @@ etmc_is_editable (ETreeModel *etm, ETreePath node, gint col) return etmc->is_editable (etm, node, col, etmc->model_data); } - /* The default for etmc_duplicate_value is to return the raw value. */ static gpointer etmc_duplicate_value (ETreeModel *etm, gint col, gconstpointer value) diff --git a/widgets/table/e-tree-memory-callbacks.h b/widgets/table/e-tree-memory-callbacks.h index e76c68793c..e37ef30d6c 100644 --- a/widgets/table/e-tree-memory-callbacks.h +++ b/widgets/table/e-tree-memory-callbacks.h @@ -33,7 +33,6 @@ G_BEGIN_DECLS #define E_IS_TREE_MEMORY_CALLBACKS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TREE_MEMORY_CALLBACKS_TYPE)) #define E_IS_TREE_MEMORY_CALLBACKS_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TREE_MEMORY_CALLBACKS_TYPE)) - typedef GdkPixbuf* (*ETreeMemoryCallbacksIconAtFn) (ETreeModel *etree, ETreePath path, gpointer model_data); typedef gint (*ETreeMemoryCallbacksColumnCountFn) (ETreeModel *etree, gpointer model_data); diff --git a/widgets/table/e-tree-memory.h b/widgets/table/e-tree-memory.h index 0a56c8d37e..824f0b1399 100644 --- a/widgets/table/e-tree-memory.h +++ b/widgets/table/e-tree-memory.h @@ -55,7 +55,6 @@ struct ETreeMemoryClass { void (*fill_in_children) (ETreeMemory *model, ETreePath node); }; - GType e_tree_memory_get_type (void); void e_tree_memory_construct (ETreeMemory *etree); ETreeMemory *e_tree_memory_new (void); diff --git a/widgets/table/e-tree-model.c b/widgets/table/e-tree-model.c index 143ad61629..9a06feac10 100644 --- a/widgets/table/e-tree-model.c +++ b/widgets/table/e-tree-model.c @@ -504,7 +504,6 @@ e_tree_model_node_get_last_child (ETreeModel *etree, ETreePath node) return NULL; } - /** * e_tree_model_node_get_next: * @etree: diff --git a/widgets/table/e-tree-model.h b/widgets/table/e-tree-model.h index fdd7f26a66..c6600ddf83 100644 --- a/widgets/table/e-tree-model.h +++ b/widgets/table/e-tree-model.h @@ -28,10 +28,8 @@ #include <gdk-pixbuf/gdk-pixbuf.h> #include <glib-object.h> - G_BEGIN_DECLS - #define E_TREE_MODEL_TYPE (e_tree_model_get_type ()) #define E_TREE_MODEL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TREE_MODEL_TYPE, ETreeModel)) #define E_TREE_MODEL_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), E_TREE_MODEL_TYPE, ETreeModelClass)) @@ -120,7 +118,6 @@ struct ETreeModelClass { void (*node_request_collapse) (ETreeModel *etm, ETreePath node); }; - GType e_tree_model_get_type (void); ETreeModel *e_tree_model_new (void); @@ -227,7 +224,6 @@ void e_tree_model_node_deleted (ETreeModel *tree_model, void e_tree_model_node_request_collapse (ETreeModel *tree_model, ETreePath deleted_node); - G_END_DECLS #endif /* _E_TREE_MODEL_H */ diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c index 87140ef30a..eedb201fae 100644 --- a/widgets/table/e-tree-selection-model.c +++ b/widgets/table/e-tree-selection-model.c @@ -202,7 +202,6 @@ etsm_node_deleted (ETreeModel *etm, ETreePath child, ETreeSelectionModel *etsm) restore_cursor (etsm, etm); } - static void add_model(ETreeSelectionModel *etsm, ETreeModel *model) { @@ -380,7 +379,6 @@ etsm_is_row_selected (ESelectionModel *selection, return etsm_is_path_selected (etsm, path); } - typedef struct { ETreeSelectionModel *etsm; EForeachFunc callback; @@ -741,7 +739,6 @@ e_tree_selection_model_get_cursor (ETreeSelectionModel *etsm) return etsm->priv->cursor_path; } - static void e_tree_selection_model_init (ETreeSelectionModel *etsm) { diff --git a/widgets/table/e-tree-selection-model.h b/widgets/table/e-tree-selection-model.h index c112c40786..e66abf3454 100644 --- a/widgets/table/e-tree-selection-model.h +++ b/widgets/table/e-tree-selection-model.h @@ -51,7 +51,6 @@ typedef struct { ESelectionModelClass parent_class; } ETreeSelectionModelClass; - GType e_tree_selection_model_get_type (void); ESelectionModel *e_tree_selection_model_new (void); void e_tree_selection_model_foreach (ETreeSelectionModel *etsm, @@ -69,5 +68,4 @@ ETreePath e_tree_selection_model_get_cursor (ETreeSelectionModel G_END_DECLS - #endif /* _E_TREE_SELECTION_MODEL_H_ */ diff --git a/widgets/table/e-tree-simple.h b/widgets/table/e-tree-simple.h index 47a5e6bdf1..8b71bd7728 100644 --- a/widgets/table/e-tree-simple.h +++ b/widgets/table/e-tree-simple.h @@ -36,7 +36,6 @@ G_BEGIN_DECLS #define E_IS_TREE_SIMPLE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TREE_SIMPLE_TYPE)) #define E_TREE_SIMPLE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), E_TREE_SIMPLE_TYPE, ETreeSimpleClass)) - typedef GdkPixbuf* (*ETreeSimpleIconAtFn) (ETreeModel *etree, ETreePath *path, gpointer model_data); typedef gpointer (*ETreeSimpleValueAtFn) (ETreeModel *etree, ETreePath *path, gint col, gpointer model_data); typedef void (*ETreeSimpleSetValueAtFn) (ETreeModel *etree, ETreePath *path, gint col, gconstpointer val, gpointer model_data); diff --git a/widgets/table/e-tree-sorted-variable.c b/widgets/table/e-tree-sorted-variable.c index 822affeee8..7c7718d0cf 100644 --- a/widgets/table/e-tree-sorted-variable.c +++ b/widgets/table/e-tree-sorted-variable.c @@ -148,7 +148,6 @@ etsv_insert_idle(ETreeSortedVariable *etsv) return FALSE; } - ETableModel * e_tree_sorted_variable_new (ETreeModel *source, ETableHeader *full_header, ETableSortInfo *sort_info) { @@ -242,7 +241,6 @@ etsv_compare(ETreeSortedVariable *etsv, const ETreePath *path1, const ETreePath return comp_val; } - static ETreeSortedVariable *etsv_closure; gint cols_closure; gint *ascending_closure; @@ -409,7 +407,6 @@ etsv_add_node (ETreeSortedVariable *etsv, ETreePath *path, GNode *root) etsv_sort_node(etsv, new_node); - #if 0 g_node_prepend(root, new_node); etsv_sort_node(etsv, root); diff --git a/widgets/table/e-tree-sorted.c b/widgets/table/e-tree-sorted.c index cd4ef4a537..6beaa34d89 100644 --- a/widgets/table/e-tree-sorted.c +++ b/widgets/table/e-tree-sorted.c @@ -824,7 +824,6 @@ ets_column_count (ETreeModel *etm) return e_tree_model_column_count(ets->priv->source); } - static gboolean ets_has_save_id (ETreeModel *etm) { @@ -869,7 +868,6 @@ ets_has_change_pending (ETreeModel *etm) return ets->priv->sort_idle_id != 0; } - static gpointer ets_value_at (ETreeModel *etm, ETreePath node, gint col) { @@ -897,7 +895,6 @@ ets_is_editable (ETreeModel *etm, ETreePath node, gint col) return e_tree_model_node_is_editable (ets->priv->source, path->corresponding, col); } - /* The default for ets_duplicate_value is to return the raw value. */ static gpointer ets_duplicate_value (ETreeModel *etm, gint col, gconstpointer value) @@ -1349,7 +1346,6 @@ e_tree_sorted_set_sort_info (ETreeSorted *ets, ETableSortInfo *sort_info) g_return_if_fail (ets != NULL); - if (ets->priv->sort_info) { if (ets->priv->sort_info_changed_id != 0) g_signal_handler_disconnect (G_OBJECT (ets->priv->sort_info), diff --git a/widgets/table/e-tree-sorted.h b/widgets/table/e-tree-sorted.h index 45adbef1fb..74d9a70a32 100644 --- a/widgets/table/e-tree-sorted.h +++ b/widgets/table/e-tree-sorted.h @@ -55,7 +55,6 @@ struct ETreeSortedClass { void (*node_resorted) (ETreeSorted *etm, ETreePath node); }; - GType e_tree_sorted_get_type (void); void e_tree_sorted_construct (ETreeSorted *etree, ETreeModel *source, diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c index 783f58c4cc..8d3b9a1d28 100644 --- a/widgets/table/e-tree-table-adapter.c +++ b/widgets/table/e-tree-table-adapter.c @@ -598,7 +598,6 @@ etta_has_change_pending (ETableModel *etm) return e_tree_model_has_change_pending (etta->priv->source); } - static gint etta_row_count (ETableModel *etm) { @@ -1161,7 +1160,6 @@ e_tree_table_adapter_node_set_expanded (ETreeTableAdapter *etta, ETreePath path, e_table_model_pre_change (E_TABLE_MODEL(etta)); e_table_model_row_changed(E_TABLE_MODEL(etta), row); - if (expanded) { gint num_children = insert_children(etta, gnode); update_child_counts(gnode, num_children); diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c index dd07b2b536..0e4db07034 100644 --- a/widgets/table/e-tree.c +++ b/widgets/table/e-tree.c @@ -239,7 +239,6 @@ static void et_drag_data_received(GtkWidget *widget, guint time, ETree *et); - static void scroll_off (ETree *et); static void scroll_on (ETree *et, guint scroll_direction); static void hover_off (ETree *et); @@ -1985,7 +1984,6 @@ e_tree_view_to_model_row (ETree *e_tree, return view_row; } - gboolean e_tree_node_is_expanded (ETree *et, ETreePath path) { @@ -2775,7 +2773,6 @@ scroll_timeout (gpointer data) et->priv->last_drop_y, et->priv->last_drop_time); - return TRUE; } diff --git a/widgets/table/gal-a11y-e-cell-popup.h b/widgets/table/gal-a11y-e-cell-popup.h index 641d345308..9729e13e55 100644 --- a/widgets/table/gal-a11y-e-cell-popup.h +++ b/widgets/table/gal-a11y-e-cell-popup.h @@ -49,7 +49,6 @@ struct _GalA11yECellPopupClass { GalA11yECellClass parent_class; }; - /* Standard Glib function */ GType gal_a11y_e_cell_popup_get_type (void); AtkObject *gal_a11y_e_cell_popup_new (ETableItem *item, diff --git a/widgets/table/gal-a11y-e-cell-registry.c b/widgets/table/gal-a11y-e-cell-registry.c index 9dc9598608..5c741e1955 100644 --- a/widgets/table/gal-a11y-e-cell-registry.c +++ b/widgets/table/gal-a11y-e-cell-registry.c @@ -105,7 +105,6 @@ init_default_registry (void) } } - AtkObject * gal_a11y_e_cell_registry_get_object (GalA11yECellRegistry *registry, ETableItem *item, diff --git a/widgets/table/gal-a11y-e-cell-registry.h b/widgets/table/gal-a11y-e-cell-registry.h index 0620fd1b9c..85afdadf4e 100644 --- a/widgets/table/gal-a11y-e-cell-registry.h +++ b/widgets/table/gal-a11y-e-cell-registry.h @@ -55,7 +55,6 @@ struct _GalA11yECellRegistryClass { GObjectClass parent_class; }; - /* Standard Glib function */ GType gal_a11y_e_cell_registry_get_type (void); AtkObject *gal_a11y_e_cell_registry_get_object (GalA11yECellRegistry *registry, diff --git a/widgets/table/gal-a11y-e-cell-text.c b/widgets/table/gal-a11y-e-cell-text.c index 77823b0a7c..26fffcb3e7 100644 --- a/widgets/table/gal-a11y-e-cell-text.c +++ b/widgets/table/gal-a11y-e-cell-text.c @@ -179,7 +179,6 @@ ect_get_character_at_offset (AtkText *text, return ret_val; } - static gchar * ect_get_text_before_offset (AtkText *text, gint offset, @@ -191,7 +190,6 @@ ect_get_text_before_offset (AtkText *text, return NULL; } - static gint ect_get_caret_offset (AtkText *text) { @@ -224,7 +222,6 @@ ect_get_run_attributes (AtkText *text, return NULL; } - static AtkAttributeSet* ect_get_default_attributes (AtkText *text) { @@ -232,7 +229,6 @@ ect_get_default_attributes (AtkText *text) return NULL; } - static void ect_get_character_extents (AtkText *text, gint offset, @@ -245,7 +241,6 @@ ect_get_character_extents (AtkText *text, /* Unimplemented */ } - static gint ect_get_character_count (AtkText *text) { @@ -263,7 +258,6 @@ ect_get_character_count (AtkText *text) return ret_val; } - static gint ect_get_offset_at_point (AtkText *text, gint x, @@ -274,7 +268,6 @@ ect_get_offset_at_point (AtkText *text, return 0; } - static gint ect_get_n_selections (AtkText *text) { @@ -293,7 +286,6 @@ ect_get_n_selections (AtkText *text) return 0; } - static gchar * ect_get_selection (AtkText *text, gint selection_num, @@ -339,7 +331,6 @@ ect_get_selection (AtkText *text, return ret_val; } - static gboolean ect_add_selection (AtkText *text, gint start_offset, @@ -377,7 +368,6 @@ ect_add_selection (AtkText *text, return FALSE; } - static gboolean ect_remove_selection (AtkText *text, gint selection_num) @@ -401,7 +391,6 @@ ect_remove_selection (AtkText *text, return FALSE; } - static gboolean ect_set_selection (AtkText *text, gint selection_num, @@ -416,7 +405,6 @@ ect_set_selection (AtkText *text, return FALSE; } - static gboolean ect_set_caret_offset (AtkText *text, gint offset) diff --git a/widgets/table/gal-a11y-e-cell-text.h b/widgets/table/gal-a11y-e-cell-text.h index bb400b38e3..e5a95accad 100644 --- a/widgets/table/gal-a11y-e-cell-text.h +++ b/widgets/table/gal-a11y-e-cell-text.h @@ -51,7 +51,6 @@ struct _GalA11yECellTextClass { GalA11yECellClass parent_class; }; - /* Standard Glib function */ GType gal_a11y_e_cell_text_get_type (void); AtkObject *gal_a11y_e_cell_text_new (ETableItem *item, diff --git a/widgets/table/gal-a11y-e-cell-toggle.c b/widgets/table/gal-a11y-e-cell-toggle.c index df687f4005..fa23f6c6fd 100644 --- a/widgets/table/gal-a11y-e-cell-toggle.c +++ b/widgets/table/gal-a11y-e-cell-toggle.c @@ -69,7 +69,6 @@ gal_a11y_e_cell_toggle_get_type (void) NULL /* value table */ }; - type = g_type_register_static (GAL_A11Y_TYPE_E_CELL, "GalA11yECellToggle", &tinfo, 0); gal_a11y_e_cell_type_add_action_interface (type); @@ -78,7 +77,6 @@ gal_a11y_e_cell_toggle_get_type (void) return type; } - static void gal_a11y_e_cell_toggle_class_init (GalA11yECellToggleClass *klass) { @@ -138,7 +136,6 @@ model_change_cb (ETableModel *etm, } } - AtkObject* gal_a11y_e_cell_toggle_new (ETableItem *item, ECellView *cell_view, diff --git a/widgets/table/gal-a11y-e-cell-toggle.h b/widgets/table/gal-a11y-e-cell-toggle.h index 8e9b4def08..3c29d777e3 100644 --- a/widgets/table/gal-a11y-e-cell-toggle.h +++ b/widgets/table/gal-a11y-e-cell-toggle.h @@ -60,5 +60,4 @@ AtkObject *gal_a11y_e_cell_toggle_new (ETableItem *item, G_END_DECLS - #endif /* __GAL_A11Y_E_CELL_TOGGLE_H__ */ diff --git a/widgets/table/gal-a11y-e-cell-tree.h b/widgets/table/gal-a11y-e-cell-tree.h index 497590b351..fa48c1486a 100644 --- a/widgets/table/gal-a11y-e-cell-tree.h +++ b/widgets/table/gal-a11y-e-cell-tree.h @@ -51,7 +51,6 @@ struct _GalA11yECellTreeClass { GalA11yECellClass parent_class; }; - /* Standard Glib function */ GType gal_a11y_e_cell_tree_get_type (void); AtkObject *gal_a11y_e_cell_tree_new (ETableItem *item, diff --git a/widgets/table/gal-a11y-e-cell.c b/widgets/table/gal-a11y-e-cell.c index e09b5456d9..211afa401c 100644 --- a/widgets/table/gal-a11y-e-cell.c +++ b/widgets/table/gal-a11y-e-cell.c @@ -39,7 +39,6 @@ static GObjectClass *parent_class; #define PARENT_TYPE (atk_object_get_type ()) - #if 0 static void unref_item (gpointer user_data, GObject *obj_loc) @@ -151,7 +150,6 @@ gal_a11y_e_cell_get_index_in_parent (AtkObject *accessible) return (a11y->row + 1) * a11y->item->cols + a11y->view_col; } - /* Component IFace */ static void gal_a11y_e_cell_get_extents (AtkComponent *component, @@ -264,7 +262,6 @@ gal_a11y_e_cell_init (GalA11yECell *a11y) atk_state_set_add_state (a11y->state_set, ATK_STATE_VISIBLE); } - static ActionInfo * _gal_a11y_e_cell_get_action_info (GalA11yECell *cell, gint index) @@ -293,7 +290,6 @@ _gal_a11y_e_cell_destroy_action_info (gpointer action_info, g_free (info); } - gboolean gal_a11y_e_cell_add_action ( GalA11yECell * cell, const gchar *action_name, @@ -639,6 +635,5 @@ gal_a11y_e_cell_construct (AtkObject *object, if (cell_view) g_object_ref (G_OBJECT (cell_view)); - #endif } diff --git a/widgets/table/gal-a11y-e-cell.h b/widgets/table/gal-a11y-e-cell.h index c61e5e2d22..4f2e536b8d 100644 --- a/widgets/table/gal-a11y-e-cell.h +++ b/widgets/table/gal-a11y-e-cell.h @@ -39,7 +39,6 @@ typedef struct _GalA11yECellPrivate GalA11yECellPrivate; typedef struct _ActionInfo ActionInfo; typedef void (*ACTION_FUNC) (GalA11yECell *cell); - /* This struct should actually be larger as this isn't what we derive from. * The GalA11yECellPrivate comes right after the parent class structure. **/ @@ -69,8 +68,6 @@ struct _ActionInfo { ACTION_FUNC do_action_func; }; - - /* Standard Glib function */ GType gal_a11y_e_cell_get_type (void); AtkObject *gal_a11y_e_cell_new (ETableItem *item, @@ -109,5 +106,4 @@ gboolean gal_a11y_e_cell_remove_state (GalA11yECell *cell, AtkStateType state_type, gboolean emit_signal); - #endif /* ! __GAL_A11Y_E_CELL_H__ */ diff --git a/widgets/table/gal-a11y-e-table-click-to-add-factory.h b/widgets/table/gal-a11y-e-table-click-to-add-factory.h index 9f249f0178..5321ccd241 100644 --- a/widgets/table/gal-a11y-e-table-click-to-add-factory.h +++ b/widgets/table/gal-a11y-e-table-click-to-add-factory.h @@ -43,7 +43,6 @@ struct _GalA11yETableClickToAddFactoryClass { AtkObjectClass parent_class; }; - /* Standard Glib function */ GType gal_a11y_e_table_click_to_add_factory_get_type (void); diff --git a/widgets/table/gal-a11y-e-table-click-to-add.c b/widgets/table/gal-a11y-e-table-click-to-add.c index 8a8fe56796..225f24c685 100644 --- a/widgets/table/gal-a11y-e-table-click-to-add.c +++ b/widgets/table/gal-a11y-e-table-click-to-add.c @@ -44,7 +44,6 @@ struct _GalA11yETableClickToAddPrivate { gpointer row; }; - static gint etcta_get_n_actions (AtkAction *action) { @@ -70,7 +69,6 @@ etcta_action_get_name (AtkAction *action, gint i) return NULL; } - static gboolean idle_do_action (gpointer data) { @@ -119,7 +117,6 @@ atk_action_interface_init (AtkActionIface *iface) iface->get_name = etcta_action_get_name; } - static G_CONST_RETURN gchar * etcta_get_name (AtkObject *obj) { @@ -274,7 +271,6 @@ etcta_event (GnomeCanvasItem *item, GdkEvent *e, gpointer data) g_signal_emit_by_name (a11y, "children_changed::add", 0, NULL, NULL); } - priv->rect = etcta->rect; priv->row = etcta->row; @@ -316,13 +312,11 @@ gal_a11y_e_table_click_to_add_new (GObject *widget) etcta = E_TABLE_CLICK_TO_ADD(widget); - atk_object_initialize (ATK_OBJECT (a11y), etcta); priv->rect = etcta->rect; priv->row = etcta->row; - g_signal_connect_after (G_OBJECT(widget), "event", G_CALLBACK (etcta_event), a11y); diff --git a/widgets/table/gal-a11y-e-table-column-header.h b/widgets/table/gal-a11y-e-table-column-header.h index d0b1ff5aeb..0cf0695f75 100644 --- a/widgets/table/gal-a11y-e-table-column-header.h +++ b/widgets/table/gal-a11y-e-table-column-header.h @@ -21,7 +21,6 @@ * */ - #ifndef __GAL_A11Y_E_TABLE_COLUMN_HEADER_H__ #define __GAL_A11Y_E_TABLE_COLUMN_HEADER_H__ @@ -46,7 +45,6 @@ struct _GalA11yETableColumnHeaderClass { AtkGObjectAccessibleClass parent_class; }; - /* Standard Glib function */ GType gal_a11y_e_table_column_header_get_type (void); AtkObject *gal_a11y_e_table_column_header_new (ETableCol *etc, ETableItem *item); diff --git a/widgets/table/gal-a11y-e-table-factory.h b/widgets/table/gal-a11y-e-table-factory.h index 3439cf0bdc..f0a1cecd0b 100644 --- a/widgets/table/gal-a11y-e-table-factory.h +++ b/widgets/table/gal-a11y-e-table-factory.h @@ -44,7 +44,6 @@ struct _GalA11yETableFactoryClass { AtkObjectClass parent_class; }; - /* Standard Glib function */ GType gal_a11y_e_table_factory_get_type (void); diff --git a/widgets/table/gal-a11y-e-table-item-factory.h b/widgets/table/gal-a11y-e-table-item-factory.h index f27c491a4d..5fdf7ce1ef 100644 --- a/widgets/table/gal-a11y-e-table-item-factory.h +++ b/widgets/table/gal-a11y-e-table-item-factory.h @@ -43,7 +43,6 @@ struct _GalA11yETableItemFactoryClass { AtkObjectClass parent_class; }; - /* Standard Glib function */ GType gal_a11y_e_table_item_factory_get_type (void); diff --git a/widgets/table/gal-a11y-e-table-item.c b/widgets/table/gal-a11y-e-table-item.c index 561b9a84d6..37f55f68c1 100644 --- a/widgets/table/gal-a11y-e-table-item.c +++ b/widgets/table/gal-a11y-e-table-item.c @@ -315,7 +315,6 @@ eti_ref_accessible_at_point (AtkComponent *component, } } - static void cell_destroyed (gpointer data) { @@ -344,7 +343,6 @@ eti_ref_at (AtkTable *table, gint row, gint column) if (atk_state_set_contains_state (priv->state_set, ATK_STATE_DEFUNCT)) return NULL; - item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (table))); if (!item) return NULL; @@ -842,7 +840,6 @@ eti_header_structure_changed (ETableHeader *eth, AtkObject *a11y) if (reorder_found) g_signal_emit_by_name (G_OBJECT(a11y_item), "column_reordered"); - if (removed_found) { for (i = 0; i < prev_n_cols; i ++ ) { if (prev_state[i] == ETI_HEADER_REMOVED) { @@ -873,7 +870,6 @@ eti_header_structure_changed (ETableHeader *eth, AtkObject *a11y) priv->columns = cols; } - static void eti_real_initialize (AtkObject *obj, gpointer data) @@ -999,7 +995,6 @@ gal_a11y_e_table_item_get_type (void) NULL }; - factory = atk_registry_get_factory (atk_get_default_registry (), GNOME_TYPE_CANVAS_ITEM); parent_type = atk_object_factory_get_accessible_type (factory); @@ -1036,7 +1031,6 @@ gal_a11y_e_table_item_new (ETableItem *item) atk_state_set_add_state (GET_PRIVATE(a11y)->state_set, ATK_STATE_SHOWING); atk_state_set_add_state (GET_PRIVATE(a11y)->state_set, ATK_STATE_VISIBLE); - accessible = ATK_OBJECT(a11y); /* Initialize cell data. */ @@ -1122,7 +1116,6 @@ gal_a11y_e_table_item_unref_selection (GalA11yETableItem *a11y) g_return_val_if_fail (priv->selection_change_id != 0, FALSE); g_return_val_if_fail (priv->cursor_change_id != 0, FALSE); - g_signal_handler_disconnect (priv->selection, priv->selection_change_id); g_signal_handler_disconnect (priv->selection, diff --git a/widgets/table/gal-a11y-e-table-item.h b/widgets/table/gal-a11y-e-table-item.h index 27d6a8244b..87773aae48 100644 --- a/widgets/table/gal-a11y-e-table-item.h +++ b/widgets/table/gal-a11y-e-table-item.h @@ -49,7 +49,6 @@ struct _GalA11yETableItemClass { AtkGObjectAccessibleClass parent_class; }; - /* Standard Glib function */ GType gal_a11y_e_table_item_get_type (void); AtkObject *gal_a11y_e_table_item_new (ETableItem *item); diff --git a/widgets/table/gal-a11y-e-table.h b/widgets/table/gal-a11y-e-table.h index d8f972df81..ba7c8adc03 100644 --- a/widgets/table/gal-a11y-e-table.h +++ b/widgets/table/gal-a11y-e-table.h @@ -49,7 +49,6 @@ struct _GalA11yETableClass { GtkAccessibleClass parent_class; }; - /* Standard Glib function */ GType gal_a11y_e_table_get_type (void); AtkObject *gal_a11y_e_table_new (GObject *table); diff --git a/widgets/table/gal-a11y-e-tree-factory.h b/widgets/table/gal-a11y-e-tree-factory.h index 3d97c7a3b1..36b4a61dc2 100644 --- a/widgets/table/gal-a11y-e-tree-factory.h +++ b/widgets/table/gal-a11y-e-tree-factory.h @@ -43,7 +43,6 @@ struct _GalA11yETreeFactoryClass { AtkObjectClass parent_class; }; - /* Standard Glib function */ GType gal_a11y_e_tree_factory_get_type (void); diff --git a/widgets/table/gal-a11y-e-tree.h b/widgets/table/gal-a11y-e-tree.h index d2aa8a0d2a..ef15dade36 100644 --- a/widgets/table/gal-a11y-e-tree.h +++ b/widgets/table/gal-a11y-e-tree.h @@ -48,7 +48,6 @@ struct _GalA11yETreeClass { GtkAccessibleClass parent_class; }; - /* Standard Glib function */ GType gal_a11y_e_tree_get_type (void); AtkObject *gal_a11y_e_tree_new (GObject *tree); diff --git a/widgets/text/e-reflow-model.c b/widgets/text/e-reflow-model.c index 2bf5e4990d..1eaccdad09 100644 --- a/widgets/text/e-reflow-model.c +++ b/widgets/text/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/text/e-reflow.c b/widgets/text/e-reflow.c index 441102ac0f..6d921c719d 100644 --- a/widgets/text/e-reflow.c +++ b/widgets/text/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/text/e-reflow.h b/widgets/text/e-reflow.h index 234dbc16a2..1559ad6bc0 100644 --- a/widgets/text/e-reflow.h +++ b/widgets/text/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/text/e-text-model-repos.h b/widgets/text/e-text-model-repos.h index 6a185daa08..1c602a88b6 100644 --- a/widgets/text/e-text-model-repos.h +++ b/widgets/text/e-text-model-repos.h @@ -34,7 +34,6 @@ typedef struct { gint e_repos_shift (gint pos, gpointer data); - typedef struct { ETextModel *model; gint pos; /* Position to move to. Negative values count from the end buffer. @@ -43,7 +42,6 @@ typedef struct { gint e_repos_absolute (gint pos, gpointer data); - typedef struct { ETextModel *model; gint pos; /* Location of first inserted character. */ @@ -52,7 +50,6 @@ typedef struct { gint e_repos_insert_shift (gint pos, gpointer data); - typedef struct { ETextModel *model; gint pos; /* Location of first deleted character. */ @@ -61,7 +58,6 @@ typedef struct { gint e_repos_delete_shift (gint pos, gpointer data); - /* For e_repos_clamp, data is a pointer to an ETextModel. The only repositioning that occurs is to avoid buffer overruns. */ diff --git a/widgets/text/e-text-model.c b/widgets/text/e-text-model.c index e1a0fca438..e4ab873d9d 100644 --- a/widgets/text/e-text-model.c +++ b/widgets/text/e-text-model.c @@ -398,7 +398,6 @@ e_text_model_insert_length (ETextModel *model, gint position, const gchar *text, g_return_if_fail (E_IS_TEXT_MODEL (model)); g_return_if_fail (length >= 0); - if (text == NULL || length == 0) return; diff --git a/widgets/text/e-text-model.h b/widgets/text/e-text-model.h index 0a9a738398..4b0a4475cb 100644 --- a/widgets/text/e-text-model.h +++ b/widgets/text/e-text-model.h @@ -82,7 +82,6 @@ void e_text_model_cancel_completion (ETextModel *model); void e_text_model_reposition (ETextModel *model, ETextModelReposFn fn, gpointer repos_data); gint e_text_model_validate_position (ETextModel *model, gint pos); - /* Functions for manipulating the underlying text. */ const gchar *e_text_model_get_text (ETextModel *model); @@ -94,7 +93,6 @@ void e_text_model_prepend (ETextModel *model, const gchar *text) void e_text_model_append (ETextModel *model, const gchar *text); void e_text_model_delete (ETextModel *model, gint position, gint length); - /* Functions for accessing embedded objects. */ gint e_text_model_object_count (ETextModel *model); diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c index 7c542d8f5f..bc8bbb75a7 100644 --- a/widgets/text/e-text.c +++ b/widgets/text/e-text.c @@ -1657,7 +1657,6 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable, } } - if (text->clip) { gdk_gc_set_clip_rectangle (main_gc, NULL); } @@ -2030,8 +2029,6 @@ _do_tooltip (gpointer data) "justification", text->justification, NULL); - - if (text->draw_borders) e_canvas_item_move_absolute(tooltip_text, 1 + BORDER_INDENT, 1 + BORDER_INDENT); else @@ -2348,11 +2345,9 @@ e_text_event (GnomeCanvasItem *item, GdkEvent *event) g_signal_emit (text, e_text_signals[E_TEXT_KEYPRESS], 0, e_tep_event.key.keyval, e_tep_event.key.state); - if (e_tep_event.key.string) g_free ((gpointer) e_tep_event.key.string); - return ret; } break; @@ -2565,7 +2560,6 @@ e_text_select_all (EText *text) e_text_command(text->tep, &command, text); } - static void primary_get_cb (GtkClipboard *clipboard, GtkSelectionData *selection_data, @@ -2857,8 +2851,6 @@ find_offset_into_line (EText *text, gint offset_into_text, gchar **start_of_line } } - - /* direction = TRUE (move forward), FALSE (move backward) Any error shall return length(text->text) or 0 or text->selection_end (as deemed fit) */ static gint @@ -2925,8 +2917,6 @@ _get_updated_position (EText *text, gboolean direction) return new_pos; } - - static gint _get_position(EText *text, ETextEventProcessorCommand *command) { @@ -3148,7 +3138,6 @@ _get_position(EText *text, ETextEventProcessorCommand *command) else text->selection_start = g_utf8_pointer_to_offset (text->text, p); - text->selection_start = e_text_model_validate_position (text->model, text->selection_start); length = g_utf8_strlen (text->text, -1); @@ -3486,7 +3475,6 @@ e_text_command(ETextEventProcessor *tep, ETextEventProcessorCommand *command, gp gnome_canvas_item_request_update (GNOME_CANVAS_ITEM(text)); } - /* Class initialization function for the text item */ static void e_text_class_init (ETextClass *klass) @@ -3590,7 +3578,6 @@ e_text_class_init (ETextClass *klass) GTK_TYPE_ANCHOR_TYPE, GTK_ANCHOR_CENTER, G_PARAM_READWRITE)); - g_object_class_install_property (gobject_class, PROP_JUSTIFICATION, g_param_spec_enum ("justification", _( "Justification" ), @@ -3654,7 +3641,6 @@ e_text_class_init (ETextClass *klass) GDK_TYPE_COLOR, G_PARAM_READWRITE)); - g_object_class_install_property (gobject_class, PROP_FILL_COLOR_RGBA, g_param_spec_uint ("fill_color_rgba", _( "GDK fill color" ), @@ -3683,7 +3669,6 @@ e_text_class_init (ETextClass *klass) 0.0, G_MAXDOUBLE, 0.0, G_PARAM_READABLE)); - g_object_class_install_property (gobject_class, PROP_EDITABLE, g_param_spec_boolean ("editable", _( "Editable" ), @@ -3733,7 +3718,6 @@ e_text_class_init (ETextClass *klass) 0.0, G_MAXDOUBLE, 0.0, G_PARAM_READWRITE)); - g_object_class_install_property (gobject_class, PROP_HEIGHT, g_param_spec_double ("height", _( "Height" ), @@ -3887,11 +3871,9 @@ e_text_init (EText *text) text->handle_popup = FALSE; - e_canvas_item_set_reflow_callback(GNOME_CANVAS_ITEM(text), e_text_reflow); } - /* IM Context Callbacks */ static void e_text_commit_cb (GtkIMContext *context, diff --git a/widgets/text/e-text.h b/widgets/text/e-text.h index 5f6904b14a..057ff507a7 100644 --- a/widgets/text/e-text.h +++ b/widgets/text/e-text.h @@ -46,7 +46,6 @@ G_BEGIN_DECLS - /* Text item for the canvas. Text items are positioned by an anchor point and an anchor direction. * * A clipping rectangle may be specified for the text. The rectangle is anchored at the text's anchor @@ -97,7 +96,6 @@ G_BEGIN_DECLS #define E_IS_TEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_TEXT)) #define E_IS_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_TEXT)) - typedef struct _EText EText; typedef struct _ETextClass ETextClass; @@ -231,7 +229,6 @@ struct _ETextClass { void (* style_set) (EText *text, GtkStyle *previous_style); }; - /* Standard Gtk function */ GType e_text_get_type (void); void e_text_cancel_editing (EText *text); diff --git a/widgets/text/gal-a11y-e-text-factory.h b/widgets/text/gal-a11y-e-text-factory.h index df7638f64f..7e7f8e9f1a 100644 --- a/widgets/text/gal-a11y-e-text-factory.h +++ b/widgets/text/gal-a11y-e-text-factory.h @@ -43,7 +43,6 @@ struct _GalA11yETextFactoryClass { AtkObjectFactoryClass parent_class; }; - /* Standard Glib function */ GType gal_a11y_e_text_factory_get_type (void); diff --git a/widgets/text/gal-a11y-e-text.c b/widgets/text/gal-a11y-e-text.c index 99fb4e8a94..113c503da9 100644 --- a/widgets/text/gal-a11y-e-text.c +++ b/widgets/text/gal-a11y-e-text.c @@ -419,7 +419,6 @@ et_get_character_at_offset (AtkText *text, return g_utf8_get_char_validated (at_offset, -1); } - static gchar * et_get_text_before_offset (AtkText *text, gint offset, @@ -492,7 +491,6 @@ et_get_caret_offset (AtkText *text) return offset; } - static AtkAttributeSet* et_get_run_attributes (AtkText *text, gint offset, @@ -503,7 +501,6 @@ et_get_run_attributes (AtkText *text, return NULL; } - static AtkAttributeSet* et_get_default_attributes (AtkText *text) { @@ -511,7 +508,6 @@ et_get_default_attributes (AtkText *text) return NULL; } - static void et_get_character_extents (AtkText *text, gint offset, @@ -584,7 +580,6 @@ et_get_character_extents (AtkText *text, } } - static gint et_get_character_count (AtkText *text) { @@ -593,7 +588,6 @@ et_get_character_count (AtkText *text) return g_utf8_strlen (full_text, -1); } - static gint et_get_offset_at_point (AtkText *text, gint x, @@ -658,7 +652,6 @@ et_get_offset_at_point (AtkText *text, return g_utf8_pointer_to_offset (etext->text, etext->text + index + trailing); } - static gint et_get_n_selections (AtkText *text) { @@ -669,7 +662,6 @@ et_get_n_selections (AtkText *text) return 0; } - static gchar * et_get_selection (AtkText *text, gint selection_num, @@ -702,7 +694,6 @@ et_get_selection (AtkText *text, return NULL; } - static gboolean et_add_selection (AtkText *text, gint start_offset, @@ -741,7 +732,6 @@ et_add_selection (AtkText *text, return FALSE; } - static gboolean et_remove_selection (AtkText *text, gint selection_num) @@ -766,7 +756,6 @@ et_remove_selection (AtkText *text, return FALSE; } - static gboolean et_set_selection (AtkText *text, gint selection_num, @@ -785,7 +774,6 @@ et_set_selection (AtkText *text, return FALSE; } - static gboolean et_set_caret_offset (AtkText *text, gint offset) diff --git a/widgets/text/gal-a11y-e-text.h b/widgets/text/gal-a11y-e-text.h index 6a5bb80de0..ff55bdadc7 100644 --- a/widgets/text/gal-a11y-e-text.h +++ b/widgets/text/gal-a11y-e-text.h @@ -48,7 +48,6 @@ struct _GalA11yETextClass { AtkObject parent_class; }; - /* Standard Glib function */ GType gal_a11y_e_text_get_type (void); |