Dear Milan, Am Donnerstag, den 29.09.2011, 09:26 +0200 schrieb Milan Crha:
On Wed, 2011-09-28 at 11:21 +0200, Paul Menzel wrote:... introduced several occurences of Ctrl + l. Probably this is due to the used editor. ...
would you mind to file this as a bug report and attach a patch there (and maybe CC me on the bug), please? It's easier, at least for me, to get the patch as an attachment than extract it from the mail.
thanks to `git am` you do not have to extract it. If you use Evolution ;-), you just save the message as an mbox file (Ctrl + s) and then use `git am path/to/the/mbox` and everything should be fine.
Also, please make sure it's applicable against current git master.
I had rebased it against master before I sent the message. Please find an updated patch attached. You can apply this (whole) message mbox with `git am --scissors path/to/the/mbox`. Thanks, Paul ---- 8< -------------- >8 ---- From ccc980da1fd84ebfca25cf8caf9a5d62333099fc Mon Sep 17 00:00:00 2001 From: Paul Menzel <paulepanter users sourceforge net> Date: Wed, 28 Sep 2011 10:18:18 +0200 Subject: [PATCH] Remove Ctrl + l () character from source files The following commits git show aac3f2c8 git show 1510304c git show 13cabd9e git show 350a7a33 git show 9b7cc54d git show e6972011 git show 1d3a7938 git show 934524b9 git show b2954936 git show a7f677b5 git show 4369c400 git show d509f47a git show a6d5818f git show c3876df7 git show 4583098b git show 2831ada5 git show 4e1bce59 git show 1609f699 git show 4e4c1676 git show d6fade43 among others(?) introduced several occurrences of Ctrl + l (). Probably this was caused by the used editor. These control characters can be searched for using the following command [1]. $ git grep ^L [1] http://unstableme.blogspot.com/2009/10/grep-and-print-control-characters-in.html --- v2: fix typo in commit message and correct commit summary --- COPYING.LGPL2 | 18 +++++++++--------- .../gui/widgets/e-addressbook-reflow-adapter.c | 1 - calendar/gui/alarm-notify/alarm-queue.c | 1 - calendar/gui/alarm-notify/alarm.c | 5 ----- calendar/gui/alarm-notify/alarm.h | 3 --- calendar/gui/alarm-notify/config-data.c | 2 -- calendar/gui/calendar-view-factory.c | 7 ------- calendar/gui/calendar-view-factory.h | 4 ---- calendar/gui/calendar-view.c | 7 ------- calendar/gui/calendar-view.h | 4 ---- calendar/gui/comp-util.c | 1 - calendar/gui/dialogs/alarm-dialog.c | 1 - calendar/gui/dialogs/alarm-list-dialog.c | 1 - calendar/gui/dialogs/cancel-comp.c | 1 - calendar/gui/dialogs/changed-comp.c | 1 - calendar/gui/dialogs/comp-editor-util.c | 1 - calendar/gui/dialogs/delete-comp.c | 1 - calendar/gui/dialogs/delete-error.c | 1 - calendar/gui/dialogs/event-page.c | 2 -- calendar/gui/dialogs/recur-comp.c | 1 - calendar/gui/dialogs/recurrence-page.c | 4 ---- calendar/gui/dialogs/send-comp.c | 1 - calendar/gui/dialogs/task-page.c | 2 -- calendar/gui/e-meeting-attendee.c | 1 - calendar/gui/e-meeting-attendee.h | 1 - calendar/gui/e-meeting-types.h | 2 -- calendar/gui/misc.c | 2 -- calendar/gui/print.c | 2 -- calendar/gui/weekday-picker.c | 2 -- calendar/gui/weekday-picker.h | 4 ---- libgnomecanvas/gnome-canvas-pixbuf.c | 13 ------------- libgnomecanvas/gnome-canvas-pixbuf.h | 4 ---- libgnomecanvas/gnome-canvas-text.c | 3 --- modules/addressbook/addressbook-config.c | 3 --- smime/lib/e-asn1-object.c | 1 - smime/lib/e-cert-db.c | 2 -- smime/lib/e-cert.c | 4 ---- smime/lib/e-pkcs12.c | 2 -- widgets/misc/e-url-entry.c | 2 -- widgets/misc/e-url-entry.h | 3 --- widgets/table/e-table-memory.c | 2 -- widgets/table/e-tree-memory.c | 5 ----- widgets/table/e-tree-model.c | 3 --- widgets/table/e-tree-sorted.c | 8 -------- widgets/text/e-reflow.c | 2 -- widgets/text/e-text.c | 2 -- 46 files changed, 9 insertions(+), 134 deletions(-) diff --git a/COPYING.LGPL2 b/COPYING.LGPL2 index 9084f4c..eaa2dd9 100644 --- a/COPYING.LGPL2 +++ b/COPYING.LGPL2 @@ -55,7 +55,7 @@ modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others. - + Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a @@ -111,7 +111,7 @@ modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run. - + GNU LESSER GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION @@ -158,7 +158,7 @@ Library. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. - + 2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 @@ -216,7 +216,7 @@ instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. - + Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. @@ -267,7 +267,7 @@ Library will still fall under Section 6.) distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. - + 6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work @@ -329,7 +329,7 @@ restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. - + 7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined @@ -370,7 +370,7 @@ subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License. - + 11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or @@ -422,7 +422,7 @@ conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. - + 14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is @@ -456,7 +456,7 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS - + How to Apply These Terms to Your New Libraries If you develop a new library, and you want it to be of the greatest diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c index 0d2fc85..71e6386 100644 --- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c @@ -625,7 +625,6 @@ e_addressbook_reflow_adapter_new (EAddressbookModel *model) return E_REFLOW_MODEL (et); } - EContact * e_addressbook_reflow_adapter_get_contact (EAddressbookReflowAdapter *adapter, gint index) diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c index d7a1346..8a4ae2f 100644 --- a/calendar/gui/alarm-notify/alarm-queue.c +++ b/calendar/gui/alarm-notify/alarm-queue.c @@ -970,7 +970,6 @@ query_objects_removed_cb (ECalClientView *view, message_push ((Message *) msg); } - /* Notification functions */ diff --git a/calendar/gui/alarm-notify/alarm.c b/calendar/gui/alarm-notify/alarm.c index 968eb95..a054985 100644 --- a/calendar/gui/alarm-notify/alarm.c +++ b/calendar/gui/alarm-notify/alarm.c @@ -36,7 +36,6 @@ #include "alarm.h" #include "config-data.h" - /* Our glib timeout */ static guint timeout_id; @@ -54,8 +53,6 @@ typedef struct { static void setup_timeout (void); - - /* Removes the head alarm from the queue. Does not touch the timeout_id. */ static void pop_alarm (void) @@ -199,8 +196,6 @@ queue_alarm (AlarmRecord *ar) setup_timeout (); } - - /** * alarm_add: * @trigger: Time at which alarm will trigger. diff --git a/calendar/gui/alarm-notify/alarm.h b/calendar/gui/alarm-notify/alarm.h index 7a14db5..54a6e4c 100644 --- a/calendar/gui/alarm-notify/alarm.h +++ b/calendar/gui/alarm-notify/alarm.h @@ -29,7 +29,6 @@ #include <time.h> #include <glib.h> - typedef void (* AlarmFunction) (gpointer alarm_id, time_t trigger, gpointer data); typedef void (* AlarmDestroyNotify) (gpointer alarm_id, gpointer data); @@ -40,6 +39,4 @@ gpointer alarm_add (time_t trigger, AlarmFunction alarm_fn, gpointer data, AlarmDestroyNotify destroy_notify_fn); void alarm_remove (gpointer alarm); - - #endif diff --git a/calendar/gui/alarm-notify/config-data.c b/calendar/gui/alarm-notify/config-data.c index d056131..a77ecac 100644 --- a/calendar/gui/alarm-notify/config-data.c +++ b/calendar/gui/alarm-notify/config-data.c @@ -40,8 +40,6 @@ static gboolean inited = FALSE; static GConfClient *conf_client = NULL; static ESourceList *calendar_source_list = NULL, *tasks_source_list = NULL; - - /* Copied from ../calendar-config.c; returns whether the locale has 'am' and * 'pm' strings defined. */ diff --git a/calendar/gui/calendar-view-factory.c b/calendar/gui/calendar-view-factory.c index b1d4a4f..4c92d6d 100644 --- a/calendar/gui/calendar-view-factory.c +++ b/calendar/gui/calendar-view-factory.c @@ -30,7 +30,6 @@ #include "calendar-view-factory.h" #include "calendar-view.h" - /* Private part of the CalendarViewFactory structure */ struct _CalendarViewFactoryPrivate { @@ -38,8 +37,6 @@ struct _CalendarViewFactoryPrivate { GnomeCalendarViewType view_type; }; - - static void calendar_view_factory_finalize (GObject *object); static const gchar * calendar_view_factory_get_title (GalViewFactory *factory); @@ -99,8 +96,6 @@ calendar_view_factory_finalize (GObject *object) G_OBJECT_CLASS (calendar_view_factory_parent_class)->finalize (object); } - - /* get_title method for the calendar view factory */ static const gchar * calendar_view_factory_get_title (GalViewFactory *factory) @@ -173,8 +168,6 @@ calendar_view_factory_new_view (GalViewFactory *factory, return GAL_VIEW (cal_view); } - - /** * calendar_view_factory_construct: * @cal_view_factory: A calendar view factory. diff --git a/calendar/gui/calendar-view-factory.h b/calendar/gui/calendar-view-factory.h index c6022ae..bad3dcf 100644 --- a/calendar/gui/calendar-view-factory.h +++ b/calendar/gui/calendar-view-factory.h @@ -31,8 +31,6 @@ G_BEGIN_DECLS - - #define TYPE_CALENDAR_VIEW_FACTORY (calendar_view_factory_get_type ()) #define CALENDAR_VIEW_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CALENDAR_VIEW_FACTORY, \ CalendarViewFactory)) @@ -62,8 +60,6 @@ GalViewFactory *calendar_view_factory_construct (CalendarViewFactory *cal_view_f GalViewFactory *calendar_view_factory_new (GnomeCalendarViewType view_type); - - G_END_DECLS #endif diff --git a/calendar/gui/calendar-view.c b/calendar/gui/calendar-view.c index 0931a4b..d238daf 100644 --- a/calendar/gui/calendar-view.c +++ b/calendar/gui/calendar-view.c @@ -28,7 +28,6 @@ #include "calendar-view.h" - /* Private part of the CalendarView structure */ struct _CalendarViewPrivate { @@ -39,8 +38,6 @@ struct _CalendarViewPrivate { gchar *title; }; - - static void calendar_view_finalize (GObject *object); static void calendar_view_load (GalView *view, const gchar *filename); @@ -110,8 +107,6 @@ calendar_view_finalize (GObject *object) G_OBJECT_CLASS (calendar_view_parent_class)->finalize (object); } - - /* load method of the calendar view */ static void calendar_view_load (GalView *view, @@ -207,8 +202,6 @@ calendar_view_clone (GalView *view) return GAL_VIEW (new_view); } - - /** * calendar_view_construct: * @cal_view: A calendar view. diff --git a/calendar/gui/calendar-view.h b/calendar/gui/calendar-view.h index d2e9a7d..f3a2a31 100644 --- a/calendar/gui/calendar-view.h +++ b/calendar/gui/calendar-view.h @@ -31,8 +31,6 @@ G_BEGIN_DECLS - - #define TYPE_CALENDAR_VIEW (calendar_view_get_type ()) #define CALENDAR_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CALENDAR_VIEW, CalendarView)) #define CALENDAR_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CALENDAR_VIEW, \ @@ -64,8 +62,6 @@ CalendarView *calendar_view_new (GnomeCalendarViewType view_type, GnomeCalendarViewType calendar_view_get_view_type (CalendarView *cal_view); - - G_END_DECLS #endif diff --git a/calendar/gui/comp-util.c b/calendar/gui/comp-util.c index 9405f24..8bb5500 100644 --- a/calendar/gui/comp-util.c +++ b/calendar/gui/comp-util.c @@ -39,7 +39,6 @@ #include "shell/e-shell-window.h" #include "shell/e-shell-view.h" - /** * cal_comp_util_add_exdate: diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c index 59cdb45..4576f3d 100644 --- a/calendar/gui/dialogs/alarm-dialog.c +++ b/calendar/gui/dialogs/alarm-dialog.c @@ -45,7 +45,6 @@ #include "comp-editor-util.h" #include "alarm-dialog.h" - typedef struct { GtkBuilder *builder; diff --git a/calendar/gui/dialogs/alarm-list-dialog.c b/calendar/gui/dialogs/alarm-list-dialog.c index 48503c1..4fb5884 100644 --- a/calendar/gui/dialogs/alarm-list-dialog.c +++ b/calendar/gui/dialogs/alarm-list-dialog.c @@ -42,7 +42,6 @@ #include "alarm-dialog.h" #include "alarm-list-dialog.h" - typedef struct { GtkBuilder *builder; diff --git a/calendar/gui/dialogs/cancel-comp.c b/calendar/gui/dialogs/cancel-comp.c index 86663ed..c5caa93 100644 --- a/calendar/gui/dialogs/cancel-comp.c +++ b/calendar/gui/dialogs/cancel-comp.c @@ -31,7 +31,6 @@ #include "e-util/e-alert-dialog.h" #include "cancel-comp.h" - /* is_past_event: * diff --git a/calendar/gui/dialogs/changed-comp.c b/calendar/gui/dialogs/changed-comp.c index 7892879..bc25188 100644 --- a/calendar/gui/dialogs/changed-comp.c +++ b/calendar/gui/dialogs/changed-comp.c @@ -29,7 +29,6 @@ #include <glib/gi18n.h> #include "changed-comp.h" - /** * changed_component_dialog: diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c index cbc34cb..2c087bb 100644 --- a/calendar/gui/dialogs/comp-editor-util.c +++ b/calendar/gui/dialogs/comp-editor-util.c @@ -37,7 +37,6 @@ #include <shell/e-shell.h> #include "comp-editor-util.h" - /** * comp_editor_dates: diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c index a28fa00..44c133a 100644 --- a/calendar/gui/dialogs/delete-comp.c +++ b/calendar/gui/dialogs/delete-comp.c @@ -30,7 +30,6 @@ #include "e-util/e-alert-dialog.h" #include "delete-comp.h" - /** * delete_component_dialog: diff --git a/calendar/gui/dialogs/delete-error.c b/calendar/gui/dialogs/delete-error.c index a5cc6a1..a68fed8 100644 --- a/calendar/gui/dialogs/delete-error.c +++ b/calendar/gui/dialogs/delete-error.c @@ -30,7 +30,6 @@ #include <glib/gi18n.h> #include "delete-error.h" - /** * delete_error_dialog: diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index e92c987..b418898 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -3409,8 +3409,6 @@ init_widgets (EventPage *epage) return TRUE; } - - static void event_page_select_organizer (EventPage *epage, const gchar *backend_address) diff --git a/calendar/gui/dialogs/recur-comp.c b/calendar/gui/dialogs/recur-comp.c index e9a9419..9652553 100644 --- a/calendar/gui/dialogs/recur-comp.c +++ b/calendar/gui/dialogs/recur-comp.c @@ -29,7 +29,6 @@ #include <glib/gi18n.h> #include "recur-comp.h" - gboolean recur_component_dialog (ECalClient *client, diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c index 6f201b5..54dee77 100644 --- a/calendar/gui/dialogs/recurrence-page.c +++ b/calendar/gui/dialogs/recurrence-page.c @@ -189,8 +189,6 @@ struct _RecurrencePagePrivate { GCancellable *cancellable; }; - - static void recurrence_page_finalize (GObject *object); static gboolean fill_component (RecurrencePage *rpage, ECalComponent *comp); @@ -2075,8 +2073,6 @@ recurrence_page_set_dates (CompEditorPage *page, preview_recur (rpage); } - - /* Gets the widgets from the XML file and returns if they are all available. */ static gboolean get_widgets (RecurrencePage *rpage) diff --git a/calendar/gui/dialogs/send-comp.c b/calendar/gui/dialogs/send-comp.c index 3752db3..524f4c8 100644 --- a/calendar/gui/dialogs/send-comp.c +++ b/calendar/gui/dialogs/send-comp.c @@ -30,7 +30,6 @@ #include "e-util/e-alert-dialog.h" #include "send-comp.h" - static gboolean component_has_new_attendees (ECalComponent *comp) diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c index 05f1f87..a533505 100644 --- a/calendar/gui/dialogs/task-page.c +++ b/calendar/gui/dialogs/task-page.c @@ -2027,8 +2027,6 @@ init_widgets (TaskPage *tpage) return TRUE; } - - static void task_page_select_organizer (TaskPage *tpage, const gchar *backend_address) diff --git a/calendar/gui/e-meeting-attendee.c b/calendar/gui/e-meeting-attendee.c index e783195..00e3f9d 100644 --- a/calendar/gui/e-meeting-attendee.c +++ b/calendar/gui/e-meeting-attendee.c @@ -158,7 +158,6 @@ e_meeting_attendee_init (EMeetingAttendee *ia) priv->longest_period_in_days = 0; } - static void e_meeting_attendee_finalize (GObject *obj) { diff --git a/calendar/gui/e-meeting-attendee.h b/calendar/gui/e-meeting-attendee.h index bc2eaa0..7545a0f 100644 --- a/calendar/gui/e-meeting-attendee.h +++ b/calendar/gui/e-meeting-attendee.h @@ -36,7 +36,6 @@ G_BEGIN_DECLS #define E_IS_MEETING_ATTENDEE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MEETING_ATTENDEE)) #define E_IS_MEETING_ATTENDEE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MEETING_ATTENDEE)) - typedef struct _EMeetingAttendee EMeetingAttendee; typedef struct _EMeetingAttendeePrivate EMeetingAttendeePrivate; typedef struct _EMeetingAttendeeClass EMeetingAttendeeClass; diff --git a/calendar/gui/e-meeting-types.h b/calendar/gui/e-meeting-types.h index 50964f1..b8f1057 100644 --- a/calendar/gui/e-meeting-types.h +++ b/calendar/gui/e-meeting-types.h @@ -28,8 +28,6 @@ G_BEGIN_DECLS - - typedef struct _EMeetingTime EMeetingTime; typedef struct _EMeetingFreeBusyPeriod EMeetingFreeBusyPeriod; diff --git a/calendar/gui/misc.c b/calendar/gui/misc.c index f3bacef..a3243af 100644 --- a/calendar/gui/misc.c +++ b/calendar/gui/misc.c @@ -33,8 +33,6 @@ #include "misc.h" - - /** * string_is_empty: * @value: A string. diff --git a/calendar/gui/print.c b/calendar/gui/print.c index 6d37168..29d6b30 100644 --- a/calendar/gui/print.c +++ b/calendar/gui/print.c @@ -116,8 +116,6 @@ get_font_size (PangoFontDescription *font) return pango_units_to_double (pango_font_description_get_size (font)); } - - /* * Note that most dimensions are in points (1/72 of an inch) since that is * what gnome-print uses. diff --git a/calendar/gui/weekday-picker.c b/calendar/gui/weekday-picker.c index d1a9a28..a06b249 100644 --- a/calendar/gui/weekday-picker.c +++ b/calendar/gui/weekday-picker.c @@ -59,8 +59,6 @@ struct _WeekdayPickerPrivate { GnomeCanvasItem *labels[7]; }; - - /* Signal IDs */ enum { CHANGED, diff --git a/calendar/gui/weekday-picker.h b/calendar/gui/weekday-picker.h index 6939e62..315fa5b 100644 --- a/calendar/gui/weekday-picker.h +++ b/calendar/gui/weekday-picker.h @@ -28,8 +28,6 @@ G_BEGIN_DECLS - - #define TYPE_WEEKDAY_PICKER (weekday_picker_get_type ()) #define WEEKDAY_PICKER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_WEEKDAY_PICKER, WeekdayPicker)) #define WEEKDAY_PICKER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_WEEKDAY_PICKER, \ @@ -67,8 +65,6 @@ guint weekday_picker_get_blocked_days (WeekdayPicker *wp); void weekday_picker_set_week_start_day (WeekdayPicker *wp, gint week_start_day); gint weekday_picker_get_week_start_day (WeekdayPicker *wp); - - G_END_DECLS #endif diff --git a/libgnomecanvas/gnome-canvas-pixbuf.c b/libgnomecanvas/gnome-canvas-pixbuf.c index 091db2a..71c7d95 100644 --- a/libgnomecanvas/gnome-canvas-pixbuf.c +++ b/libgnomecanvas/gnome-canvas-pixbuf.c @@ -67,7 +67,6 @@ static void gnome_canvas_pixbuf_bounds (GnomeCanvasItem *item, G_DEFINE_TYPE (GnomeCanvasPixbuf, gnome_canvas_pixbuf, GNOME_TYPE_CANVAS_ITEM) - /* Class initialization function for the pixbuf canvas item */ static void @@ -128,8 +127,6 @@ gnome_canvas_pixbuf_dispose (GnomeCanvasItem *object) GNOME_CANVAS_ITEM_CLASS (gnome_canvas_pixbuf_parent_class)->dispose (object); } - - /* Set_property handler for the pixbuf canvas item */ static void gnome_canvas_pixbuf_set_property (GObject *object, @@ -195,8 +192,6 @@ gnome_canvas_pixbuf_get_property (GObject *object, } } - - /* Bounds and utilities */ /* Recomputes the bounding box of a pixbuf canvas item. The horizontal and @@ -233,8 +228,6 @@ recompute_bounding_box (GnomeCanvasPixbuf *gcp) item->y2 = ceil (y2); } - - /* Update sequence */ /* Update handler for the pixbuf canvas item */ @@ -259,8 +252,6 @@ gnome_canvas_pixbuf_update (GnomeCanvasItem *item, item->canvas, item->x1, item->y1, item->x2, item->y2); } - - /* Draw handler for the pixbuf canvas item */ static void gnome_canvas_pixbuf_draw (GnomeCanvasItem *item, @@ -290,8 +281,6 @@ gnome_canvas_pixbuf_draw (GnomeCanvasItem *item, cairo_restore (cr); } - - /* Point handler for the pixbuf canvas item */ static GnomeCanvasItem * gnome_canvas_pixbuf_point (GnomeCanvasItem *item, @@ -333,8 +322,6 @@ gnome_canvas_pixbuf_point (GnomeCanvasItem *item, return item; } - - /* Bounds handler for the pixbuf canvas item */ static void gnome_canvas_pixbuf_bounds (GnomeCanvasItem *item, diff --git a/libgnomecanvas/gnome-canvas-pixbuf.h b/libgnomecanvas/gnome-canvas-pixbuf.h index 3c4141d..3fe4980 100644 --- a/libgnomecanvas/gnome-canvas-pixbuf.h +++ b/libgnomecanvas/gnome-canvas-pixbuf.h @@ -27,8 +27,6 @@ G_BEGIN_DECLS - - #define GNOME_TYPE_CANVAS_PIXBUF (gnome_canvas_pixbuf_get_type ()) #define GNOME_CANVAS_PIXBUF(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_CANVAS_PIXBUF, GnomeCanvasPixbuf)) #define GNOME_CANVAS_PIXBUF_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_CANVAS_PIXBUF, GnomeCanvasPixbufClass)) @@ -53,8 +51,6 @@ struct _GnomeCanvasPixbufClass { GType gnome_canvas_pixbuf_get_type (void) G_GNUC_CONST; - - G_END_DECLS #endif diff --git a/libgnomecanvas/gnome-canvas-text.c b/libgnomecanvas/gnome-canvas-text.c index 70b7142..8f921a0 100644 --- a/libgnomecanvas/gnome-canvas-text.c +++ b/libgnomecanvas/gnome-canvas-text.c @@ -46,7 +46,6 @@ #include "gnome-canvas-util.h" #include "gnome-canvas-i18n.h" - /* Object argument IDs */ enum { @@ -135,8 +134,6 @@ static void add_attr (PangoAttrList *attr_list, static GnomeCanvasItemClass *parent_class; - - /** * gnome_canvas_text_get_type: * @void: diff --git a/modules/addressbook/addressbook-config.c b/modules/addressbook/addressbook-config.c index f075372..e312024 100644 --- a/modules/addressbook/addressbook-config.c +++ b/modules/addressbook/addressbook-config.c @@ -76,7 +76,6 @@ #define EVOLUTIONPERSON "evolutionPerson" #define CALENTRY "calEntry" - typedef struct _AddressbookSourceDialog AddressbookSourceDialog; struct _AddressbookSourceDialog { @@ -122,8 +121,6 @@ struct _AddressbookSourceDialog { GtkWidget *display_name; }; - - #ifdef HAVE_LDAP static const gchar * diff --git a/smime/lib/e-asn1-object.c b/smime/lib/e-asn1-object.c index 28c3aa7..4dd519e 100644 --- a/smime/lib/e-asn1-object.c +++ b/smime/lib/e-asn1-object.c @@ -129,7 +129,6 @@ e_asn1_object_get_type (void) return asn1_object_type; } - /* This function is used to interpret an integer that * was encoded in a DER buffer. This function is used * when converting a DER buffer into a nsIASN1Object diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c index 7fdd20f..6006168 100644 --- a/smime/lib/e-cert-db.c +++ b/smime/lib/e-cert-db.c @@ -616,8 +616,6 @@ e_cert_db_get_type (void) return cert_type; } - - GStaticMutex init_mutex = G_STATIC_MUTEX_INIT; static ECertDB *cert_db = NULL; diff --git a/smime/lib/e-cert.c b/smime/lib/e-cert.c index e7aecc1..930dd65 100644 --- a/smime/lib/e-cert.c +++ b/smime/lib/e-cert.c @@ -194,8 +194,6 @@ e_cert_get_type (void) return cert_type; } - - static void e_cert_populate (ECert *cert) { @@ -286,8 +284,6 @@ e_cert_new_from_der (gchar *data, return e_cert_new (cert); } - - CERTCertificate * e_cert_get_internal_cert (ECert *cert) { diff --git a/smime/lib/e-pkcs12.c b/smime/lib/e-pkcs12.c index 9b95668..5f7a73c 100644 --- a/smime/lib/e-pkcs12.c +++ b/smime/lib/e-pkcs12.c @@ -143,8 +143,6 @@ e_pkcs12_get_type (void) return pkcs12_type; } - - EPKCS12 * e_pkcs12_new (void) { diff --git a/widgets/misc/e-url-entry.c b/widgets/misc/e-url-entry.c index c4a174c..c59cf07 100644 --- a/widgets/misc/e-url-entry.c +++ b/widgets/misc/e-url-entry.c @@ -118,8 +118,6 @@ mnemonic_activate (GtkWidget *widget, return gtk_widget_mnemonic_activate (priv->entry, group_cycling); } - - GtkWidget * e_url_entry_new (void) { diff --git a/widgets/misc/e-url-entry.h b/widgets/misc/e-url-entry.h index 7b50f79..119fe47 100644 --- a/widgets/misc/e-url-entry.h +++ b/widgets/misc/e-url-entry.h @@ -33,7 +33,6 @@ G_BEGIN_DECLS #define E_IS_URL_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_URL_ENTRY)) #define E_IS_URL_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_URL_ENTRY)) - typedef struct _EUrlEntry EUrlEntry; typedef struct _EUrlEntryPrivate EUrlEntryPrivate; typedef struct _EUrlEntryClass EUrlEntryClass; @@ -48,8 +47,6 @@ struct _EUrlEntryClass { GtkHBoxClass parent_class; }; - - GType e_url_entry_get_type (void); GtkWidget *e_url_entry_new (void); GtkWidget *e_url_entry_get_entry (EUrlEntry *url_entry); diff --git a/widgets/table/e-table-memory.c b/widgets/table/e-table-memory.c index 28f1026..6fe853e 100644 --- a/widgets/table/e-table-memory.c +++ b/widgets/table/e-table-memory.c @@ -176,8 +176,6 @@ e_table_memory_insert (ETableMemory *etmm, e_table_model_row_inserted (E_TABLE_MODEL (etmm), row); } - - /** * e_table_memory_remove: * @etable: diff --git a/widgets/table/e-tree-memory.c b/widgets/table/e-tree-memory.c index 43fb41b..4f279aa 100644 --- a/widgets/table/e-tree-memory.c +++ b/widgets/table/e-tree-memory.c @@ -77,7 +77,6 @@ struct _ETreeMemoryPrivate { gpointer destroy_user_data; }; - /* ETreeMemoryPath functions */ static inline void @@ -169,8 +168,6 @@ e_tree_path_unlink (ETreeMemoryPath *path) path->prev_sibling = NULL; } - - /** * e_tree_memory_freeze: * @etmm: the ETreeModel to freeze. @@ -212,7 +209,6 @@ e_tree_memory_thaw (ETreeMemory *etmm) } } - /* virtual methods */ static void @@ -363,7 +359,6 @@ etmm_node_request_collapse (ETreeModel *etm, parent_class->node_request_collapse (etm, node); } - static void e_tree_memory_class_init (ETreeMemoryClass *class) { diff --git a/widgets/table/e-tree-model.c b/widgets/table/e-tree-model.c index b37ce4b..2422141 100644 --- a/widgets/table/e-tree-model.c +++ b/widgets/table/e-tree-model.c @@ -61,7 +61,6 @@ enum { static guint e_tree_model_signals[LAST_SIGNAL] = {0, }; - static void e_tree_model_class_init (ETreeModelClass *class) { @@ -419,8 +418,6 @@ e_tree_model_node_request_collapse (ETreeModel *tree_model, g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals[NODE_REQUEST_COLLAPSE], 0, collapsed_node); } - - /** * e_tree_model_new * diff --git a/widgets/table/e-tree-sorted.c b/widgets/table/e-tree-sorted.c index 72b4cba..4d95fcc 100644 --- a/widgets/table/e-tree-sorted.c +++ b/widgets/table/e-tree-sorted.c @@ -119,8 +119,6 @@ static void free_path (ETreeSortedPath *path); static void generate_children (ETreeSorted *ets, ETreeSortedPath *path); static void regenerate_children (ETreeSorted *ets, ETreeSortedPath *path); - - /* idle callbacks */ static gboolean @@ -162,8 +160,6 @@ ets_insert_idle (ETreeSorted *ets) return FALSE; } - - /* Helper functions */ #define CHECK_AROUND_LAST_ACCESS @@ -597,8 +593,6 @@ schedule_resort (ETreeSorted *ets, } } - - /* virtual methods */ static void @@ -1210,8 +1204,6 @@ ets_sort_info_changed (ETableSortInfo *sort_info, schedule_resort (ets, ets->priv->root, TRUE, TRUE); } - - /* Initialization and creation */ static void diff --git a/widgets/text/e-reflow.c b/widgets/text/e-reflow.c index 02535d7..37cfef1 100644 --- a/widgets/text/e-reflow.c +++ b/widgets/text/e-reflow.c @@ -746,8 +746,6 @@ column_width_changed (EReflow *reflow) g_signal_emit (reflow, signals[COLUMN_WIDTH_CHANGED], 0, reflow->column_width); } - - /* Virtual functions */ static void e_reflow_set_property (GObject *object, diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c index b57cec8..d7512a5 100644 --- a/widgets/text/e-text.c +++ b/widgets/text/e-text.c @@ -174,8 +174,6 @@ static gboolean e_text_delete_surrounding_cb (GtkIMContext *context, static GdkAtom clipboard_atom = GDK_NONE; - - static void disconnect_im_context (EText *text) { -- 1.7.6.3
Attachment:
signature.asc
Description: This is a digitally signed message part