diff options
444 files changed, 249 insertions, 1940 deletions
diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c index 4bba2a3ddc..d7b97233e3 100644 --- a/addressbook/conduit/address-conduit.c +++ b/addressbook/conduit/address-conduit.c @@ -133,7 +133,6 @@ struct _EAddrLocalRecord { struct Address *addr; }; - static void addrconduit_destroy_record (EAddrLocalRecord *local) { diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.h b/addressbook/gui/contact-editor/e-contact-editor-fullname.h index 6ccd89ed9e..7741b208fb 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-fullname.h +++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.h @@ -44,7 +44,6 @@ G_BEGIN_DECLS #define E_IS_CONTACT_EDITOR_FULLNAME(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CONTACT_EDITOR_FULLNAME)) #define E_IS_CONTACT_EDITOR_FULLNAME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_CONTACT_EDITOR_FULLNAME)) - typedef struct _EContactEditorFullname EContactEditorFullname; typedef struct _EContactEditorFullnameClass EContactEditorFullnameClass; @@ -65,7 +64,6 @@ struct _EContactEditorFullnameClass GtkDialogClass parent_class; }; - GtkWidget *e_contact_editor_fullname_new(const EContactName *name); GType e_contact_editor_fullname_get_type (void); diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index d4768ae675..1d1d16c55b 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -74,7 +74,6 @@ enum { NUM_IM_COLUMNS }; - static void e_contact_editor_init (EContactEditor *editor); static void e_contact_editor_class_init (EContactEditorClass *klass); static void e_contact_editor_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); @@ -2726,7 +2725,6 @@ full_name_clicked (GtkWidget *button, EContactEditor *editor) editor->fullname_dialog = GTK_WIDGET (dialog); } - static void categories_response (GtkDialog *dialog, gint response, EContactEditor *editor) { @@ -3056,7 +3054,6 @@ save_contact (EContactEditor *ce, gboolean should_close) if (!ce->target_book) return; - if (ce->target_editable && !e_book_is_writable (ce->source_book)) { if (e_error_run (GTK_WINDOW (ce->app), "addressbook:prompt-move", NULL) == GTK_RESPONSE_NO) return; @@ -3133,7 +3130,6 @@ static const EContactField non_string_fields [] = { E_CONTACT_BIRTH_DATE, E_CONTACT_ANNIVERSARY - }; static gboolean @@ -3148,7 +3144,6 @@ is_non_string_field (EContactField id) } - /* insert checks here (date format, for instance, etc.) */ static gboolean e_contact_editor_is_valid (EABEditor *editor) @@ -3201,11 +3196,9 @@ e_contact_editor_is_valid (EABEditor *editor) break; } - } } - if (validation_error) { g_string_append (errmsg, "."); e_error_run (GTK_WINDOW (ce->app), "addressbook:generic-error", @@ -3546,7 +3539,6 @@ required_fields_cb (EBook *book, EBookStatus status, "required_fields", fields, NULL); - } EABEditor * diff --git a/addressbook/gui/contact-editor/e-contact-editor.h b/addressbook/gui/contact-editor/e-contact-editor.h index 6228dc3499..9a83831eff 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.h +++ b/addressbook/gui/contact-editor/e-contact-editor.h @@ -49,7 +49,6 @@ G_BEGIN_DECLS #define E_IS_CONTACT_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CONTACT_EDITOR)) #define E_IS_CONTACT_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_CONTACT_EDITOR)) - typedef struct _EContactEditor EContactEditor; typedef struct _EContactEditorClass EContactEditorClass; diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c index df3eb6ec58..bb40e9a79d 100644 --- a/addressbook/gui/contact-editor/e-contact-quick-add.c +++ b/addressbook/gui/contact-editor/e-contact-quick-add.c @@ -151,7 +151,6 @@ quick_add_merge_contact (QuickAdd *qa) addressbook_load (qa->book, merge_cb, qa); } - /* * Raise a contact editor with all fields editable, and hook up all signals accordingly. */ @@ -511,7 +510,6 @@ e_contact_quick_add_free_form (const gchar *text, EContactQuickAddCallback cb, g in_quote = !in_quote; } - if (last_at == NULL) { /* No at sign, so we treat it all as the name */ name = g_strdup (text); @@ -544,8 +542,6 @@ e_contact_quick_add_free_form (const gchar *text, EContactQuickAddCallback cb, g if (name == NULL && email == NULL) name = g_strdup (text); - - /* Clean up email, remove bracketing <>s */ if (email && *email) { gboolean changed = FALSE; @@ -562,7 +558,6 @@ e_contact_quick_add_free_form (const gchar *text, EContactQuickAddCallback cb, g g_strstrip (email); } - e_contact_quick_add (name, email, cb, closure); g_free (name); g_free (email); diff --git a/addressbook/gui/merging/eab-contact-compare.c b/addressbook/gui/merging/eab-contact-compare.c index bdf385f0ba..010b0dcdba 100644 --- a/addressbook/gui/merging/eab-contact-compare.c +++ b/addressbook/gui/merging/eab-contact-compare.c @@ -39,7 +39,6 @@ combine_comparisons (EABContactMatchType prev, return (EABContactMatchType) MAX ((gint) prev, (gint) new_info); } - /*** Name comparisons ***/ /* This *so* doesn't belong here... at least not implemented in a @@ -352,7 +351,6 @@ eab_contact_compare_name (EContact *contact1, EContact *contact2) return EAB_CONTACT_MATCH_NONE; } - /*** Nickname Comparisons ***/ EABContactMatchType @@ -364,8 +362,6 @@ eab_contact_compare_nickname (EContact *contact1, EContact *contact2) return EAB_CONTACT_MATCH_NOT_APPLICABLE; } - - /*** E-mail Comparisons ***/ static gboolean @@ -692,7 +688,6 @@ use_common_book_cb (EBook *book, gpointer closure) g_list_free (contact_email); } - /* Build up our full query from the parts. */ query_parts[p] = NULL; qj = g_strjoinv (" ", query_parts); diff --git a/addressbook/gui/merging/eab-contact-compare.h b/addressbook/gui/merging/eab-contact-compare.h index d08461940b..4fc8ed1569 100644 --- a/addressbook/gui/merging/eab-contact-compare.h +++ b/addressbook/gui/merging/eab-contact-compare.h @@ -66,7 +66,5 @@ EABContactMatchType eab_contact_compare (EContact *contact1, EContact void eab_contact_locate_match (EContact *contact, EABContactMatchQueryCallback cb, gpointer closure); void eab_contact_locate_match_full (EBook *book, EContact *contact, GList *avoid, EABContactMatchQueryCallback cb, gpointer closure); - - #endif /* __E_CONTACT_COMPARE_H__ */ diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c index 1be9758627..78f179c176 100644 --- a/addressbook/gui/merging/eab-contact-merging.c +++ b/addressbook/gui/merging/eab-contact-merging.c @@ -64,7 +64,6 @@ static void match_query_callback (EContact *contact, EContact *match, EABContact static GList *merging_queue = NULL; static gint running_merge_requests = 0; - static void add_lookup (EContactMergingLookup *lookup) { diff --git a/addressbook/gui/widgets/e-addressbook-model.h b/addressbook/gui/widgets/e-addressbook-model.h index 87f1ac5175..d17a8f38a7 100644 --- a/addressbook/gui/widgets/e-addressbook-model.h +++ b/addressbook/gui/widgets/e-addressbook-model.h @@ -55,7 +55,6 @@ struct _EAddressbookModel { EAddressbookModelPrivate *priv; }; - struct _EAddressbookModelClass { GObjectClass parent_class; diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c index dbcc1c1ed2..e562d9989f 100644 --- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c @@ -29,7 +29,6 @@ #include <misc/e-gui-utils.h> #include "addressbook/printing/e-contact-print.h" - struct _EAddressbookReflowAdapterPrivate { EAddressbookModel *model; @@ -97,7 +96,6 @@ unlink_model(EAddressbookReflowAdapter *adapter) priv->model = NULL; } - static gint text_height (PangoLayout *layout, const gchar *text) { diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h b/addressbook/gui/widgets/e-addressbook-reflow-adapter.h index fc08dcd43c..bc428ba30c 100644 --- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h +++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.h @@ -41,7 +41,6 @@ struct _EAddressbookReflowAdapter { EAddressbookReflowAdapterPrivate *priv; }; - struct _EAddressbookReflowAdapterClass { EReflowModelClass parent_class; @@ -54,7 +53,6 @@ struct _EAddressbookReflowAdapterClass { EContact *contact); }; - GType e_addressbook_reflow_adapter_get_type (void); void e_addressbook_reflow_adapter_construct (EAddressbookReflowAdapter *adapter, EAddressbookModel *model); diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c index fabf87f24f..396c382d32 100644 --- a/addressbook/gui/widgets/e-addressbook-table-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-table-adapter.c @@ -302,7 +302,6 @@ eab_table_adapter_init (GObject *object) priv->model_changed_id = 0; } - static void create_contact (EAddressbookModel *model, gint index, gint count, diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.h b/addressbook/gui/widgets/e-addressbook-table-adapter.h index d892894570..71999bd4d1 100644 --- a/addressbook/gui/widgets/e-addressbook-table-adapter.h +++ b/addressbook/gui/widgets/e-addressbook-table-adapter.h @@ -41,12 +41,10 @@ struct _EAddressbookTableAdapter { EAddressbookTableAdapterPrivate *priv; }; - struct _EAddressbookTableAdapterClass { ETableModelClass parent_class; }; - GType eab_table_adapter_get_type (void); void eab_table_adapter_construct (EAddressbookTableAdapter *adapter, EAddressbookModel *model); diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c index 52110bb169..414b760e1e 100644 --- a/addressbook/gui/widgets/e-minicard-label.c +++ b/addressbook/gui/widgets/e-minicard-label.c @@ -471,7 +471,6 @@ e_minicard_label_reflow(GnomeCanvasItem *item, gint flags) e_minicard_label->height = text_height; - g_object_get(e_minicard_label->field, "text_height", &text_height, NULL); diff --git a/addressbook/gui/widgets/e-minicard-label.h b/addressbook/gui/widgets/e-minicard-label.h index df68210473..6031b803f3 100644 --- a/addressbook/gui/widgets/e-minicard-label.h +++ b/addressbook/gui/widgets/e-minicard-label.h @@ -46,7 +46,6 @@ G_BEGIN_DECLS #define E_IS_MINICARD_LABEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MINICARD_LABEL)) #define E_IS_MINICARD_LABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MINICARD_LABEL)) - typedef struct _EMinicardLabel EMinicardLabel; typedef struct _EMinicardLabelClass EMinicardLabelClass; @@ -73,12 +72,10 @@ struct _EMinicardLabelClass void (* style_set) (EMinicardLabel *label, GtkStyle *previous_style); }; - GType e_minicard_label_get_type (void); GnomeCanvasItem *e_minicard_label_new(GnomeCanvasGroup *parent); void e_minicard_label_construct (GnomeCanvasItem *item); G_END_DECLS - #endif /* __E_MINICARD_LABEL_H__ */ diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c index df4a4c894b..5030793938 100644 --- a/addressbook/gui/widgets/e-minicard-view-widget.c +++ b/addressbook/gui/widgets/e-minicard-view-widget.c @@ -371,7 +371,6 @@ e_minicard_view_widget_style_set (GtkWidget *widget, GtkStyle *previous_style) GTK_WIDGET_CLASS(parent_class)->style_set (widget, previous_style); } - static void e_minicard_view_widget_realize (GtkWidget *widget) { diff --git a/addressbook/gui/widgets/e-minicard-view-widget.h b/addressbook/gui/widgets/e-minicard-view-widget.h index b9dcaecbf1..bf9fe8dd4e 100644 --- a/addressbook/gui/widgets/e-minicard-view-widget.h +++ b/addressbook/gui/widgets/e-minicard-view-widget.h @@ -35,7 +35,6 @@ G_BEGIN_DECLS #define E_IS_MINICARD_VIEW_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MINICARD_VIEW_WIDGET)) #define E_IS_MINICARD_VIEW_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MINICARD_VIEW_WIDGET)) - typedef struct _EMinicardViewWidget EMinicardViewWidget; typedef struct _EMinicardViewWidgetClass EMinicardViewWidgetClass; @@ -65,7 +64,6 @@ struct _EMinicardViewWidgetClass guint (*right_click) (EMinicardViewWidget *emvw); }; - GType e_minicard_view_widget_get_type (void); GtkWidget *e_minicard_view_widget_new (EAddressbookReflowAdapter *adapter); diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c index 6ee55f8b9f..d849d9fe47 100644 --- a/addressbook/gui/widgets/e-minicard-view.c +++ b/addressbook/gui/widgets/e-minicard-view.c @@ -55,7 +55,6 @@ enum { PROP_EDITABLE }; - enum { CREATE_CONTACT, CREATE_CONTACT_LIST, diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h index db8815e3a2..babfddd0c3 100644 --- a/addressbook/gui/widgets/e-minicard-view.h +++ b/addressbook/gui/widgets/e-minicard-view.h @@ -58,7 +58,6 @@ G_BEGIN_DECLS #define E_IS_MINICARD_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MINICARD_VIEW)) #define E_IS_MINICARD_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MINICARD_VIEW)) - typedef struct _EMinicardView EMinicardView; typedef struct _EMinicardViewClass EMinicardViewClass; @@ -94,7 +93,6 @@ GList *e_minicard_view_get_card_list (EMinicardView *view); void e_minicard_view_create_contact (EMinicardView *view); void e_minicard_view_create_contact_list (EMinicardView *view); - G_END_DECLS #endif /* __E_MINICARD_VIEW_H__ */ diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index a8b6554888..b47acd0938 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -300,7 +300,6 @@ set_has_cursor (EMinicard *minicard, gboolean has_cursor) minicard->has_cursor = has_cursor; } - static void e_minicard_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) { @@ -436,8 +435,6 @@ e_minicard_dispose (GObject *object) (* G_OBJECT_CLASS (parent_class)->dispose) (object); } - - static void e_minicard_finalize (GObject *object) { @@ -768,7 +765,6 @@ add_field (EMinicard *e_minicard, EContactField field, gdouble left_width) "width", e_minicard->width - 4.0, NULL ); - #ifdef notyet g_object_set(E_MINICARD_LABEL(new_item)->field, "allow_newlines", e_card_simple_get_allow_newlines (e_minicard->contact, field), @@ -788,7 +784,6 @@ add_field (EMinicard *e_minicard, EContactField field, gdouble left_width) g_free(string); } - static const gchar * get_email_location (EVCardAttribute *attr) { diff --git a/addressbook/gui/widgets/e-minicard.h b/addressbook/gui/widgets/e-minicard.h index 82cd2c6f8b..4135090763 100644 --- a/addressbook/gui/widgets/e-minicard.h +++ b/addressbook/gui/widgets/e-minicard.h @@ -46,7 +46,6 @@ G_BEGIN_DECLS #define E_IS_MINICARD(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MINICARD)) #define E_IS_MINICARD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MINICARD)) - typedef struct _EMinicard EMinicard; typedef struct _EMinicardClass EMinicardClass; typedef enum _EMinicardFocusType EMinicardFocusType; @@ -124,5 +123,4 @@ void e_minicard_activate_editor (EMinicard *minicard); G_END_DECLS - #endif /* __E_MINICARD_H__ */ diff --git a/addressbook/gui/widgets/ea-addressbook-view.h b/addressbook/gui/widgets/ea-addressbook-view.h index 4607746337..6179b6758e 100644 --- a/addressbook/gui/widgets/ea-addressbook-view.h +++ b/addressbook/gui/widgets/ea-addressbook-view.h @@ -42,7 +42,6 @@ struct _EaABView GtkAccessible parent; }; - struct _EaABViewClass { GtkAccessibleClass parent_class; @@ -53,5 +52,4 @@ AtkObject* ea_ab_view_new(GObject *obj); G_END_DECLS - #endif /* __EA_ADDRESSBOOK_VIEW_H__ */ diff --git a/addressbook/gui/widgets/ea-minicard-view.c b/addressbook/gui/widgets/ea-minicard-view.c index b35f64ae5e..07d76c3a77 100644 --- a/addressbook/gui/widgets/ea-minicard-view.c +++ b/addressbook/gui/widgets/ea-minicard-view.c @@ -34,7 +34,6 @@ static const gchar * action_name[] = { N_("New Contact List") }; - static G_CONST_RETURN gchar * ea_minicard_view_get_name (AtkObject *accessible); static G_CONST_RETURN gchar * ea_minicard_view_get_description (AtkObject *accessible); diff --git a/addressbook/gui/widgets/ea-minicard-view.h b/addressbook/gui/widgets/ea-minicard-view.h index c564dac8c8..cc8eaecae7 100644 --- a/addressbook/gui/widgets/ea-minicard-view.h +++ b/addressbook/gui/widgets/ea-minicard-view.h @@ -34,7 +34,6 @@ G_BEGIN_DECLS #define EA_IS_MINICARD_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_MINICARD_VIEW)) #define EA_IS_MINICARD_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), EA_TYPE_MINICARD_VIEW)) - typedef struct _EaMinicardView EaMinicardView; typedef struct _EaMinicardViewClass EaMinicardViewClass; @@ -43,7 +42,6 @@ struct _EaMinicardView AtkGObjectAccessible parent; }; - struct _EaMinicardViewClass { AtkGObjectAccessibleClass parent_class; @@ -55,5 +53,4 @@ AtkObject* ea_minicard_view_new(GObject *obj); G_END_DECLS - #endif /* __EA_MINICARD_VIEW_H__ */ diff --git a/addressbook/gui/widgets/ea-minicard.h b/addressbook/gui/widgets/ea-minicard.h index 879463b629..8b49ab6284 100644 --- a/addressbook/gui/widgets/ea-minicard.h +++ b/addressbook/gui/widgets/ea-minicard.h @@ -43,7 +43,6 @@ struct _EaMinicard AtkGObjectAccessible parent; }; - struct _EaMinicardClass { AtkGObjectAccessibleClass parent_class; @@ -54,5 +53,4 @@ AtkObject* ea_minicard_new(GObject *obj); G_END_DECLS - #endif /* __EA_MINICARD_H__ */ diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c index a75c06daff..d47b3e1866 100644 --- a/addressbook/gui/widgets/eab-contact-display.c +++ b/addressbook/gui/widgets/eab-contact-display.c @@ -373,7 +373,6 @@ accum_address (GString *gstr, EContact *contact, const gchar *html_label, EConta else g_string_append_printf (gstr, "<tr><td valign=\"top\" width=\"" IMAGE_COL_WIDTH "\"></td><td valign=\"top\" width=\"100\"><font color=" HEADER_COLOR ">%s:</font><br><a href=\"http://www.mapquest.com/\">%s</a></td><td valign=\"top\">", html_label, _("map")); - if (adr->po && *adr->po) g_string_append_printf (gstr, "%s<br>", adr->po); if (adr->ext && *adr->ext) g_string_append_printf (gstr, "%s<br>", adr->ext); if (adr->street && *adr->street) g_string_append_printf (gstr, "%s<br>", adr->street); @@ -413,7 +412,6 @@ accum_name_value (GString *gstr, const gchar *label, const gchar *str, const gch g_free (value); } - static void accum_attribute (GString *gstr, EContact *contact, const gchar *html_label, EContactField field, const gchar *icon, guint html_flags) { @@ -699,7 +697,6 @@ eab_contact_display_render_normal (EABContactDisplay *display, EContact *contact g_free (html); } - if (e_contact_get (contact, E_CONTACT_IS_LIST)) render_contact_list (html_stream, contact); else diff --git a/addressbook/gui/widgets/eab-contact-display.h b/addressbook/gui/widgets/eab-contact-display.h index a671b378fc..5a6902fc20 100644 --- a/addressbook/gui/widgets/eab-contact-display.h +++ b/addressbook/gui/widgets/eab-contact-display.h @@ -81,7 +81,6 @@ EABContactDisplayMode void eab_contact_display_set_mode (EABContactDisplay *display, EABContactDisplayMode mode); - G_END_DECLS #endif /* EAB_CONTACT_DISPLAY_H */ diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c index 58dc60083d..e482e3aad2 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -233,7 +233,6 @@ save_it(GtkWidget *widget, SaveAsInfo *info) gchar *uri; gint response = 0; - filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (info->filesel)); uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (info->filesel)); diff --git a/addressbook/gui/widgets/eab-gui-util.h b/addressbook/gui/widgets/eab-gui-util.h index 916aa7d555..7422eabb65 100644 --- a/addressbook/gui/widgets/eab-gui-util.h +++ b/addressbook/gui/widgets/eab-gui-util.h @@ -53,7 +53,6 @@ void eab_contact_list_save (gchar *title, GtkWidget *eab_create_image_chooser_widget (gchar *name, gchar *string1, gchar *string2, gint int1, gint int2); - ESource *eab_select_source (const gchar *title, const gchar *message, const gchar *select_uid, GtkWindow *parent); diff --git a/addressbook/gui/widgets/gal-view-factory-minicard.c b/addressbook/gui/widgets/gal-view-factory-minicard.c index 2e9accaeac..ee61207855 100644 --- a/addressbook/gui/widgets/gal-view-factory-minicard.c +++ b/addressbook/gui/widgets/gal-view-factory-minicard.c @@ -94,4 +94,3 @@ gal_view_factory_minicard_construct (GalViewFactoryMinicard *factory) return GAL_VIEW_FACTORY(factory); } - diff --git a/addressbook/importers/evolution-csv-importer.c b/addressbook/importers/evolution-csv-importer.c index 9cce21d548..6f88bb9cbd 100644 --- a/addressbook/importers/evolution-csv-importer.c +++ b/addressbook/importers/evolution-csv-importer.c @@ -221,7 +221,6 @@ static import_fields csv_fields_mozilla[] = { {"Custom 4", NOMAP}, {"Notes", NOMAP}, - }; static import_fields csv_fields_evolution[] = { @@ -829,7 +828,6 @@ csv_cancel(EImport *ei, EImportTarget *target, EImportImporter *im) { gci->state = 1; } - static EImportImporter csv_outlook_importer = { E_IMPORT_TARGET_URI, 0, diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c index 8aaad1ba33..2c8b24cac5 100644 --- a/addressbook/importers/evolution-ldif-importer.c +++ b/addressbook/importers/evolution-ldif-importer.c @@ -71,7 +71,6 @@ typedef struct { static void ldif_import_done(LDIFImporter *gci); - static struct { const gchar *ldif_attribute; EContactField contact_field; diff --git a/addressbook/importers/evolution-vcard-importer.c b/addressbook/importers/evolution-vcard-importer.c index ff6b205afa..b3b965ffa0 100644 --- a/addressbook/importers/evolution-vcard-importer.c +++ b/addressbook/importers/evolution-vcard-importer.c @@ -273,7 +273,6 @@ fix_utf16_endianness (gunichar2 *utf16) { gunichar2 *it; - if ((utf16 == NULL) || (*utf16 == '\0')) { return; } diff --git a/addressbook/tools/evolution-addressbook-export-list-cards.c b/addressbook/tools/evolution-addressbook-export-list-cards.c index 556931462a..ea3eb7a40e 100644 --- a/addressbook/tools/evolution-addressbook-export-list-cards.c +++ b/addressbook/tools/evolution-addressbook-export-list-cards.c @@ -246,7 +246,6 @@ gint output_n_cards_file (FILE * outputfile, GList *contacts, gint size, gint be static void fork_to_background (void); void set_pre_defined_field (GSList ** pre_defined_fields); - /* function declarations*/ gint e_contact_csv_get_contact_field (EContactFieldCSV csv_field) @@ -279,7 +278,6 @@ e_contact_csv_get_name (EContactFieldCSV csv_field) return quoted_name; } - gchar * e_contact_csv_get (EContact * contact, EContactFieldCSV csv_field) { @@ -398,7 +396,6 @@ e_contact_csv_get (EContact * contact, EContactFieldCSV csv_field) return quoted_field_value; } - gchar * e_contact_csv_get_header_line (GSList * csv_all_fields) { @@ -429,7 +426,6 @@ e_contact_csv_get_header_line (GSList * csv_all_fields) } - gchar * e_contact_to_csv (EContact * contact, GSList * csv_all_fields) { @@ -459,7 +455,6 @@ e_contact_to_csv (EContact * contact, GSList * csv_all_fields) } - gchar * e_contact_get_csv (EContact * contact, GSList * csv_all_fields) { @@ -469,7 +464,6 @@ e_contact_get_csv (EContact * contact, GSList * csv_all_fields) return aline; } - gchar * check_null_pointer (gchar * orig) { @@ -620,9 +614,6 @@ fork_to_background (void) #endif } - - - static void action_list_cards (GList *contacts, ActionContext * p_actctx) { @@ -642,7 +633,6 @@ action_list_cards (GList *contacts, ActionContext * p_actctx) exit (-1); } - if (p_actctx->action_list_cards.async_mode == FALSE) { /* normal mode */ if (p_actctx->action_list_cards.output_file == NULL) { @@ -667,7 +657,6 @@ action_list_cards (GList *contacts, ActionContext * p_actctx) } } - /*async mode */ else { @@ -690,7 +679,6 @@ action_list_cards (GList *contacts, ActionContext * p_actctx) exit (-1); } - if (p_actctx->action_list_cards.IsVCard == TRUE) format = CARD_FORMAT_VCARD; else @@ -706,7 +694,6 @@ action_list_cards (GList *contacts, ActionContext * p_actctx) IsFirstOne = FALSE; } - } while (series_no * size < length); g_free (file_series_name); diff --git a/addressbook/tools/evolution-addressbook-export.h b/addressbook/tools/evolution-addressbook-export.h index 1d150b3f2a..804bd50780 100644 --- a/addressbook/tools/evolution-addressbook-export.h +++ b/addressbook/tools/evolution-addressbook-export.h @@ -64,7 +64,6 @@ union _ActionContext typedef union _ActionContext ActionContext; - /* action_list_folders */ guint action_list_folders_init (ActionContext * p_actctx); diff --git a/addressbook/util/addressbook.c b/addressbook/util/addressbook.c index 45790e15c0..7caa545059 100644 --- a/addressbook/util/addressbook.c +++ b/addressbook/util/addressbook.c @@ -241,8 +241,6 @@ addressbook_authenticate (EBook *book, gboolean previous_failure, ESource *sourc g_free (uri); } - - static void auth_required_cb (EBook *book, gpointer data) { @@ -253,8 +251,6 @@ auth_required_cb (EBook *book, gpointer data) addressbook_authenticate (book, FALSE, load_source_data->source, load_source_auth_cb, load_source_data); - - } static void load_source_cb (EBook *book, EBookStatus status, gpointer closure) diff --git a/addressbook/util/eab-book-util.c b/addressbook/util/eab-book-util.c index 599486cfda..54e95e4950 100644 --- a/addressbook/util/eab-book-util.c +++ b/addressbook/util/eab-book-util.c @@ -187,7 +187,6 @@ eab_strstrcase (const gchar *haystack, const gchar *needle) return NULL; } - GList* eab_contact_list_from_string (const gchar *str) { diff --git a/calendar/common/authentication.c b/calendar/common/authentication.c index a9e2b95ea0..7b0b2e7972 100644 --- a/calendar/common/authentication.c +++ b/calendar/common/authentication.c @@ -102,7 +102,6 @@ auth_new_cal_from_default (ECalSourceType type) if (!e_cal_open_default (&ecal, type, auth_func_cb, NULL, NULL)) return NULL; - return ecal; } diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c index 668fbe9bc9..2f752e015f 100644 --- a/calendar/conduits/calendar/calendar-conduit.c +++ b/calendar/conduits/calendar/calendar-conduit.c @@ -528,7 +528,6 @@ get_default_timezone (void) key = "/apps/evolution/calendar/display/timezone"; location = gconf_client_get_string (client, key, NULL); - if (location == NULL || *location == '\0') { g_free (location); location = g_strdup ("UTC"); @@ -542,7 +541,6 @@ get_default_timezone (void) return timezone; } - static gchar * map_name (ECalConduitContext *ctxt) { @@ -1363,7 +1361,6 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit, e_cal_resolve_tzid_cb, client, timezone); - if (last == elast) { recur.until = icaltime_null_time (); recur.count = erecur->count; diff --git a/calendar/conduits/common/libecalendar-common-conduit.h b/calendar/conduits/common/libecalendar-common-conduit.h index 8110fc5094..2eeb8b2723 100644 --- a/calendar/conduits/common/libecalendar-common-conduit.h +++ b/calendar/conduits/common/libecalendar-common-conduit.h @@ -24,7 +24,6 @@ #define PILOT_MAX_CATEGORIES 16 - gint e_pilot_add_category_if_possible(gchar *cat_to_add, struct CategoryAppInfo *category); void e_pilot_local_category_to_remote(gint * pilotCategory, ECalComponent *comp, struct CategoryAppInfo *category); void e_pilot_remote_category_to_local(gint pilotCategory, ECalComponent *comp, struct CategoryAppInfo *category); diff --git a/calendar/conduits/memo/memo-conduit.c b/calendar/conduits/memo/memo-conduit.c index 48a8f59f6e..ae45e82439 100644 --- a/calendar/conduits/memo/memo-conduit.c +++ b/calendar/conduits/memo/memo-conduit.c @@ -117,7 +117,6 @@ memoconduit_load_configuration (guint32 pilot_id) GnomePilotConduitConfig *config; gchar prefix[256]; - g_snprintf (prefix, 255, "e-memo-conduit/Pilot_%u", pilot_id); c = g_new0 (EMemoConduitCfg,1); @@ -637,7 +636,6 @@ local_record_from_uid (EMemoLocalRecord *local, g_clear_error (&error); } - static ECalComponent * comp_from_remote_record (GnomePilotConduitSyncAbs *conduit, GnomePilotRecord *remote, @@ -737,7 +735,6 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit, free(txt3); } - e_cal_component_set_transparency (comp, E_CAL_COMPONENT_TRANSP_NONE); if (remote->secret) @@ -955,7 +952,6 @@ post_sync (GnomePilotConduit *conduit, return -1; } - LOG (g_message ( "post_sync: Memo Conduit v.%s", CONDUIT_VERSION )); g_free (ctxt->cfg->last_uri); diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c index d72e85fe3f..42e79d778c 100644 --- a/calendar/conduits/todo/todo-conduit.c +++ b/calendar/conduits/todo/todo-conduit.c @@ -119,7 +119,6 @@ todoconduit_load_configuration (guint32 pilot_id) GnomePilotConduitConfig *config; gchar prefix[256]; - g_snprintf (prefix, 255, "e-todo-conduit/Pilot_%u", pilot_id); c = g_new0 (EToDoConduitCfg,1); @@ -806,7 +805,6 @@ local_record_from_uid (EToDoLocalRecord *local, g_clear_error (&error); } - static ECalComponent * comp_from_remote_record (GnomePilotConduitSyncAbs *conduit, GnomePilotRecord *remote, @@ -1142,7 +1140,6 @@ post_sync (GnomePilotConduit *conduit, return -1; } - LOG (g_message ( "post_sync: ToDo Conduit v.%s", CONDUIT_VERSION )); g_free (ctxt->cfg->last_uri); diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c index 9e9aa003a4..e499e4332f 100644 --- a/calendar/gui/alarm-notify/alarm-notify-dialog.c +++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c @@ -34,8 +34,6 @@ #include "util.h" #include "e-util/e-util-private.h" - - enum { ALARM_DISPLAY_COLUMN, ALARM_SUMMARY_COLUMN, @@ -331,7 +329,6 @@ notified_alarms_dialog_new (void) g_signal_connect (G_OBJECT (an->snooze_time_hrs), "value_changed", G_CALLBACK (an_update_hrs_label), an); - na = g_new0 (AlarmNotificationsDialog, 1); na->treeview = an->treeview; @@ -340,7 +337,6 @@ notified_alarms_dialog_new (void) return na; } - /** * add_alarm_to_notified_alarms_dialog: * @na: Pointer to the dialog-info @@ -438,8 +434,6 @@ tree_selection_changed_cb (GtkTreeSelection *selection, gpointer user_data) } } - - static void fill_in_labels (AlarmNotify *an, const gchar *summary, const gchar *description, const gchar *location, time_t occur_start, time_t occur_end) diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c index e05c6e6571..62679bb2b6 100644 --- a/calendar/gui/alarm-notify/alarm-notify.c +++ b/calendar/gui/alarm-notify/alarm-notify.c @@ -53,7 +53,6 @@ static void alarm_notify_class_init (AlarmNotifyClass *klass); static void alarm_notify_init (AlarmNotify *an, AlarmNotifyClass *klass); static void alarm_notify_finalize (GObject *object); - static BonoboObjectClass *parent_class; diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c index e4aca02699..052340fbca 100644 --- a/calendar/gui/alarm-notify/alarm-queue.c +++ b/calendar/gui/alarm-notify/alarm-queue.c @@ -39,7 +39,6 @@ #include <libecal/e-cal-time-util.h> #include <libecal/e-cal-component.h> - #ifdef HAVE_LIBNOTIFY #include <libnotify/notify.h> #endif @@ -1347,8 +1346,6 @@ tray_icon_clicked_cb (GtkWidget *widget, GdkEventButton *event, gpointer user_da g_source_remove (tray_blink_id); tray_blink_id = -1; - - gtk_status_icon_set_visible (tray_icon, FALSE); g_object_unref (tray_icon); tray_icon = NULL; @@ -1409,7 +1406,6 @@ tray_icon_blink_cb (gpointer data) return tray_blink_countdown > 0; } - /* Add a new data to tray list */ static void @@ -1582,7 +1578,6 @@ popup_notification (time_t trigger, CompQueuedAlarms *cqa, e_cal_component_get_summary (comp, &text); e_cal_component_get_organizer (comp, &organiser); - if (text.value) summary = text.value; else @@ -1625,7 +1620,6 @@ popup_notification (time_t trigger, CompQueuedAlarms *cqa, g_free (time_str); g_free (str); - } #endif @@ -2059,7 +2053,6 @@ remove_comp_by_id (gpointer key, gpointer value, gpointer userdata) { return TRUE; } - /* Removes all the alarms queued for a particular calendar client */ static void remove_client_alarms (ClientAlarms *ca) diff --git a/calendar/gui/alarm-notify/alarm-queue.h b/calendar/gui/alarm-notify/alarm-queue.h index 9a2e11c472..c594e12a6b 100644 --- a/calendar/gui/alarm-notify/alarm-queue.h +++ b/calendar/gui/alarm-notify/alarm-queue.h @@ -28,12 +28,10 @@ #include <libecal/e-cal.h> - void alarm_queue_init (gpointer); void alarm_queue_done (void); void alarm_queue_add_client (ECal *client); void alarm_queue_remove_client (ECal *client, gboolean immediately); - #endif diff --git a/calendar/gui/cal-search-bar.c b/calendar/gui/cal-search-bar.c index c509561a17..c770c833f7 100644 --- a/calendar/gui/cal-search-bar.c +++ b/calendar/gui/cal-search-bar.c @@ -57,7 +57,6 @@ static ESearchBarItem calendar_search_items[] = { {NULL, -1, 0} }; - /* IDs and option items for the ESearchBar */ enum { SEARCH_SUMMARY_CONTAINS, @@ -134,7 +133,6 @@ enum { static guint cal_search_bar_signals[LAST_SIGNAL] = { 0 }; - G_DEFINE_TYPE (CalSearchBar, cal_search_bar, E_FILTER_BAR_TYPE) /* Class initialization function for the calendar search bar */ @@ -280,7 +278,6 @@ get_current_category (CalSearchBar *cal_search) return NULL; } - /* Returns a sexp for the selected category in the drop-down menu. The "All" * option is returned as (const gchar *) 1, and the "Unfiled" option is returned * as NULL. @@ -605,7 +602,6 @@ setup_category_options (CalSearchBar *cal_search, CALSearchBarItem *subitems, gi subitems[index].image = NULL; } - /* Creates the suboptions menu for the ESearchBar with the list of categories */ static void make_suboptions (CalSearchBar *cal_search) diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c index 01e4fe5439..e849bf2e0b 100644 --- a/calendar/gui/calendar-commands.c +++ b/calendar/gui/calendar-commands.c @@ -126,7 +126,6 @@ show_month_view_clicked (BonoboUIComponent *uic, gpointer data, const gchar *pat gnome_calendar_set_view (gcal, GNOME_CAL_MONTH_VIEW); } - static void show_list_view_clicked (BonoboUIComponent *uic, gpointer data, const gchar *path) { @@ -137,7 +136,6 @@ show_list_view_clicked (BonoboUIComponent *uic, gpointer data, const gchar *path gnome_calendar_set_view (gcal, GNOME_CAL_LIST_VIEW); } - static void purge_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path) { diff --git a/calendar/gui/calendar-commands.h b/calendar/gui/calendar-commands.h index b1c093fb9e..605230302e 100644 --- a/calendar/gui/calendar-commands.h +++ b/calendar/gui/calendar-commands.h @@ -41,5 +41,4 @@ void calendar_goto_today (GnomeCalendar *gcal); void calendar_command_print (GnomeCalendar *gcal, GtkPrintOperationAction action); - #endif /* CALENDAR_COMMANDS_H */ diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c index daa7e1c9a9..02bf9a0072 100644 --- a/calendar/gui/calendar-component.c +++ b/calendar/gui/calendar-component.c @@ -250,7 +250,6 @@ config_tasks_selection_changed_cb (GConfClient *client, guint id, GConfEntry *en update_task_memo_selection (data, E_CAL_SOURCE_TYPE_TODO); } - static void config_primary_tasks_selection_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data) { @@ -263,7 +262,6 @@ config_memos_selection_changed_cb (GConfClient *client, guint id, GConfEntry *en update_task_memo_selection (data, E_CAL_SOURCE_TYPE_JOURNAL); } - static void config_primary_memos_selection_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data) { @@ -631,7 +629,6 @@ view_destroyed_cb (gpointer data, GObject *where_the_object_was) } } - /* GObject methods. */ static void diff --git a/calendar/gui/calendar-component.h b/calendar/gui/calendar-component.h index 1106d8ec62..fbdd8efd23 100644 --- a/calendar/gui/calendar-component.h +++ b/calendar/gui/calendar-component.h @@ -23,20 +23,17 @@ #ifndef _CALENDAR_COMPONENT_H_ #define _CALENDAR_COMPONENT_H_ - #include <bonobo/bonobo-object.h> #include <libedataserver/e-source-list.h> #include <widgets/misc/e-activity-handler.h> #include "Evolution.h" - #define CALENDAR_TYPE_COMPONENT (calendar_component_get_type ()) #define CALENDAR_COMPONENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CALENDAR_TYPE_COMPONENT, CalendarComponent)) #define CALENDAR_COMPONENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CALENDAR_TYPE_COMPONENT, CalendarComponentClass)) #define CALENDAR_IS_COMPONENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CALENDAR_TYPE_COMPONENT)) #define CALENDAR_IS_COMPONENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), CALENDAR_TYPE_COMPONENT)) - typedef struct _CalendarComponent CalendarComponent; typedef struct _CalendarComponentPrivate CalendarComponentPrivate; typedef struct _CalendarComponentClass CalendarComponentClass; @@ -53,7 +50,6 @@ struct _CalendarComponentClass { POA_GNOME_Evolution_Component__epv epv; }; - GType calendar_component_get_type (void); #endif /* _CALENDAR_COMPONENT_H_ */ diff --git a/calendar/gui/calendar-config-keys.h b/calendar/gui/calendar-config-keys.h index b4e95c2bd7..b12b3b2b92 100644 --- a/calendar/gui/calendar-config-keys.h +++ b/calendar/gui/calendar-config-keys.h @@ -74,7 +74,6 @@ G_BEGIN_DECLS #define CALENDAR_CONFIG_MEMOS_SELECTED_MEMOS CALENDAR_CONFIG_PREFIX "/memos/selected_memos" #define CALENDAR_CONFIG_PRIMARY_MEMOS CALENDAR_CONFIG_PREFIX "/memos/primary_memos" - /* Prompt settings */ #define CALENDAR_CONFIG_PROMPT_DELETE CALENDAR_CONFIG_PREFIX "/prompts/confirm_delete" #define CALENDAR_CONFIG_PROMPT_PURGE CALENDAR_CONFIG_PREFIX "/prompts/confirm_purge" diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c index f0b492d59c..81c0675bea 100644 --- a/calendar/gui/calendar-config.c +++ b/calendar/gui/calendar-config.c @@ -239,7 +239,6 @@ calendar_config_get_24_hour_format (void) return TRUE; } - void calendar_config_set_24_hour_format (gboolean use_24_hour) { @@ -269,7 +268,6 @@ calendar_config_get_week_start_day (void) return gconf_client_get_int (config, CALENDAR_CONFIG_WEEK_START, NULL); } - void calendar_config_set_week_start_day (gint week_start_day) { @@ -299,7 +297,6 @@ calendar_config_get_day_start_hour (void) return gconf_client_get_int (config, CALENDAR_CONFIG_DAY_START_HOUR, NULL); } - void calendar_config_set_day_start_hour (gint day_start_hour) { @@ -328,7 +325,6 @@ calendar_config_get_day_start_minute (void) return gconf_client_get_int (config, CALENDAR_CONFIG_DAY_START_MINUTE, NULL); } - void calendar_config_set_day_start_minute (gint day_start_min) { @@ -357,7 +353,6 @@ calendar_config_get_day_end_hour (void) return gconf_client_get_int (config, CALENDAR_CONFIG_DAY_END_HOUR, NULL); } - void calendar_config_set_day_end_hour (gint day_end_hour) { @@ -386,7 +381,6 @@ calendar_config_get_day_end_minute (void) return gconf_client_get_int (config, CALENDAR_CONFIG_DAY_END_MINUTE, NULL); } - void calendar_config_set_day_end_minute (gint day_end_min) { @@ -416,7 +410,6 @@ calendar_config_get_time_divisions (void) return gconf_client_get_int (config, CALENDAR_CONFIG_TIME_DIVISIONS, NULL); } - void calendar_config_set_time_divisions (gint divisions) { @@ -487,7 +480,6 @@ calendar_config_get_marcus_bains (gboolean *show_line, const gchar **dayview_col *timebar_color = tcolor; } - void calendar_config_add_notification_marcus_bains (GConfClientNotifyFunc func, gpointer data, gint *not_show, gint *not_dcolor, gint *not_tcolor) { @@ -507,7 +499,6 @@ calendar_config_get_dview_show_week_no (void) return gconf_client_get_bool (config, CALENDAR_CONFIG_DV_WEEK_NUMBER, NULL); } - void calendar_config_set_dview_show_week_no (gboolean show_week_no) { @@ -537,7 +528,6 @@ calendar_config_get_dnav_show_week_no (void) return gconf_client_get_bool (config, CALENDAR_CONFIG_DN_SHOW_WEEK_NUMBERS, NULL); } - void calendar_config_set_dnav_show_week_no (gboolean show_week_no) { @@ -567,7 +557,6 @@ calendar_config_get_hpane_pos (void) return gconf_client_get_int (config, CALENDAR_CONFIG_HPANE_POS, NULL); } - void calendar_config_set_hpane_pos (gint hpane_pos) { @@ -576,7 +565,6 @@ calendar_config_set_hpane_pos (gint hpane_pos) gconf_client_set_int (config, CALENDAR_CONFIG_HPANE_POS, hpane_pos, NULL); } - gint calendar_config_get_vpane_pos (void) { @@ -585,7 +573,6 @@ calendar_config_get_vpane_pos (void) return gconf_client_get_int (config, CALENDAR_CONFIG_VPANE_POS, NULL); } - void calendar_config_set_vpane_pos (gint vpane_pos) { @@ -602,7 +589,6 @@ calendar_config_get_preview_state (void) return gconf_client_get_bool (config, CALENDAR_CONFIG_TASK_PREVIEW, NULL); } - void calendar_config_set_preview_state (gboolean state) { @@ -631,7 +617,6 @@ calendar_config_get_month_hpane_pos (void) return gconf_client_get_int (config, CALENDAR_CONFIG_MONTH_HPANE_POS, NULL); } - void calendar_config_set_month_hpane_pos (gint hpane_pos) { @@ -640,7 +625,6 @@ calendar_config_set_month_hpane_pos (gint hpane_pos) gconf_client_set_int (config, CALENDAR_CONFIG_MONTH_HPANE_POS, hpane_pos, NULL); } - gint calendar_config_get_month_vpane_pos (void) { @@ -649,7 +633,6 @@ calendar_config_get_month_vpane_pos (void) return gconf_client_get_int (config, CALENDAR_CONFIG_MONTH_VPANE_POS, NULL); } - void calendar_config_set_month_vpane_pos (gint vpane_pos) { @@ -666,7 +649,6 @@ calendar_config_get_tag_vpane_pos (void) return gconf_client_get_float (config, CALENDAR_CONFIG_TAG_VPANE_POS, NULL); } - void calendar_config_set_tag_vpane_pos (gfloat vpane_pos) { @@ -721,7 +703,6 @@ calendar_config_set_primary_tasks (const gchar *primary_uid) gconf_client_set_string (config, CALENDAR_CONFIG_PRIMARY_TASKS, primary_uid, NULL); } - guint calendar_config_add_notification_primary_tasks (GConfClientNotifyFunc func, gpointer data) { @@ -742,7 +723,6 @@ calendar_config_get_task_vpane_pos (void) return gconf_client_get_int (config, CALENDAR_CONFIG_TASK_VPANE_POS, NULL); } - void calendar_config_set_task_vpane_pos (gint vpane_pos) { @@ -799,7 +779,6 @@ calendar_config_set_primary_memos (const gchar *primary_uid) gconf_client_set_string (config, CALENDAR_CONFIG_PRIMARY_MEMOS, primary_uid, NULL); } - guint calendar_config_add_notification_primary_memos (GConfClientNotifyFunc func, gpointer data) { @@ -822,7 +801,6 @@ calendar_config_get_compress_weekend (void) return gconf_client_get_bool (config, CALENDAR_CONFIG_COMPRESS_WEEKEND, NULL); } - void calendar_config_set_compress_weekend (gboolean compress) { @@ -852,7 +830,6 @@ calendar_config_get_show_event_end (void) return gconf_client_get_bool (config, CALENDAR_CONFIG_SHOW_EVENT_END, NULL); } - void calendar_config_set_show_event_end (gboolean show_end) { @@ -882,7 +859,6 @@ calendar_config_get_working_days (void) return gconf_client_get_int (config, CALENDAR_CONFIG_WORKING_DAYS, NULL); } - void calendar_config_set_working_days (CalWeekdays days) { @@ -912,7 +888,6 @@ calendar_config_get_hide_completed_tasks (void) return gconf_client_get_bool (config, CALENDAR_CONFIG_TASKS_HIDE_COMPLETED, NULL); } - void calendar_config_set_hide_completed_tasks (gboolean hide) { @@ -955,7 +930,6 @@ calendar_config_get_hide_completed_tasks_units (void) return cu; } - void calendar_config_set_hide_completed_tasks_units (CalUnits cu) { @@ -999,7 +973,6 @@ calendar_config_get_hide_completed_tasks_value (void) return gconf_client_get_int (config, CALENDAR_CONFIG_TASKS_HIDE_COMPLETED_VALUE, NULL); } - void calendar_config_set_hide_completed_tasks_value (gint value) { @@ -1082,7 +1055,6 @@ calendar_config_set_confirm_purge (gboolean confirm) gconf_client_set_bool (config, CALENDAR_CONFIG_PROMPT_PURGE, confirm, NULL); } - /** * calendar_config_get_tasks_due_today_color: * @color: the location to store the color diff --git a/calendar/gui/calendar-config.h b/calendar/gui/calendar-config.h index adcf2c0c37..3341b66163 100644 --- a/calendar/gui/calendar-config.h +++ b/calendar/gui/calendar-config.h @@ -47,7 +47,6 @@ typedef enum CAL_SATURDAY = 1 << 6 } CalWeekdays; - /* Units for settings. */ typedef enum { @@ -56,7 +55,6 @@ typedef enum CAL_MINUTES } CalUnits; - void calendar_config_remove_notification (guint id); /* @@ -170,7 +168,6 @@ guint calendar_config_add_notification_primary_tasks (GConfClientNotifyFunc fu gint calendar_config_get_task_vpane_pos (void); void calendar_config_set_task_vpane_pos (gint vpane_pos); - /* The current list of memo lists selected */ GSList *calendar_config_get_memos_selected (void); void calendar_config_set_memos_selected (GSList *selected); diff --git a/calendar/gui/comp-util.c b/calendar/gui/comp-util.c index cb3cf95def..30af43fd6d 100644 --- a/calendar/gui/comp-util.c +++ b/calendar/gui/comp-util.c @@ -66,8 +66,6 @@ cal_comp_util_add_exdate (ECalComponent *comp, time_t t, icaltimezone *zone) e_cal_component_free_exdate_list (list); } - - /* Returns TRUE if the TZIDs are equivalent, i.e. both NULL or the same. */ static gboolean e_cal_component_compare_tzid (const gchar *tzid1, const gchar *tzid2) diff --git a/calendar/gui/comp-util.h b/calendar/gui/comp-util.h index de6595672f..d46fcb79e2 100644 --- a/calendar/gui/comp-util.h +++ b/calendar/gui/comp-util.h @@ -31,7 +31,6 @@ void cal_comp_util_add_exdate (ECalComponent *comp, time_t t, icaltimezone *zone); - /* Returns TRUE if the component uses the given timezone for both DTSTART and DTEND, or if the UTC offsets of the start and end times are the same as in the given zone. */ diff --git a/calendar/gui/dialogs/cal-attachment-select-file.c b/calendar/gui/dialogs/cal-attachment-select-file.c index b33753c42e..b303a763ce 100644 --- a/calendar/gui/dialogs/cal-attachment-select-file.c +++ b/calendar/gui/dialogs/cal-attachment-select-file.c @@ -25,7 +25,6 @@ * specific to the calendar component have been flagged by some comments * fwiw */ - #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c index b7b6e33fcf..09f6d104b6 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.c +++ b/calendar/gui/dialogs/cal-prefs-dialog.c @@ -59,8 +59,6 @@ static GtkVBoxClass *parent_class = NULL; GtkWidget *cal_prefs_dialog_create_time_edit (void); - - static void calendar_prefs_dialog_finalize (GObject *obj) { @@ -565,7 +563,6 @@ setup_changes (CalendarPrefsDialog *prefs) g_signal_connect (G_OBJECT (prefs->notify_with_tray), "toggled", G_CALLBACK (notify_with_tray_toggled), prefs); g_signal_connect (G_OBJECT (prefs->alarm_list_widget), "selection_changed", G_CALLBACK (alarms_selection_changed), prefs); - g_signal_connect (G_OBJECT (prefs->template_url), "changed", G_CALLBACK (template_url_changed), prefs); } @@ -703,7 +700,6 @@ show_config (CalendarPrefsDialog *prefs) gtk_widget_set_sensitive (prefs->use_12_hour, sensitive); gtk_widget_set_sensitive (prefs->use_24_hour, sensitive); - /* Time Divisions. */ time_divisions = calendar_config_get_time_divisions (); e_dialog_combo_box_set (prefs->time_divisions, time_divisions, time_division_map); @@ -860,7 +856,6 @@ calendar_prefs_dialog_construct (CalendarPrefsDialog *prefs, prefs->tasks_hide_completed_interval = glade_xml_get_widget (gui, "tasks_hide_completed_interval"); prefs->tasks_hide_completed_units = glade_xml_get_widget (gui, "tasks_hide_completed_units"); - /* Alarms tab */ prefs->notify_with_tray = glade_xml_get_widget (gui, "notify_with_tray"); prefs->scrolled_window = glade_xml_get_widget (gui, "calendar-source-scrolled-window"); diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c index e9661db372..e330a7f9d4 100644 --- a/calendar/gui/dialogs/comp-editor-util.c +++ b/calendar/gui/dialogs/comp-editor-util.c @@ -81,7 +81,6 @@ comp_editor_dates (CompEditorPageDates *dates, ECalComponent *comp) e_cal_component_get_completed (comp, &dates->complete); } - /* This frees the dates in the CompEditorPageDates struct. But it doesn't free * the struct (as that is usually static). */ @@ -109,7 +108,6 @@ comp_editor_free_dates (CompEditorPageDates *dates) e_cal_component_free_icaltimetype (dates->complete); } - /* dtstart is only passed in if tt is the dtend. */ static void write_label_piece (struct icaltimetype *tt, @@ -249,7 +247,6 @@ comp_editor_new_date_edit (gboolean show_date, gboolean show_time, return GTK_WIDGET (dedit); } - /* Returns the current time, for EDateEdit widgets and ECalendar items in the dialogs. FIXME: Should probably use the timezone from somewhere in the component @@ -278,8 +275,6 @@ comp_editor_get_current_time (GtkObject *object, gpointer data) return tmp_tm; } - - /** * comp_editor_strip_categories: * @categories: A string of category names entered by the user. diff --git a/calendar/gui/dialogs/comp-editor-util.h b/calendar/gui/dialogs/comp-editor-util.h index 3bf8921291..c2b5a052a3 100644 --- a/calendar/gui/dialogs/comp-editor-util.h +++ b/calendar/gui/dialogs/comp-editor-util.h @@ -38,7 +38,6 @@ GtkWidget *comp_editor_new_date_edit (gboolean show_date, gboolean show_time, struct tm comp_editor_get_current_time (GtkObject *object, gpointer data); - gchar *comp_editor_strip_categories (const gchar *categories); #endif diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 64f80b4557..3ed798a6f0 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -448,7 +448,6 @@ save_comp (CompEditor *editor) if (e_cal_component_has_recurrences (priv->comp) && priv->mod == CALOBJ_MOD_ALL) comp_util_sanitize_recurrence_master (priv->comp, priv->client); - if (priv->mod == CALOBJ_MOD_THIS) { e_cal_component_set_rdate_list (priv->comp, NULL); e_cal_component_set_rrule_list (priv->comp, NULL); @@ -1813,7 +1812,6 @@ comp_editor_show_help (CompEditor *editor) e_display_help (GTK_WINDOW (editor), class->help_section); } - /* Closes the dialog box and emits the appropriate signals */ static void close_dialog (CompEditor *editor) @@ -2654,7 +2652,6 @@ real_send_comp (CompEditor *editor, ECalComponentItipMethod method, gboolean str } - /** * comp_editor_edit_comp: * @editor: A component editor @@ -2791,7 +2788,6 @@ comp_editor_close (CompEditor *editor) return close; } - /* Utility function to get the mime-attachment list from the attachment * bar for sending the comp via itip. The list and its contents must * be freed by the caller. diff --git a/calendar/gui/dialogs/comp-editor.h b/calendar/gui/dialogs/comp-editor.h index 6a8f8e4f93..6753635b1a 100644 --- a/calendar/gui/dialogs/comp-editor.h +++ b/calendar/gui/dialogs/comp-editor.h @@ -138,7 +138,6 @@ gboolean comp_editor_send_comp (CompEditor *editor, GSList * comp_editor_get_mime_attach_list(CompEditor *editor); gboolean comp_editor_close (CompEditor *editor); - void comp_editor_sensitize_attachment_bar (CompEditor *editor, gboolean set); diff --git a/calendar/gui/dialogs/e-delegate-dialog.c b/calendar/gui/dialogs/e-delegate-dialog.c index 87fb164e6a..284076a7bc 100644 --- a/calendar/gui/dialogs/e-delegate-dialog.c +++ b/calendar/gui/dialogs/e-delegate-dialog.c @@ -114,7 +114,6 @@ e_delegate_dialog_finalize (GObject *object) (* G_OBJECT_CLASS (e_delegate_dialog_parent_class)->finalize) (object); } - EDelegateDialog * e_delegate_dialog_construct (EDelegateDialog *edd, const gchar *name, const gchar *address) { @@ -273,7 +272,6 @@ e_delegate_dialog_get_delegate (EDelegateDialog *edd) return g_strdup (priv->address); } - gchar * e_delegate_dialog_get_delegate_name (EDelegateDialog *edd) { diff --git a/calendar/gui/dialogs/e-delegate-dialog.h b/calendar/gui/dialogs/e-delegate-dialog.h index 6ff872e7e4..a70488a0ea 100644 --- a/calendar/gui/dialogs/e-delegate-dialog.h +++ b/calendar/gui/dialogs/e-delegate-dialog.h @@ -35,7 +35,6 @@ #define E_IS_DELEGATE_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_DELEGATE_DIALOG)) #define E_IS_DELEGATE_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_DELEGATE_DIALOG)) - typedef struct _EDelegateDialog EDelegateDialog; typedef struct _EDelegateDialogClass EDelegateDialogClass; typedef struct _EDelegateDialogPrivate EDelegateDialogPrivate; @@ -69,7 +68,6 @@ void e_delegate_dialog_set_delegate (EDelegateDialog *etd, GtkWidget* e_delegate_dialog_get_toplevel (EDelegateDialog *etd); - #endif /* __E_DELEGATE_DIALOG_H__ */ diff --git a/calendar/gui/dialogs/e-send-options-utils.c b/calendar/gui/dialogs/e-send-options-utils.c index 87f4584133..c4ed13f2cb 100644 --- a/calendar/gui/dialogs/e-send-options-utils.c +++ b/calendar/gui/dialogs/e-send-options-utils.c @@ -208,7 +208,6 @@ e_sendoptions_utils_fill_component (ESendOptionsDialog *sod, ECalComponent *comp icalproperty_set_x_name (prop, "X-EVOLUTION-OPTIONS-TRACKINFO"); icalcomponent_add_property (icalcomp, prop); - prop = icalproperty_new_x ((const gchar *) g_strdup_printf ("%d", sopts->opened)); icalproperty_set_x_name (prop, "X-EVOLUTION-OPTIONS-OPENED"); icalcomponent_add_property (icalcomp, prop); diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index 29e5e1da76..a133904b65 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -1273,7 +1273,6 @@ event_page_fill_component (CompEditorPage *page, ECalComponent *comp) e_cal_component_set_dtstart (comp, &start_date); e_cal_component_set_dtend (comp, &end_date); - /* Categories */ cat = e_dialog_editable_get (priv->categories); @@ -1457,7 +1456,6 @@ event_page_fill_component (CompEditorPage *page, ECalComponent *comp) return FALSE; } - if (flags & COMP_EDITOR_DELEGATE) { GSList *attendee_list, *l; gint i; @@ -1985,7 +1983,6 @@ list_view_event (EMeetingListView *list_view, GdkEvent *event, EventPage *epage) return FALSE; } - static gboolean list_key_press (EMeetingListView *list_view, GdkEventKey *event, EventPage *epage) { @@ -2259,7 +2256,6 @@ get_widgets (EventPage *epage) gtk_container_add (GTK_CONTAINER (sw), GTK_WIDGET (priv->list_view)); gtk_box_pack_start (GTK_BOX (priv->list_box), sw, TRUE, TRUE, 0); - /* Glade's visibility flag doesn't seem to work for custom widgets */ priv->start_time = GW ("start-time"); gtk_widget_show (priv->start_time); @@ -2306,7 +2302,6 @@ summary_changed_cb (GtkEditable *editable, g_free (summary); } - /* Note that this assumes that the start_tt and end_tt passed to it are the dates visible to the user. For DATE values, we have to add 1 day to the end_tt before emitting the signal. */ @@ -2347,7 +2342,6 @@ notify_dates_changed (EventPage *epage, struct icaltimetype *start_tt, &dates); } - static gboolean check_start_before_end (struct icaltimetype *start_tt, icaltimezone *start_zone, @@ -2385,7 +2379,6 @@ check_start_before_end (struct icaltimetype *start_tt, return FALSE; } - /* * This is called whenever the start or end dates or timezones is changed. * It makes sure that the start date < end date. It also emits the notification @@ -2463,7 +2456,6 @@ times_updated (EventPage *epage, gboolean adjust_end_time) } } - if (set_start_date) { g_signal_handlers_block_matched (priv->start_time, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, epage); e_date_edit_set_date (E_DATE_EDIT (priv->start_time), @@ -2829,7 +2821,6 @@ init_widgets (EventPage *epage) g_signal_connect((priv->summary), "changed", G_CALLBACK (summary_changed_cb), epage); - /* Description */ text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->description)); diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c index 4254dce774..fd218a8ec1 100644 --- a/calendar/gui/dialogs/memo-page.c +++ b/calendar/gui/dialogs/memo-page.c @@ -389,7 +389,6 @@ get_recipients (ECalComponent *comp) return ""; } - static gboolean fill_comp_with_recipients (ENameSelector *name_selector, ECalComponent *comp) { diff --git a/calendar/gui/dialogs/recur-comp.c b/calendar/gui/dialogs/recur-comp.c index 1323755cb1..0d9197546b 100644 --- a/calendar/gui/dialogs/recur-comp.c +++ b/calendar/gui/dialogs/recur-comp.c @@ -68,7 +68,6 @@ recur_component_dialog (ECal *client, return FALSE; } - dialog = gtk_message_dialog_new (parent, 0, GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL, "%s", str); g_free (str); gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE); diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c index 5fbf69df74..092a44db15 100644 --- a/calendar/gui/dialogs/recurrence-page.c +++ b/calendar/gui/dialogs/recurrence-page.c @@ -2387,7 +2387,6 @@ recurrence_page_new (CompEditor *editor) return rpage; } - GtkWidget *make_exdate_date_edit (void); GtkWidget * diff --git a/calendar/gui/dialogs/schedule-page.c b/calendar/gui/dialogs/schedule-page.c index c85ccbb4fe..712d2708b9 100644 --- a/calendar/gui/dialogs/schedule-page.c +++ b/calendar/gui/dialogs/schedule-page.c @@ -242,7 +242,6 @@ update_time (SchedulePage *spage, ECalComponentDateTime *start_date, ECalCompone } - /* Fills the widgets with default values */ static void clear_widgets (SchedulePage *spage) diff --git a/calendar/gui/dialogs/schedule-page.h b/calendar/gui/dialogs/schedule-page.h index 71eec02763..59b97c754f 100644 --- a/calendar/gui/dialogs/schedule-page.h +++ b/calendar/gui/dialogs/schedule-page.h @@ -64,7 +64,6 @@ struct _SchedulePageClass { CompEditorPageClass parent_class; }; - GType schedule_page_get_type (void); SchedulePage * schedule_page_construct (SchedulePage *mpage, EMeetingStore *ems); diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c index eeacc0774f..e6104ee2d0 100644 --- a/calendar/gui/dialogs/task-details-page.c +++ b/calendar/gui/dialogs/task-details-page.c @@ -168,7 +168,6 @@ task_details_page_focus_main_widget (CompEditorPage *page) gtk_widget_grab_focus (priv->status_combo); } - static TaskEditorPriority priority_value_to_index (gint priority_value) { @@ -492,7 +491,6 @@ get_widgets (TaskDetailsPage *tdpage) && priv->url); } - static void complete_date_changed (TaskDetailsPage *tdpage, time_t ctime, gboolean complete) { diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c index c74ed46db3..2829def666 100644 --- a/calendar/gui/dialogs/task-editor.c +++ b/calendar/gui/dialogs/task-editor.c @@ -437,7 +437,6 @@ task_editor_edit_comp (CompEditor *editor, ECalComponent *comp) e_meeting_attendee_set_edit_level (ia, E_MEETING_ATTENDEE_EDIT_NONE); } - comp_editor_set_group_item (editor, TRUE); priv->assignment_shown = TRUE; } diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c index 3cdbe344e9..8a273c2944 100644 --- a/calendar/gui/dialogs/task-page.c +++ b/calendar/gui/dialogs/task-page.c @@ -910,7 +910,6 @@ task_page_fill_component (CompEditorPage *page, ECalComponent *comp) return FALSE; } - if (flags & COMP_EDITOR_DELEGATE ) { GSList *attendee_list, *l; gint i; @@ -982,7 +981,6 @@ static void edit_clicked_cb (GtkButton *btn, TaskPage *tpage) gtk_tree_path_free (path); } - static gboolean existing_attendee (EMeetingAttendee *ia, ECalComponent *comp) { @@ -1296,7 +1294,6 @@ list_view_event (EMeetingListView *list_view, GdkEvent *event, TaskPage *page) { return FALSE; } - static gboolean list_key_press (EMeetingListView *list_view, GdkEventKey *event, TaskPage *page) { @@ -1684,7 +1681,6 @@ times_updated (TaskPage *tpage, gboolean adjust_end_time) set_start_date = TRUE; } - if (set_start_date) { g_signal_handlers_block_matched (priv->start_date, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, tpage); e_date_edit_set_date (E_DATE_EDIT (priv->start_date), start_tt.year, start_tt.month, start_tt.day); diff --git a/calendar/gui/e-cal-component-preview.c b/calendar/gui/e-cal-component-preview.c index 4340f9cdd8..0374e1f093 100644 --- a/calendar/gui/e-cal-component-preview.c +++ b/calendar/gui/e-cal-component-preview.c @@ -92,7 +92,6 @@ timet_to_str_with_zone (ECalComponentDateTime *dt, zone = NULL; } - itt = *dt->value; if (zone) icaltimezone_convert_time (&itt, zone, default_zone); diff --git a/calendar/gui/e-cal-component-preview.h b/calendar/gui/e-cal-component-preview.h index 053c3c8266..8b2b0acd18 100644 --- a/calendar/gui/e-cal-component-preview.h +++ b/calendar/gui/e-cal-component-preview.h @@ -65,7 +65,6 @@ struct _ECalComponentPreviewClass { void (* selection_changed) (ECalComponentPreview *preview, gint n_selected); }; - GType e_cal_component_preview_get_type(void); GtkWidget * e_cal_component_preview_new (void); icaltimezone * e_cal_component_preview_get_default_timezone diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c index 26edef8bcd..65a8ec5f9d 100644 --- a/calendar/gui/e-cal-list-view.c +++ b/calendar/gui/e-cal-list-view.c @@ -384,7 +384,6 @@ find_meeting (icalcomponent *icalcomp) return prop ? TRUE: FALSE; } - static gboolean e_cal_list_view_on_table_double_click (GtkWidget *table, gint row, gint col, GdkEvent *event, gpointer data) diff --git a/calendar/gui/e-cal-list-view.h b/calendar/gui/e-cal-list-view.h index 656a58261b..df5b3dbeab 100644 --- a/calendar/gui/e-cal-list-view.h +++ b/calendar/gui/e-cal-list-view.h @@ -40,7 +40,6 @@ G_BEGIN_DECLS #define E_CAL_LIST_VIEW_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, e_cal_list_view_get_type (), ECalListViewClass) #define E_IS_CAL_LIST_VIEW(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, e_cal_list_view_get_type ()) - typedef struct _ECalListView ECalListView; typedef struct _ECalListViewClass ECalListViewClass; @@ -72,7 +71,6 @@ struct _ECalListViewClass ECalendarViewClass parent_class; }; - GType e_cal_list_view_get_type (void); GtkWidget *e_cal_list_view_construct (ECalListView *cal_list_view); @@ -83,7 +81,6 @@ void e_cal_list_view_save_state (ECalListView *cal_list_view, gchar *filename); gboolean e_cal_list_view_get_range_shown (ECalListView *cal_list_view, GDate *start_date, gint *days_shown); - G_END_DECLS #endif /* _E_CAL_LIST_VIEW_H_ */ diff --git a/calendar/gui/e-cal-model-memos.c b/calendar/gui/e-cal-model-memos.c index 995ed9c5cb..0bb086b4f2 100644 --- a/calendar/gui/e-cal-model-memos.c +++ b/calendar/gui/e-cal-model-memos.c @@ -135,7 +135,6 @@ ecmm_value_at (ETableModel *etm, gint col, gint row) return (gpointer) ""; } - static void ecmm_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer value) { diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c index 5a0a75bea2..acf3175765 100644 --- a/calendar/gui/e-cal-model-tasks.c +++ b/calendar/gui/e-cal-model-tasks.c @@ -199,7 +199,6 @@ ensure_task_partially_complete (ECalModelComponent *comp_data) icalcomponent_add_property (comp_data->icalcomp, icalproperty_new_status (ICAL_STATUS_INPROCESS)); } - /* This makes sure a task is marked as incomplete. It clears the "Date Completed" property. If the percent is set to 100 it removes it, and if the status is "Completed" it sets it to "Needs Action". @@ -410,7 +409,6 @@ typedef enum { E_CAL_MODEL_TASKS_DUE_COMPLETE } ECalModelTasksDueStatus; - static ECalModelTasksDueStatus get_due_status (ECalModelTasks *model, ECalModelComponent *comp_data) { diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c index 672375c5f8..0ddcc20d07 100644 --- a/calendar/gui/e-cal-model.c +++ b/calendar/gui/e-cal-model.c @@ -257,7 +257,6 @@ e_cal_model_dispose (GObject *object) priv->clients = g_list_remove (priv->clients, client_data); - g_object_unref (client_data->client); if (client_data->query) g_object_unref (client_data->query); @@ -1798,7 +1797,6 @@ cal_opened_cb (ECal *client, ECalendarStatus status, gpointer user_data) update_e_cal_view_for_client (model, client_data); } - static ECalModelClient * add_new_client (ECalModel *model, ECal *client, gboolean do_query) { @@ -2318,7 +2316,6 @@ copy_ecdv (ECellDateEditValue *ecdv) return new_ecdv; } */ - struct _ECalModelComponentPrivate { gchar nouse; }; @@ -2340,7 +2337,6 @@ e_cal_model_component_class_init (ECalModelComponentClass *klass) object_class->finalize = e_cal_model_component_finalize; } - static void e_cal_model_component_finalize (GObject *object) { diff --git a/calendar/gui/e-cal-popup.c b/calendar/gui/e-cal-popup.c index d6bf0ed4c5..cdbce07ac7 100644 --- a/calendar/gui/e-cal-popup.c +++ b/calendar/gui/e-cal-popup.c @@ -315,8 +315,6 @@ e_cal_popup_target_new_select(ECalPopup *eabp, struct _ECalModel *model, GPtrArr if (!read_only) mask &= ~E_CAL_POPUP_SELECT_EDITABLE; - - if (!e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_NO_TASK_ASSIGNMENT) && !e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_NO_CONV_TO_ASSIGN_TASK)) mask &= ~E_CAL_POPUP_SELECT_ASSIGNABLE; diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c index 7771be234f..3d08d7850f 100644 --- a/calendar/gui/e-calendar-table.c +++ b/calendar/gui/e-calendar-table.c @@ -644,7 +644,6 @@ calendar_table_constructed (GObject *object) e_table_extras_add_cell (extras, "calstring", cell); - /* * Date fields. */ @@ -1000,7 +999,6 @@ e_calendar_table_get_model (ECalendarTable *cal_table) return cal_table->priv->model; } - /** * e_calendar_table_get_table: * @cal_table: A calendar table. @@ -1581,7 +1579,6 @@ e_calendar_table_load_state (ECalendarTable *cal_table, e_table_load_state (table, filename); } - /* Saves the state of the table (headers shown etc.) to the given file. */ void e_calendar_table_save_state (ECalendarTable *cal_table, diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index 82b4704da2..af99121433 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -73,7 +73,6 @@ static void e_calendar_view_get_property (GObject *object, guint property_id, GV static void e_calendar_view_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec); static void e_calendar_view_destroy (GtkObject *object); - /* Property IDs */ enum props { PROP_0, @@ -253,7 +252,6 @@ e_calendar_view_class_init (ECalendarViewClass *klass) #endif } - void e_calendar_view_add_event (ECalendarView *cal_view, ECal *client, time_t dtstart, icaltimezone *default_zone, icalcomponent *icalcomp, gboolean in_top_canvas) @@ -1150,13 +1148,11 @@ e_calendar_view_delete_selected_occurrence (ECalendarView *cal_view) } else zone = e_calendar_view_get_timezone (cal_view); - if (is_instance) rid = e_cal_component_get_recurid_as_string (comp); e_cal_component_free_datetime (&dt); - if ((itip_organizer_is_user (comp, event->comp_data->client) || itip_sentby_is_user (comp, event->comp_data->client)) && cancel_component_dialog ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (cal_view)), event->comp_data->client, @@ -1346,7 +1342,6 @@ transfer_item_to (ECalendarViewEvent *event, ECal *dest_client, gboolean remove_ if (e_cal_get_object (dest_client, uid, NULL, &orig_icalcomp, NULL)) { icalcomponent_free (orig_icalcomp); - if (!e_cal_modify_object (dest_client, event->comp_data->icalcomp, CALOBJ_MOD_ALL, NULL)) return; } else { @@ -1503,7 +1498,6 @@ set_attendee_status_for_delegate (icalcomponent *icalcomp, ECal *client) address = itip_get_comp_attendee (comp, client); - for (prop = icalcomponent_get_first_property (icalcomp, ICAL_ATTENDEE_PROPERTY); prop; prop = icalcomponent_get_next_property (icalcomp, ICAL_ATTENDEE_PROPERTY)) { @@ -1544,7 +1538,6 @@ set_attendee_status_for_delegate (icalcomponent *icalcomp, ECal *client) g_free (temp); } - g_free (address); g_object_unref (comp); } @@ -1673,7 +1666,6 @@ on_unrecur_appointment (EPopup *ep, EPopupItem *pitem, gpointer data) e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp)); id = e_cal_component_get_id (comp); - /* For the unrecurred instance we duplicate the original object, create a new uid for it, get rid of the recurrence rules, and set the start & end times to the instances times. */ @@ -2069,7 +2061,6 @@ e_calendar_view_edit_appointment (ECalendarView *cal_view, g_object_unref (comp); } - e_calendar_view_open_event_with_flags (cal_view, client, icalcomp, flags); } diff --git a/calendar/gui/e-cell-date-edit-text.c b/calendar/gui/e-cell-date-edit-text.c index efe251aa0f..64dd48ddf1 100644 --- a/calendar/gui/e-cell-date-edit-text.c +++ b/calendar/gui/e-cell-date-edit-text.c @@ -48,7 +48,6 @@ e_cell_date_edit_text_set_timezone (ECellDateEditText *ecd, ecd->zone = zone; } - void e_cell_date_edit_text_set_use_24_hour_format (ECellDateEditText *ecd, gboolean use_24_hour) @@ -58,7 +57,6 @@ e_cell_date_edit_text_set_use_24_hour_format (ECellDateEditText *ecd, ecd->use_24_hour_format = use_24_hour; } - static gchar * ecd_get_text (ECellText *cell, ETableModel *model, gint col, gint row) { @@ -82,14 +80,12 @@ ecd_get_text (ECellText *cell, ETableModel *model, gint col, gint row) return g_strdup (buffer); } - static void ecd_free_text (ECellText *cell, gchar *text) { g_free (text); } - /* FIXME: We need to set the "transient_for" property for the dialog. */ static void show_date_warning (ECellDateEditText *ecd) @@ -123,7 +119,6 @@ show_date_warning (ECellDateEditText *ecd) gtk_widget_destroy (dialog); } - static void ecd_set_value (ECellText *cell, ETableModel *model, gint col, gint row, const gchar *text) @@ -176,7 +171,6 @@ ecd_set_value (ECellText *cell, ETableModel *model, gint col, gint row, e_table_model_set_value_at (model, col, row, value); } - static void e_cell_date_edit_text_class_init (ECellDateEditTextClass *ecdet) { @@ -187,7 +181,6 @@ e_cell_date_edit_text_class_init (ECellDateEditTextClass *ecdet) ectc->set_value = ecd_set_value; } - static void e_cell_date_edit_text_init (ECellDateEditText *ecd) { @@ -195,7 +188,6 @@ e_cell_date_edit_text_init (ECellDateEditText *ecd) ecd->use_24_hour_format = TRUE; } - /** * e_cell_date_edit_text_new: * diff --git a/calendar/gui/e-cell-date-edit-text.h b/calendar/gui/e-cell-date-edit-text.h index 0f557afade..5dc1f0c4bd 100644 --- a/calendar/gui/e-cell-date-edit-text.h +++ b/calendar/gui/e-cell-date-edit-text.h @@ -59,7 +59,6 @@ GType e_cell_date_edit_text_get_type (void); ECell *e_cell_date_edit_text_new (const gchar *fontname, GtkJustification justify); - void e_cell_date_edit_text_set_timezone (ECellDateEditText *ecd, icaltimezone *zone); void e_cell_date_edit_text_set_use_24_hour_format (ECellDateEditText *ecd, diff --git a/calendar/gui/e-comp-editor-registry.h b/calendar/gui/e-comp-editor-registry.h index 0b45a53cbc..3f9d195666 100644 --- a/calendar/gui/e-comp-editor-registry.h +++ b/calendar/gui/e-comp-editor-registry.h @@ -55,7 +55,6 @@ struct _ECompEditorRegistryClass { typedef void (* ECompEditorRegistryForeachFn) (CompEditor *editor, gpointer data); - GType e_comp_editor_registry_get_type (void); @@ -71,4 +70,3 @@ G_END_DECLS #endif /* _E_COMP_EDITOR_REGISTRY_H_ */ - diff --git a/calendar/gui/e-day-view-config.c b/calendar/gui/e-day-view-config.c index 942f73933e..a193e7bfa0 100644 --- a/calendar/gui/e-day-view-config.c +++ b/calendar/gui/e-day-view-config.c @@ -281,7 +281,6 @@ day_end_hour_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpoin set_day_end_hour (priv->view); } - static void set_day_end_minute (EDayView *day_view) { diff --git a/calendar/gui/e-day-view-layout.c b/calendar/gui/e-day-view-layout.c index ab1f6c0fd0..51ced181b7 100644 --- a/calendar/gui/e-day-view-layout.c +++ b/calendar/gui/e-day-view-layout.c @@ -52,7 +52,6 @@ static void e_day_view_recalc_cols_per_row (gint rows, guint8 *cols_per_row, guint16 *group_starts); - void e_day_view_layout_long_events (GArray *events, gint days_shown, @@ -86,7 +85,6 @@ e_day_view_layout_long_events (GArray *events, g_free (grid); } - static void e_day_view_layout_long_event (EDayViewEvent *event, guint8 *grid, @@ -128,7 +126,6 @@ e_day_view_layout_long_event (EDayViewEvent *event, *rows_in_top_display = MAX (*rows_in_top_display, free_row + 1); } - /* returns maximum number of columns among all rows */ gint e_day_view_layout_day_events (GArray *events, @@ -197,7 +194,6 @@ e_day_view_layout_day_events (GArray *events, return res; } - /* Finds the first free position to place the event in. Increments the number of events in each of the rows it covers, and makes sure they are all in one group. */ @@ -275,7 +271,6 @@ e_day_view_layout_day_event (EDayViewEvent *event, } } - /* For each group of rows, find the max number of events in all the rows, and set the number of cols in each of the rows to that. */ static void @@ -299,7 +294,6 @@ e_day_view_recalc_cols_per_row (gint rows, } } - /* Expands the event horizontally to fill any free space. */ static void e_day_view_expand_day_event (EDayViewEvent *event, @@ -333,7 +327,6 @@ e_day_view_expand_day_event (EDayViewEvent *event, } } - /* Find the start and end days for the event. */ gboolean e_day_view_find_long_event_days (EDayViewEvent *event, @@ -369,4 +362,3 @@ e_day_view_find_long_event_days (EDayViewEvent *event, return TRUE; } - diff --git a/calendar/gui/e-day-view-layout.h b/calendar/gui/e-day-view-layout.h index 36f2e0c52d..c169a06b59 100644 --- a/calendar/gui/e-day-view-layout.h +++ b/calendar/gui/e-day-view-layout.h @@ -36,7 +36,6 @@ void e_day_view_layout_long_events (GArray *events, time_t *day_starts, gint *rows_in_top_display); - gint e_day_view_layout_day_events (GArray *events, gint rows, gint mins_per_row, diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c index acbc192218..b55dba425c 100644 --- a/calendar/gui/e-day-view-main-item.c +++ b/calendar/gui/e-day-view-main-item.c @@ -116,14 +116,12 @@ e_day_view_main_item_class_init (EDayViewMainItemClass *class) #endif } - static void e_day_view_main_item_init (EDayViewMainItem *dvtitem) { dvtitem->day_view = NULL; } - static void e_day_view_main_item_set_property (GObject *object, guint property_id, @@ -143,7 +141,6 @@ e_day_view_main_item_set_property (GObject *object, G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); } - static void e_day_view_main_item_update (GnomeCanvasItem *item, double *affine, @@ -160,7 +157,6 @@ e_day_view_main_item_update (GnomeCanvasItem *item, item->y2 = INT_MAX; } - /* * DRAWING ROUTINES - functions to paint the canvas item. */ @@ -371,7 +367,6 @@ e_day_view_main_item_draw (GnomeCanvasItem *canvas_item, GdkDrawable *drawable, day); } - if (e_day_view_get_show_marcus_bains (day_view)) { icaltimezone *zone; struct icaltimetype time_now, day_start; @@ -413,7 +408,6 @@ e_day_view_main_item_draw (GnomeCanvasItem *canvas_item, GdkDrawable *drawable, cairo_destroy (cr); } - static void e_day_view_main_item_draw_events_in_vbars (EDayViewMainItem *dvmitem, GdkDrawable *drawable, @@ -455,7 +449,6 @@ e_day_view_main_item_draw_events_in_vbars (EDayViewMainItem *dvmitem, } } - comp = e_cal_component_new (); e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp)); @@ -494,7 +487,6 @@ e_day_view_main_item_draw_events_in_vbars (EDayViewMainItem *dvmitem, cairo_destroy (cr); } - static void e_day_view_main_item_draw_long_events_in_vbars (EDayViewMainItem *dvmitem, GdkDrawable *drawable, @@ -583,7 +575,6 @@ e_day_view_main_item_draw_long_events_in_vbars (EDayViewMainItem *dvmitem, cairo_destroy (cr); } - static void e_day_view_main_item_draw_day_events (EDayViewMainItem *dvmitem, GdkDrawable *drawable, @@ -1013,7 +1004,6 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem, else if (bar_y2 < scroll_flag) event->end_minute -= day_view->mins_per_row; - comp = e_cal_component_new (); e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp)); @@ -1174,7 +1164,6 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem, icon_y += icon_y_inc; } - if (draw_meeting_icon && fit_in_event ()) { max_icon_w = item_x + item_w - icon_x - E_DAY_VIEW_EVENT_BORDER_WIDTH; @@ -1342,7 +1331,6 @@ e_day_view_main_item_point (GnomeCanvasItem *item, double x, double y, return 0.0; } - static gint e_day_view_main_item_event (GnomeCanvasItem *item, GdkEvent *event) { @@ -1360,4 +1348,3 @@ e_day_view_main_item_event (GnomeCanvasItem *item, GdkEvent *event) return FALSE; } - diff --git a/calendar/gui/e-day-view-main-item.h b/calendar/gui/e-day-view-main-item.h index 3f28bde608..5204115e88 100644 --- a/calendar/gui/e-day-view-main-item.h +++ b/calendar/gui/e-day-view-main-item.h @@ -51,10 +51,8 @@ typedef struct { } EDayViewMainItemClass; - GType e_day_view_main_item_get_type (void); - G_END_DECLS #endif /* _E_DAY_VIEW_MAIN_ITEM_H_ */ diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c index 232534d51a..36a7b49ae2 100644 --- a/calendar/gui/e-day-view-time-item.c +++ b/calendar/gui/e-day-view-time-item.c @@ -35,7 +35,6 @@ #include <widgets/e-timezone-dialog/e-timezone-dialog.h> #include <libedataserver/e-data-server-util.h> - /* The spacing between items in the time column. GRID_X_PAD is the space down either side of the column, i.e. outside the main horizontal grid lines. HOUR_L_PAD & HOUR_R_PAD are the spaces on the left & right side of the @@ -127,7 +126,6 @@ e_day_view_time_item_class_init (EDayViewTimeItemClass *class) G_PARAM_WRITABLE)); } - static void e_day_view_time_item_init (EDayViewTimeItem *dvtmitem) { @@ -197,7 +195,6 @@ e_day_view_time_item_update (GnomeCanvasItem *item, item->y2 = INT_MAX; } - /* Returns the minimum width needed for the column, by adding up all the maximum widths of the strings. The string widths are all calculated in the style_set handlers of EDayView and EDayViewTimeCanvas. */ @@ -267,7 +264,6 @@ e_day_view_time_item_get_column_width (EDayViewTimeItem *dvtmitem) return dvtmitem->column_width; } - /* * DRAWING ROUTINES - functions to paint the canvas item. */ @@ -642,7 +638,6 @@ e_day_view_time_item_increment_time (gint *hour, } } - static double e_day_view_time_item_point (GnomeCanvasItem *item, double x, double y, gint cx, gint cy, @@ -652,7 +647,6 @@ e_day_view_time_item_point (GnomeCanvasItem *item, double x, double y, return 0.0; } - static gint e_day_view_time_item_event (GnomeCanvasItem *item, GdkEvent *event) @@ -823,7 +817,6 @@ e_day_view_time_item_show_popup_menu (EDayViewTimeItem *dvtmitem, event->button.button, event->button.time); } - static void e_day_view_time_item_on_set_divisions (GtkWidget *item, EDayViewTimeItem *dvtmitem) @@ -842,7 +835,6 @@ e_day_view_time_item_on_set_divisions (GtkWidget *item, calendar_config_set_time_divisions (divisions); } - static void e_day_view_time_item_on_button_press (EDayViewTimeItem *dvtmitem, GdkEvent *event) @@ -874,7 +866,6 @@ e_day_view_time_item_on_button_press (EDayViewTimeItem *dvtmitem, } } - static void e_day_view_time_item_on_button_release (EDayViewTimeItem *dvtmitem, GdkEvent *event) @@ -921,7 +912,6 @@ e_day_view_time_item_on_motion_notify (EDayViewTimeItem *dvtmitem, } } - /* Returns the row corresponding to the y position, or -1. */ static gint e_day_view_time_item_convert_position_to_row (EDayViewTimeItem *dvtmitem, diff --git a/calendar/gui/e-day-view-time-item.h b/calendar/gui/e-day-view-time-item.h index 237b556df6..802ca50c3b 100644 --- a/calendar/gui/e-day-view-time-item.h +++ b/calendar/gui/e-day-view-time-item.h @@ -62,13 +62,10 @@ typedef struct { } EDayViewTimeItemClass; - GType e_day_view_time_item_get_type (void); - gint e_day_view_time_item_get_column_width (EDayViewTimeItem *dvtmitem); - G_END_DECLS #endif /* _E_DAY_VIEW_TIME_ITEM_H_ */ diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c index 31cce40a5a..180b3adb1c 100644 --- a/calendar/gui/e-day-view-top-item.c +++ b/calendar/gui/e-day-view-top-item.c @@ -74,7 +74,6 @@ static double e_day_view_top_item_point (GnomeCanvasItem *item, static gint e_day_view_top_item_event (GnomeCanvasItem *item, GdkEvent *event); - /* The arguments we take */ enum { PROP_0, @@ -119,7 +118,6 @@ e_day_view_top_item_class_init (EDayViewTopItemClass *class) G_PARAM_WRITABLE)); } - static void e_day_view_top_item_init (EDayViewTopItem *dvtitem) { @@ -127,7 +125,6 @@ e_day_view_top_item_init (EDayViewTopItem *dvtitem) dvtitem->show_dates = FALSE; } - static void e_day_view_top_item_set_property (GObject *object, guint property_id, @@ -150,7 +147,6 @@ e_day_view_top_item_set_property (GObject *object, G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); } - static void e_day_view_top_item_update (GnomeCanvasItem *item, double *affine, @@ -167,7 +163,6 @@ e_day_view_top_item_update (GnomeCanvasItem *item, item->y2 = INT_MAX; } - /* * DRAWING ROUTINES - functions to paint the canvas item. */ @@ -718,7 +713,6 @@ e_day_view_top_item_draw_long_event (EDayViewTopItem *dvtitem, gdk_gc_set_clip_mask (gc, NULL); } - /* This draws a little triangle to indicate that an event extends past the days visible on screen. */ static void @@ -807,7 +801,6 @@ e_day_view_top_item_point (GnomeCanvasItem *item, double x, double y, return 0.0; } - static gint e_day_view_top_item_event (GnomeCanvasItem *item, GdkEvent *event) { diff --git a/calendar/gui/e-day-view-top-item.h b/calendar/gui/e-day-view-top-item.h index 61dfdceab8..e163e3eb81 100644 --- a/calendar/gui/e-day-view-top-item.h +++ b/calendar/gui/e-day-view-top-item.h @@ -54,12 +54,10 @@ typedef struct { } EDayViewTopItemClass; - GType e_day_view_top_item_get_type (void); void e_day_view_top_item_get_day_label (EDayView *day_view, gint day, gchar *buffer, gint buffer_len); - G_END_DECLS #endif /* _E_DAY_VIEW_TOP_ITEM_H_ */ diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index 9d6bc2df3a..f3cb3f0715 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -226,7 +226,6 @@ static void e_day_view_finish_long_event_resize (EDayView *day_view); static void e_day_view_finish_resize (EDayView *day_view); static void e_day_view_abort_resize (EDayView *day_view); - static gboolean e_day_view_on_long_event_button_press (EDayView *day_view, gint event_num, GdkEventButton *event, @@ -265,7 +264,6 @@ static void e_day_view_show_popup_menu (EDayView *day_view, gint day, gint event_num); - static void e_day_view_recalc_day_starts (EDayView *day_view, time_t start_time); static void e_day_view_recalc_num_rows (EDayView *day_view); @@ -506,7 +504,6 @@ time_range_changed_cb (ECalModel *model, time_t start_time, time_t end_time, gpo e_day_view_ensure_rows_visible (day_view, day_view->selection_start_row, day_view->selection_start_row); } - static void process_component (EDayView *day_view, ECalModelComponent *comp_data) { @@ -682,7 +679,6 @@ timezone_changed_cb (ECalendarView *cal_view, icaltimezone *old_zone, g_return_if_fail (E_IS_DAY_VIEW (day_view)); - if (!cal_view->in_focus) return; @@ -779,7 +775,6 @@ e_day_view_init (EDayView *day_view) day_view->last_edited_comp_string = NULL; - day_view->selection_start_row = -1; day_view->selection_start_day = -1; day_view->selection_end_row = -1; @@ -971,7 +966,6 @@ e_day_view_init (EDayView *day_view) NULL); gnome_canvas_item_hide (day_view->drag_item); - /* * Times Canvas */ @@ -993,7 +987,6 @@ e_day_view_init (EDayView *day_view) "EDayViewTimeItem::day_view", day_view, NULL); - /* * Scrollbar. */ @@ -1029,13 +1022,11 @@ e_day_view_init (EDayView *day_view) target_table, n_targets, GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_ASK); - /* connect to ECalendarView's signals */ g_signal_connect (G_OBJECT (day_view), "timezone_changed", G_CALLBACK (timezone_changed_cb), NULL); } - static void init_model (EDayView *day_view, ECalModel *model) { @@ -1062,7 +1053,6 @@ e_day_view_on_canvas_realized (GtkWidget *widget, NULL, FALSE); } - /** * e_day_view_new: * @Returns: a new #EDayView. @@ -1168,7 +1158,6 @@ e_day_view_realize (GtkWidget *widget) day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", GTK_ICON_SIZE_MENU); day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", GTK_ICON_SIZE_MENU); - /* Set the canvas item colors. */ gnome_canvas_item_set (day_view->drag_long_event_rect_item, "fill_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND], @@ -1438,7 +1427,6 @@ e_day_view_style_set (GtkWidget *widget, } } - /* Calculate the widths of all the time strings necessary. */ day_view->max_small_hour_width = 0; for (hour = 0; hour < 24; hour++) { @@ -1625,7 +1613,6 @@ e_day_view_recalc_cell_sizes (EDayView *day_view) g_object_unref (layout); } - static gint e_day_view_focus_in (GtkWidget *widget, GdkEventFocus *event) { @@ -1645,7 +1632,6 @@ e_day_view_focus_in (GtkWidget *widget, GdkEventFocus *event) return FALSE; } - static gint e_day_view_focus_out (GtkWidget *widget, GdkEventFocus *event) { @@ -1702,7 +1688,6 @@ e_day_view_foreach_event (EDayView *day_view, } } - /* This calls a given function for each event instance that matches the given uid. If the callback returns FALSE the iteration is stopped. Note that it is safe for the callback to remove the event (since we @@ -1746,7 +1731,6 @@ e_day_view_foreach_event_with_uid (EDayView *day_view, } } - static gboolean e_day_view_remove_event_cb (EDayView *day_view, gint day, @@ -1917,7 +1901,6 @@ e_day_view_update_long_event_label (EDayView *day_view, set_text_as_bold (event); } - /* Finds the day and index of the event with the given canvas item. If is is a long event, -1 is returned as the day. Returns TRUE if the event was found. */ @@ -1957,7 +1940,6 @@ e_day_view_find_event_from_item (EDayView *day_view, return FALSE; } - /* Finds the day and index of the event with the given uid. If is is a long event, E_DAY_VIEW_LONG_EVENT is returned as the day. Returns TRUE if an event with the uid was found. @@ -2132,7 +2114,6 @@ e_day_view_set_selected_time_range_visible (EDayView *day_view, } } - /* Finds the start of the working week which includes the given time. */ static time_t e_day_view_find_work_week_start (EDayView *day_view, @@ -2177,7 +2158,6 @@ e_day_view_find_work_week_start (EDayView *day_view, return icaltime_as_timet_with_zone (tt, e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view))); } - /* This sets the selected time range. If the start_time & end_time are not equal and are both visible in the view, then the selection is set to those times, otherwise it is set to 1 hour from the start of the working day. */ @@ -2355,7 +2335,6 @@ e_day_view_get_work_week_view (EDayView *day_view) return day_view->work_week_view; } - void e_day_view_set_work_week_view (EDayView *day_view, gboolean work_week_view) @@ -2371,7 +2350,6 @@ e_day_view_set_work_week_view (EDayView *day_view, e_day_view_recalc_work_week (day_view); } - gint e_day_view_get_days_shown (EDayView *day_view) { @@ -2380,7 +2358,6 @@ e_day_view_get_days_shown (EDayView *day_view) return day_view->days_shown; } - void e_day_view_set_days_shown (EDayView *day_view, gint days_shown) @@ -2404,7 +2381,6 @@ e_day_view_set_days_shown (EDayView *day_view, e_day_view_update_query (day_view); } - gint e_day_view_get_mins_per_row (EDayView *day_view) { @@ -2413,7 +2389,6 @@ e_day_view_get_mins_per_row (EDayView *day_view) return day_view->mins_per_row; } - void e_day_view_set_mins_per_row (EDayView *day_view, gint mins_per_row) @@ -2455,7 +2430,6 @@ e_day_view_set_mins_per_row (EDayView *day_view, e_day_view_update_scroll_regions (day_view); } - /* This specifies the working days in the week. The value is a bitwise combination of day flags. Defaults to Mon-Fri. */ EDayViewDays @@ -2466,7 +2440,6 @@ e_day_view_get_working_days (EDayView *day_view) return day_view->working_days; } - void e_day_view_set_working_days (EDayView *day_view, EDayViewDays days) @@ -2486,7 +2459,6 @@ e_day_view_set_working_days (EDayView *day_view, gtk_widget_queue_draw (day_view->main_canvas); } - static void e_day_view_recalc_work_week_days_shown (EDayView *day_view) { @@ -2522,7 +2494,6 @@ e_day_view_recalc_work_week_days_shown (EDayView *day_view) e_day_view_set_days_shown (day_view, days_shown); } - /* The start and end time of the working day. This only affects the background colors. */ void @@ -2540,7 +2511,6 @@ e_day_view_get_working_day (EDayView *day_view, *end_minute = day_view->work_day_end_minute; } - void e_day_view_set_working_day (EDayView *day_view, gint start_hour, @@ -2558,7 +2528,6 @@ e_day_view_set_working_day (EDayView *day_view, gtk_widget_queue_draw (day_view->main_canvas); } - /* Whether we display the Marcus Bains Line in the main canvas and time canvas. */ gboolean e_day_view_get_show_marcus_bains (EDayView *day_view) @@ -2576,7 +2545,6 @@ e_day_view_update_marcus_bains (EDayView *day_view) gtk_widget_queue_draw (day_view->time_canvas); } - /* Update the variables controlling the Marcus Bains Line (display toggle, and colors). */ void e_day_view_set_marcus_bains (EDayView *day_view, @@ -2610,7 +2578,6 @@ e_day_view_set_marcus_bains (EDayView *day_view, } } - /* Whether we display event end times in the main canvas. */ gboolean e_day_view_get_show_event_end_times (EDayView *day_view) @@ -2620,7 +2587,6 @@ e_day_view_get_show_event_end_times (EDayView *day_view) return day_view->show_event_end_times; } - void e_day_view_set_show_event_end_times (EDayView *day_view, gboolean show) @@ -2648,7 +2614,6 @@ e_day_view_set_show_times_cb (EDayView *day_view, return TRUE; } - /* The first day of the week, 0 (Monday) to 6 (Sunday). */ gint e_day_view_get_week_start_day (EDayView *day_view) @@ -2658,7 +2623,6 @@ e_day_view_get_week_start_day (EDayView *day_view) return day_view->week_start_day; } - void e_day_view_set_week_start_day (EDayView *day_view, gint week_start_day) @@ -2704,7 +2668,6 @@ e_day_view_recalc_work_week (EDayView *day_view) } } - static gboolean e_day_view_update_scroll_regions (EDayView *day_view) { @@ -2745,7 +2708,6 @@ e_day_view_update_scroll_regions (EDayView *day_view) return need_reshape; } - /* This recalculates the number of rows to display, based on the time range shown and the minutes per row. */ static void @@ -2760,7 +2722,6 @@ e_day_view_recalc_num_rows (EDayView *day_view) day_view->rows = total_minutes / day_view->mins_per_row; } - /* Converts an hour and minute to a row in the canvas. Note that if we aren't showing all 24 hours of the day, the returned row may be negative or greater than day_view->rows. */ @@ -2781,7 +2742,6 @@ e_day_view_convert_time_to_row (EDayView *day_view, return offset / day_view->mins_per_row; } - /* Converts an hour and minute to a y coordinate in the canvas. */ gint e_day_view_convert_time_to_position (EDayView *day_view, @@ -2878,7 +2838,6 @@ e_day_view_on_top_canvas_button_press (GtkWidget *widget, return TRUE; } - static gboolean e_day_view_convert_event_coords (EDayView *day_view, GdkEvent *event, @@ -2932,7 +2891,6 @@ e_day_view_convert_event_coords (EDayView *day_view, return (event_window == window) ? TRUE : FALSE; } - static gboolean e_day_view_on_main_canvas_button_press (GtkWidget *widget, GdkEventButton *event, @@ -3008,7 +2966,6 @@ e_day_view_on_main_canvas_button_press (GtkWidget *widget, if (!GTK_WIDGET_HAS_FOCUS (day_view)) gtk_widget_grab_focus (GTK_WIDGET (day_view)); - if ((day < day_view->selection_start_day || day > day_view->selection_end_day) || (day == day_view->selection_start_day && row < day_view->selection_start_row) || (day == day_view->selection_end_day && row > day_view->selection_end_row)) { @@ -3118,7 +3075,6 @@ e_day_view_on_long_event_button_press (EDayView *day_view, return FALSE; } - static gboolean e_day_view_on_event_button_press (EDayView *day_view, gint day, @@ -3257,7 +3213,6 @@ e_day_view_on_event_click (EDayView *day_view, return; } - /* Grab the keyboard focus, so the event being edited is saved and we can use the Escape key to abort the resize. */ if (!GTK_WIDGET_HAS_FOCUS (day_view)) @@ -3331,7 +3286,6 @@ e_day_view_reshape_resize_long_event_rect_item (EDayView *day_view) y2 = item_y + item_h - 1; } - static void e_day_view_reshape_resize_rect_item (EDayView *day_view) { @@ -3509,7 +3463,6 @@ e_day_view_on_top_canvas_button_release (GtkWidget *widget, return FALSE; } - static gboolean e_day_view_on_main_canvas_button_release (GtkWidget *widget, GdkEventButton *event, @@ -3539,7 +3492,6 @@ e_day_view_on_main_canvas_button_release (GtkWidget *widget, return FALSE; } - void e_day_view_update_calendar_selection_time (EDayView *day_view) { @@ -3656,7 +3608,6 @@ e_day_view_on_top_canvas_motion (GtkWidget *widget, return FALSE; } - static gboolean e_day_view_on_main_canvas_motion (GtkWidget *widget, GdkEventMotion *mevent, @@ -3790,7 +3741,6 @@ e_day_view_start_selection (EDayView *day_view, gtk_widget_queue_draw (day_view->main_canvas); } - /* Updates the selection during a drag. If day is -1 the selection day is unchanged. */ void @@ -3836,7 +3786,6 @@ e_day_view_update_selection (EDayView *day_view, } } - static void e_day_view_normalize_selection (EDayView *day_view) { @@ -3859,7 +3808,6 @@ e_day_view_normalize_selection (EDayView *day_view) } } - void e_day_view_finish_selection (EDayView *day_view) { @@ -3907,7 +3855,6 @@ e_day_view_update_long_event_resize (EDayView *day_view, } } - static void e_day_view_update_resize (EDayView *day_view, gint row) @@ -3958,7 +3905,6 @@ e_day_view_update_resize (EDayView *day_view, } } - /* This converts the resize start or end row back to a time and updates the event. */ static void @@ -4067,7 +4013,6 @@ e_day_view_finish_long_event_resize (EDayView *day_view) g_object_unref (comp); } - /* This converts the resize start or end row back to a time and updates the event. */ static void @@ -4129,7 +4074,6 @@ e_day_view_finish_resize (EDayView *day_view) day_view->last_edited_comp_string = e_cal_component_get_as_string (comp); - /* Hide the horizontal bars. */ day_view->resize_bars_event_day = -1; day_view->resize_bars_event_num = -1; @@ -4175,7 +4119,6 @@ e_day_view_finish_resize (EDayView *day_view) g_object_unref (comp); } - static void e_day_view_abort_resize (EDayView *day_view) { @@ -4222,14 +4165,12 @@ e_day_view_free_events (EDayView *day_view) day_view->editing_event_num = -1; day_view->popup_event_num = -1; - e_day_view_free_event_array (day_view, day_view->long_events); for (day = 0; day < E_DAY_VIEW_MAX_DAYS; day++) e_day_view_free_event_array (day_view, day_view->events[day]); } - static void e_day_view_free_event_array (EDayView *day_view, GArray *array) @@ -4248,7 +4189,6 @@ e_day_view_free_event_array (EDayView *day_view, g_array_set_size (array, 0); } - /* This adds one event to the view, adding it to the appropriate array. */ static gboolean e_day_view_add_event (ECalComponent *comp, @@ -4418,7 +4358,6 @@ e_day_view_check_layout (EDayView *day_view) } } - static void e_day_view_reshape_long_events (EDayView *day_view) { @@ -4441,7 +4380,6 @@ e_day_view_reshape_long_events (EDayView *day_view) } } - static void e_day_view_reshape_long_event (EDayView *day_view, gint event_num) @@ -4600,7 +4538,6 @@ e_day_view_reshape_long_event (EDayView *day_view, g_object_unref (comp); } - /* This creates or updates the sizes of the canvas items for one day of the main canvas. */ static void @@ -4631,7 +4568,6 @@ e_day_view_reshape_day_events (EDayView *day_view, } } - static void e_day_view_reshape_day_event (EDayView *day_view, gint day, @@ -4735,7 +4671,6 @@ e_day_view_reshape_day_event (EDayView *day_view, } } - /* This creates or resizes the horizontal bars used to resize events in the main canvas. */ static void @@ -4802,7 +4737,6 @@ e_day_view_ensure_events_sorted (EDayView *day_view) } } - gint e_day_view_event_sort_func (gconstpointer arg1, gconstpointer arg2) @@ -4976,7 +4910,6 @@ e_day_view_do_key_press (GtkWidget *widget, GdkEventKey *event) return TRUE; } - /* Handle the cursor keys for moving & extending the selection. */ stop_emission = TRUE; if (event->state & GDK_SHIFT_MASK) { @@ -5081,7 +5014,6 @@ e_day_view_goto_start_of_work_day (EDayView *day_view) gtk_widget_queue_draw (day_view->main_canvas); } - /* Select the time that ends a work day*/ static void e_day_view_goto_end_of_work_day (EDayView *day_view) @@ -5182,7 +5114,6 @@ e_day_view_change_duration_to_end_of_work_day (EDayView *day_view) gtk_widget_queue_draw (day_view->main_canvas); } - static void e_day_view_cursor_key_up_shifted (EDayView *day_view, GdkEventKey *event) { @@ -5494,7 +5425,6 @@ e_day_view_cursor_key_down_shifted (EDayView *day_view, GdkEventKey *event) gtk_widget_queue_draw (day_view->main_canvas); } - static void e_day_view_cursor_key_left_shifted (EDayView *day_view, GdkEventKey *event) { @@ -5519,7 +5449,6 @@ e_day_view_cursor_key_left_shifted (EDayView *day_view, GdkEventKey *event) gtk_widget_queue_draw (day_view->main_canvas); } - static void e_day_view_cursor_key_right_shifted (EDayView *day_view, GdkEventKey *event) { @@ -5544,7 +5473,6 @@ e_day_view_cursor_key_right_shifted (EDayView *day_view, GdkEventKey *event) gtk_widget_queue_draw (day_view->main_canvas); } - static void e_day_view_cursor_key_up (EDayView *day_view, GdkEventKey *event) { @@ -5577,7 +5505,6 @@ e_day_view_cursor_key_up (EDayView *day_view, GdkEventKey *event) gtk_widget_queue_draw (day_view->main_canvas); } - static void e_day_view_cursor_key_down (EDayView *day_view, GdkEventKey *event) { @@ -5610,7 +5537,6 @@ e_day_view_cursor_key_down (EDayView *day_view, GdkEventKey *event) gtk_widget_queue_draw (day_view->main_canvas); } - static void e_day_view_cursor_key_left (EDayView *day_view, GdkEventKey *event) { @@ -5631,7 +5557,6 @@ e_day_view_cursor_key_left (EDayView *day_view, GdkEventKey *event) #endif } - static void e_day_view_cursor_key_right (EDayView *day_view, GdkEventKey *event) { @@ -5652,7 +5577,6 @@ e_day_view_cursor_key_right (EDayView *day_view, GdkEventKey *event) #endif } - /* Scrolls the main canvas up or down. The pages_to_scroll argument is multiplied with the adjustment's page size and added to the adjustment's value, while ensuring we stay within the bounds. A positive value will @@ -5776,7 +5700,6 @@ e_day_view_start_editing_event (EDayView *day_view, } } - /* This stops the current edit. If accept is TRUE the event summary is updated, else the edit is cancelled. */ static void @@ -5794,7 +5717,6 @@ e_day_view_stop_editing_event (EDayView *day_view) gtk_window_set_focus (GTK_WINDOW (toplevel), NULL); } - /* Cancels the current edition by resetting the appointment's text to its original value */ static void cancel_editing (EDayView *day_view) @@ -6212,7 +6134,6 @@ e_day_view_change_event_end_time_up (EDayView *day_view) e_day_view_ensure_rows_visible (day_view, resize_start_row, resize_end_row); } - static void e_day_view_change_event_end_time_down (EDayView *day_view) { @@ -6243,7 +6164,6 @@ e_day_view_change_event_end_time_down (EDayView *day_view) e_day_view_ensure_rows_visible (day_view, resize_start_row, resize_end_row); } - static void e_day_view_on_editing_started (EDayView *day_view, GnomeCanvasItem *item) @@ -6501,7 +6421,6 @@ e_day_view_convert_grid_position_to_time (EDayView *day_view, return val; } - static gboolean e_day_view_convert_time_to_grid_position (EDayView *day_view, time_t time, @@ -6540,7 +6459,6 @@ e_day_view_convert_time_to_grid_position (EDayView *day_view, return TRUE; } - /* This starts or stops auto-scrolling when dragging a selection or resizing an event. */ void @@ -6568,7 +6486,6 @@ e_day_view_check_auto_scroll (EDayView *day_view, e_day_view_stop_auto_scroll (day_view); } - static void e_day_view_start_auto_scroll (EDayView *day_view, gboolean scroll_up) @@ -6580,7 +6497,6 @@ e_day_view_start_auto_scroll (EDayView *day_view, day_view->auto_scroll_up = scroll_up; } - void e_day_view_stop_auto_scroll (EDayView *day_view) { @@ -6590,7 +6506,6 @@ e_day_view_stop_auto_scroll (EDayView *day_view) } } - static gboolean e_day_view_auto_scroll_handler (gpointer data) { @@ -6726,7 +6641,6 @@ e_day_view_get_event_position (EDayView *day_view, end_row = day_view->resize_end_row; } - *item_x = day_view->day_offsets[day] + day_view->day_widths[day] * start_col / cols_in_row; *item_w = day_view->day_widths[day] * num_columns / cols_in_row @@ -6743,7 +6657,6 @@ e_day_view_get_event_position (EDayView *day_view, return TRUE; } - gboolean e_day_view_get_long_event_position (EDayView *day_view, gint event_num, @@ -6788,7 +6701,6 @@ e_day_view_get_long_event_position (EDayView *day_view, return TRUE; } - /* Converts a position within the entire top canvas to a day & event and a place within the event if appropriate. If event_num_return is NULL, it simply returns the grid position without trying to find the event. */ @@ -6864,7 +6776,6 @@ e_day_view_convert_position_in_top_canvas (EDayView *day_view, return E_CALENDAR_VIEW_POS_NONE; } - /* Converts a position within the entire main canvas to a day, row, event and a place within the event if appropriate. If event_num_return is NULL, it simply returns the grid position without trying to find the event. */ @@ -6965,7 +6876,6 @@ e_day_view_convert_position_in_main_canvas (EDayView *day_view, return E_CALENDAR_VIEW_POS_NONE; } - static gboolean e_day_view_on_top_canvas_drag_motion (GtkWidget *widget, GdkDragContext *context, @@ -6986,7 +6896,6 @@ e_day_view_on_top_canvas_drag_motion (GtkWidget *widget, return TRUE; } - static void e_day_view_reshape_top_canvas_drag_item (EDayView *day_view) { @@ -7010,7 +6919,6 @@ e_day_view_reshape_top_canvas_drag_item (EDayView *day_view) e_day_view_update_top_canvas_drag (day_view, day); } - static void e_day_view_update_top_canvas_drag (EDayView *day_view, gint day) @@ -7055,14 +6963,12 @@ e_day_view_update_top_canvas_drag (EDayView *day_view, day_view->drag_last_day = day; - item_x = day_view->day_offsets[day] + E_DAY_VIEW_BAR_WIDTH; item_w = day_view->day_offsets[day + num_days] - item_x - E_DAY_VIEW_GAP_WIDTH; item_y = row * day_view->top_row_height; item_h = day_view->top_row_height - E_DAY_VIEW_TOP_CANVAS_Y_GAP; - /* Set the positions of the event & associated items. */ gnome_canvas_item_set (day_view->drag_long_event_rect_item, "x1", item_x, @@ -7108,7 +7014,6 @@ e_day_view_update_top_canvas_drag (EDayView *day_view, } } - static gboolean e_day_view_on_main_canvas_drag_motion (GtkWidget *widget, GdkDragContext *context, @@ -7133,7 +7038,6 @@ e_day_view_on_main_canvas_drag_motion (GtkWidget *widget, return TRUE; } - static void e_day_view_reshape_main_canvas_drag_item (EDayView *day_view) { @@ -7158,7 +7062,6 @@ e_day_view_reshape_main_canvas_drag_item (EDayView *day_view) e_day_view_update_main_canvas_drag (day_view, row, day); } - static void e_day_view_update_main_canvas_drag (EDayView *day_view, gint row, @@ -7270,7 +7173,6 @@ e_day_view_update_main_canvas_drag (EDayView *day_view, } } - static void e_day_view_on_top_canvas_drag_leave (GtkWidget *widget, GdkDragContext *context, @@ -7330,7 +7232,6 @@ e_day_view_on_drag_begin (GtkWidget *widget, gnome_canvas_item_hide (event->canvas_item); } - static void e_day_view_on_drag_end (GtkWidget *widget, GdkDragContext *context, @@ -7364,7 +7265,6 @@ e_day_view_on_drag_end (GtkWidget *widget, day_view->drag_event_num = -1; } - static void e_day_view_on_drag_data_get (GtkWidget *widget, GdkDragContext *context, @@ -7420,7 +7320,6 @@ e_day_view_on_drag_data_get (GtkWidget *widget, } } - static void e_day_view_on_top_canvas_drag_data_received (GtkWidget *widget, GdkDragContext *context, @@ -7646,7 +7545,6 @@ error: gtk_drag_finish (context, FALSE, FALSE, time); } - static void e_day_view_on_main_canvas_drag_data_received (GtkWidget *widget, GdkDragContext *context, @@ -7852,7 +7750,6 @@ error: gtk_drag_finish (context, FALSE, FALSE, time); } - /* Converts an hour from 0-23 to the preferred time format, and returns the suffix to add and the width of it in the normal font. */ void @@ -7884,7 +7781,6 @@ e_day_view_convert_time_to_display (EDayView *day_view, } } - gint e_day_view_get_time_string_width (EDayView *day_view) { @@ -7908,7 +7804,6 @@ e_day_view_queue_layout (EDayView *day_view) } } - /* Removes any queued layout. */ static void e_day_view_cancel_layout (EDayView *day_view) @@ -7919,7 +7814,6 @@ e_day_view_cancel_layout (EDayView *day_view) } } - static gboolean e_day_view_layout_timeout_cb (gpointer data) { @@ -7934,7 +7828,6 @@ e_day_view_layout_timeout_cb (gpointer data) return FALSE; } - /* Returns the number of selected events (0 or 1 at present). */ gint e_day_view_get_num_events_selected (EDayView *day_view) diff --git a/calendar/gui/e-day-view.h b/calendar/gui/e-day-view.h index 31b894919c..d4f1ca680c 100644 --- a/calendar/gui/e-day-view.h +++ b/calendar/gui/e-day-view.h @@ -95,7 +95,6 @@ G_BEGIN_DECLS /* The gap between rows in the top canvas. */ #define E_DAY_VIEW_TOP_CANVAS_Y_GAP 2 - /* These are used to get/set the working days in the week. The bit-flags are combined together. The bits must be from 0 (Sun) to 6 (Sat) to match the day values used by localtime etc. */ @@ -110,7 +109,6 @@ typedef enum E_DAY_VIEW_SATURDAY = 1 << 6 } EDayViewDays; - /* These are used to specify the type of an appointment. They match those used in EMeetingTimeSelector. */ typedef enum @@ -184,12 +182,10 @@ struct _EDayViewEvent { guint8 num_columns; }; - #define E_DAY_VIEW(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, e_day_view_get_type (), EDayView) #define E_DAY_VIEW_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, e_day_view_get_type (), EDayViewClass) #define E_IS_DAY_VIEW(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, e_day_view_get_type ()) - typedef struct _EDayView EDayView; typedef struct _EDayViewClass EDayViewClass; @@ -486,7 +482,6 @@ struct _EDayViewClass ECalendarViewClass parent_class; }; - GType e_day_view_get_type (void); GtkWidget* e_day_view_new (ECalModel *model); @@ -600,7 +595,6 @@ void e_day_view_convert_time_to_display (EDayView *day_view, gint *suffix_width); gint e_day_view_get_time_string_width (EDayView *day_view); - gint e_day_view_event_sort_func (const void *arg1, const void *arg2); diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c index d849c465d8..4d2803d442 100644 --- a/calendar/gui/e-itip-control.c +++ b/calendar/gui/e-itip-control.c @@ -981,7 +981,6 @@ set_message (GtkHTML *html, GtkHTMLStream *html_stream, const gchar *message, gb if (message == NULL) return; - if (err) { gtk_html_stream_printf (html_stream, "<b><font color=\"#ff0000\">%s</font></b><br><br>", message); } else { @@ -1245,7 +1244,6 @@ write_html (EItipControl *itip, const gchar *itip_desc, const gchar *itip_title, gtk_html_end (GTK_HTML (priv->html), html_stream, GTK_HTML_STREAM_OK); } - static gchar * get_publish_options (void) { @@ -1293,7 +1291,6 @@ get_cancel_options (gboolean found, icalcomponent_kind kind) return g_strdup_printf ("<object classid=\"itip:cancel_options\"></object>"); } - static ECalComponent * get_real_item (EItipControl *itip) { @@ -1816,7 +1813,6 @@ e_itip_control_get_view_only (EItipControl *itip) return priv->view_only; } - void e_itip_control_set_delegator_address (EItipControl *itip, const gchar *address) { @@ -1840,7 +1836,6 @@ e_itip_control_get_delegator_address (EItipControl *itip) return priv->delegator_address; } - void e_itip_control_set_delegator_name (EItipControl *itip, const gchar *name) { @@ -1887,7 +1882,6 @@ e_itip_control_get_calendar_uid (EItipControl *itip) return priv->calendar_uid; } - static gboolean change_status (icalcomponent *ical_comp, const gchar *address, icalparameter_partstat status) { diff --git a/calendar/gui/e-meeting-attendee.c b/calendar/gui/e-meeting-attendee.c index 52d5860e29..fea2697344 100644 --- a/calendar/gui/e-meeting-attendee.c +++ b/calendar/gui/e-meeting-attendee.c @@ -615,7 +615,6 @@ e_meeting_attendee_get_atype (EMeetingAttendee *ia) return E_MEETING_ATTENDEE_OPTIONAL_PERSON; } - EMeetingAttendeeEditLevel e_meeting_attendee_get_edit_level (EMeetingAttendee *ia) { @@ -642,7 +641,6 @@ e_meeting_attendee_set_edit_level (EMeetingAttendee *ia, EMeetingAttendeeEditLev priv->edit_level = level; } - static gint compare_times (EMeetingTime *time1, EMeetingTime *time2) diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c index 924ab6720d..55e3af816e 100644 --- a/calendar/gui/e-meeting-list-view.c +++ b/calendar/gui/e-meeting-list-view.c @@ -120,7 +120,6 @@ e_meeting_list_view_class_init (EMeetingListViewClass *klass) G_TYPE_POINTER); } - static void add_section (ENameSelector *name_selector, const gchar *name) { @@ -281,7 +280,6 @@ e_meeting_list_view_remove_attendee_from_name_selector (EMeetingListView *view, const gchar *attendee = NULL; EDestination *des = l->data; - if (e_destination_is_evolution_list (des)) { GList *l, *dl; @@ -473,7 +471,6 @@ attendee_editing_canceled_cb (GtkCellRenderer *renderer, GtkTreeView *view) gtk_tree_path_free (path); } - static void type_edited_cb (GtkCellRenderer *renderer, const gchar *path, const gchar *text, GtkTreeView *view) { @@ -661,7 +658,6 @@ row_activated_cb (GtkTreeSelection *selection, EMeetingListView *view) priv = view->priv; - if (!(paths = gtk_tree_selection_get_selected_rows (selection, &model))) return; if (g_list_length (paths) > 1) @@ -694,7 +690,6 @@ row_activated_cb (GtkTreeSelection *selection, EMeetingListView *view) } - EMeetingListView * e_meeting_list_view_new (EMeetingStore *store) { @@ -863,7 +858,6 @@ process_section (EMeetingListView *view, GList *destinations, icalparameter_role if (contact) fburi = e_contact_get (contact, E_CONTACT_FREEBUSY_URL); - if (e_meeting_store_find_attendee (priv->store, attendee, NULL) == NULL) { EMeetingAttendee *ia = e_meeting_store_add_attendee_with_defaults (priv->store); @@ -1003,4 +997,3 @@ e_meeting_list_view_set_name_selector (EMeetingListView *lview, ENameSelector *n priv->name_selector = g_object_ref (name_selector); } - diff --git a/calendar/gui/e-meeting-list-view.h b/calendar/gui/e-meeting-list-view.h index 50aad0c966..6a2dc55523 100644 --- a/calendar/gui/e-meeting-list-view.h +++ b/calendar/gui/e-meeting-list-view.h @@ -36,7 +36,6 @@ G_BEGIN_DECLS #define E_IS_MEETING_LIST_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MEETING_LIST_VIEW)) #define E_IS_MEETING_LIST_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MEETING_LIST_VIEW)) - typedef struct _EMeetingListView EMeetingListView; typedef struct _EMeetingListViewPrivate EMeetingListViewPrivate; typedef struct _EMeetingListViewClass EMeetingListViewClass; diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c index da60b19f43..20bc6388da 100644 --- a/calendar/gui/e-meeting-store.c +++ b/calendar/gui/e-meeting-store.c @@ -76,7 +76,6 @@ struct _EMeetingStoreQueueData { GPtrArray *data; }; - static GObjectClass *parent_class = NULL; static icalparameter_cutype @@ -565,7 +564,6 @@ ems_class_init (GObjectClass *klass) klass->finalize = ems_finalize; } - static void ems_init (EMeetingStore *store) { @@ -629,7 +627,6 @@ e_meeting_store_new (void) return g_object_new (E_TYPE_MEETING_STORE, NULL); } - ECal * e_meeting_store_get_e_cal (EMeetingStore *store) { @@ -1203,7 +1200,6 @@ freebusy_async (gpointer data) #undef USER_SUB #undef DOMAIN_SUB - static gboolean refresh_busy_periods (gpointer data) { @@ -1278,8 +1274,6 @@ refresh_busy_periods (gpointer data) } - - g_mutex_lock (store->priv->mutex); store->priv->num_threads++; g_mutex_unlock (store->priv->mutex); @@ -1292,7 +1286,6 @@ refresh_busy_periods (gpointer data) g_free (fbd->email); priv->refresh_idle_id = 0; - g_mutex_lock (store->priv->mutex); store->priv->num_threads--; g_mutex_unlock (store->priv->mutex); @@ -1360,7 +1353,6 @@ refresh_queue_add (EMeetingStore *store, gint row, } g_mutex_unlock (priv->mutex); - g_object_ref (attendee); g_ptr_array_add (priv->refresh_queue, attendee); diff --git a/calendar/gui/e-meeting-time-sel-item.c b/calendar/gui/e-meeting-time-sel-item.c index 00efabe029..90a12b51df 100644 --- a/calendar/gui/e-meeting-time-sel-item.c +++ b/calendar/gui/e-meeting-time-sel-item.c @@ -126,7 +126,6 @@ e_meeting_time_selector_item_class_init (EMeetingTimeSelectorItemClass *class) G_PARAM_WRITABLE)); } - static void e_meeting_time_selector_item_init (EMeetingTimeSelectorItem *mts_item) { @@ -149,7 +148,6 @@ e_meeting_time_selector_item_init (EMeetingTimeSelectorItem *mts_item) item->y2 = 0; } - static void e_meeting_time_selector_item_dispose (GObject *object) { @@ -173,7 +171,6 @@ e_meeting_time_selector_item_dispose (GObject *object) G_OBJECT_CLASS (e_meeting_time_selector_item_parent_class)->dispose (object); } - static void e_meeting_time_selector_item_set_property (GObject *object, guint property_id, @@ -193,7 +190,6 @@ e_meeting_time_selector_item_set_property (GObject *object, G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); } - static void e_meeting_time_selector_item_realize (GnomeCanvasItem *item) { @@ -213,7 +209,6 @@ e_meeting_time_selector_item_realize (GnomeCanvasItem *item) mts_item->stipple_gc = gdk_gc_new (window); } - static void e_meeting_time_selector_item_unrealize (GnomeCanvasItem *item) { @@ -230,7 +225,6 @@ e_meeting_time_selector_item_unrealize (GnomeCanvasItem *item) (*GNOME_CANVAS_ITEM_CLASS (e_meeting_time_selector_item_parent_class)->unrealize)(item); } - static void e_meeting_time_selector_item_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, gint flags) { @@ -244,7 +238,6 @@ e_meeting_time_selector_item_update (GnomeCanvasItem *item, double *affine, ArtS item->y2 = INT_MAX; } - /* * DRAWING ROUTINES - functions to paint the canvas item. */ @@ -381,7 +374,6 @@ e_meeting_time_selector_item_draw (GnomeCanvasItem *item, GdkDrawable *drawable, else e_meeting_time_selector_item_paint_busy_periods (mts_item, drawable, &date, x, y, width, height); - /* Draw the currently-selected meeting time vertical bars. */ if (show_meeting_time) { if (is_display_top) { @@ -414,7 +406,6 @@ e_meeting_time_selector_item_draw (GnomeCanvasItem *item, GdkDrawable *drawable, cairo_destroy (cr); } - static void e_meeting_time_selector_item_paint_day_top (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, GDate *date, @@ -510,7 +501,6 @@ e_meeting_time_selector_item_paint_day_top (EMeetingTimeSelectorItem *mts_item, g_object_unref (layout); } - /* This paints the colored bars representing busy periods for the combined list of attendees. For now we just paint the bars for each attendee of each other. If we want to speed it up we could optimise it later. */ @@ -561,7 +551,6 @@ e_meeting_time_selector_item_paint_all_attendees_busy_periods (EMeetingTimeSelec cairo_destroy (cr); } - static void e_meeting_time_selector_item_paint_day (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, GDate *date, @@ -632,10 +621,8 @@ e_meeting_time_selector_item_paint_day (EMeetingTimeSelectorItem *mts_item, 2, height - unused_y); } - } - /* This paints the colored bars representing busy periods for the individual attendees. */ static void @@ -685,7 +672,6 @@ e_meeting_time_selector_item_paint_busy_periods (EMeetingTimeSelectorItem *mts_i cairo_destroy (cr); } - /* This subtracts the attendees longest_period_in_days from the given date, and does a binary search of the attendee's busy periods array to find the first one which could possible end on the given day or later. @@ -717,7 +703,6 @@ e_meeting_time_selector_item_find_first_busy_period (EMeetingTimeSelectorItem *m return period_num; } - /* This paints the visible busy periods for one attendee which are of a certain busy type, e.g out of office. It is passed the index of the first visible busy period of the attendee and continues until it runs off the screen. */ @@ -789,7 +774,6 @@ e_meeting_time_selector_item_paint_attendee_busy_periods (EMeetingTimeSelectorIt } } - /* * CANVAS ITEM ROUTINES - functions to be a GnomeCanvasItem. */ @@ -806,7 +790,6 @@ e_meeting_time_selector_item_point (GnomeCanvasItem *item, double x, double y, return 0.0; } - static gint e_meeting_time_selector_item_event (GnomeCanvasItem *item, GdkEvent *event) { @@ -831,7 +814,6 @@ e_meeting_time_selector_item_event (GnomeCanvasItem *item, GdkEvent *event) return FALSE; } - /* This handles all button press events for the item. If the cursor is over one of the meeting time vertical bars we start a drag. If not we set the meeting time to the nearest half-hour interval. @@ -940,11 +922,9 @@ e_meeting_time_selector_item_button_press (EMeetingTimeSelectorItem *mts_item, end_time.hour, end_time.minute); - return FALSE; } - /* This handles all button release events for the item. If we were dragging, we finish the drag. */ static gint @@ -966,7 +946,6 @@ e_meeting_time_selector_item_button_release (EMeetingTimeSelectorItem *mts_item, return FALSE; } - /* This handles all motion notify events for the item. If button1 is pressed we check if a drag is in progress. If not, we set the cursor if we are over the meeting time vertical bars. Note that GnomeCanvas doesn't use motion @@ -1010,7 +989,6 @@ e_meeting_time_selector_item_motion_notify (EMeetingTimeSelectorItem *mts_item, return FALSE; } - static EMeetingTimeSelectorPosition e_meeting_time_selector_item_get_drag_position (EMeetingTimeSelectorItem *mts_item, gint x, gint y) @@ -1038,7 +1016,6 @@ e_meeting_time_selector_item_get_drag_position (EMeetingTimeSelectorItem *mts_it return E_MEETING_TIME_SELECTOR_POS_NONE; } - static gboolean e_meeting_time_selector_item_calculate_busy_range (EMeetingTimeSelector *mts, gint row, diff --git a/calendar/gui/e-meeting-time-sel-item.h b/calendar/gui/e-meeting-time-sel-item.h index e9daa3d56a..547f01aaf6 100644 --- a/calendar/gui/e-meeting-time-sel-item.h +++ b/calendar/gui/e-meeting-time-sel-item.h @@ -35,12 +35,10 @@ G_BEGIN_DECLS - #define E_MEETING_TIME_SELECTOR_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), e_meeting_time_selector_item_get_type (), EMeetingTimeSelectorItem)) #define E_MEETING_TIME_SELECTOR_ITEM_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), e_meeting_time_selector_item_get_type (), EMeetingTimeSelectorItemClass)) #define IS_E_MEETING_TIME_SELECTOR_ITEM(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), e_meeting_time_selector_item_get_type ())) - typedef struct _EMeetingTimeSelectorItem EMeetingTimeSelectorItem; typedef struct _EMeetingTimeSelectorItemClass EMeetingTimeSelectorItemClass; @@ -65,7 +63,6 @@ struct _EMeetingTimeSelectorItem GdkCursor *last_cursor_set; }; - struct _EMeetingTimeSelectorItemClass { GnomeCanvasItemClass parent_class; @@ -74,5 +71,4 @@ struct _EMeetingTimeSelectorItemClass GType e_meeting_time_selector_item_get_type (void); void e_meeting_time_selector_item_set_normal_cursor (EMeetingTimeSelectorItem *mts_item); - #endif /* _E_MEETING_TIME_SELECTOR_ITEM_H_ */ diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c index 16b6a9d48c..9ca98268e7 100644 --- a/calendar/gui/e-meeting-time-sel.c +++ b/calendar/gui/e-meeting-time-sel.c @@ -81,7 +81,6 @@ enum { LAST_SIGNAL }; - static gint mts_signals [LAST_SIGNAL] = { 0 }; static void e_meeting_time_selector_destroy (GtkObject *object); @@ -162,7 +161,6 @@ static EMeetingFreeBusyPeriod* e_meeting_time_selector_find_time_clash (EMeeting EMeetingTime *start_time, EMeetingTime *end_time); - static void e_meeting_time_selector_recalc_grid (EMeetingTimeSelector *mts); static void e_meeting_time_selector_recalc_date_format (EMeetingTimeSelector *mts); static void e_meeting_time_selector_save_position (EMeetingTimeSelector *mts, @@ -220,7 +218,6 @@ e_meeting_time_selector_class_init (EMeetingTimeSelectorClass * klass) widget_class->expose_event = e_meeting_time_selector_expose_event; } - static void e_meeting_time_selector_init (EMeetingTimeSelector * mts) { @@ -247,7 +244,6 @@ e_meeting_time_selector_init (EMeetingTimeSelector * mts) mts->style_change_idle_id = 0; } - void e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *ems) { @@ -298,7 +294,6 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *em gtk_box_pack_start (GTK_BOX (vbox), mts->attendees_vbox, TRUE, TRUE, 0); gtk_widget_show (mts->attendees_vbox); - /* build the etable */ mts->model = ems; @@ -317,7 +312,6 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *em gtk_widget_show (GTK_WIDGET (mts->list_view)); - sw = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_IN); @@ -675,7 +669,6 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *em g_signal_emit (mts, mts_signals [CHANGED], 0); } - /* This adds a color to the color key beneath the main display. If color is NULL, it displays the No Info stipple instead. */ static void @@ -739,7 +732,6 @@ e_meeting_time_selector_expose_key_color (GtkWidget *darea, return TRUE; } - static void e_meeting_time_selector_alloc_named_color (EMeetingTimeSelector * mts, const gchar *name, GdkColor *c) @@ -755,7 +747,6 @@ e_meeting_time_selector_alloc_named_color (EMeetingTimeSelector * mts, g_warning ("Failed to allocate color: %s\n", name); } - static void e_meeting_time_selector_options_menu_detacher (GtkWidget *widget, GtkMenu *menu) @@ -771,7 +762,6 @@ e_meeting_time_selector_options_menu_detacher (GtkWidget *widget, mts->options_menu = NULL; } - static void e_meeting_time_selector_autopick_menu_detacher (GtkWidget *widget, GtkMenu *menu) @@ -787,7 +777,6 @@ e_meeting_time_selector_autopick_menu_detacher (GtkWidget *widget, mts->autopick_menu = NULL; } - GtkWidget * e_meeting_time_selector_new (EMeetingStore *ems) { @@ -800,7 +789,6 @@ e_meeting_time_selector_new (EMeetingStore *ems) return mts; } - static void e_meeting_time_selector_destroy (GtkObject *object) { @@ -842,7 +830,6 @@ e_meeting_time_selector_destroy (GtkObject *object) (*GTK_OBJECT_CLASS (e_meeting_time_selector_parent_class)->destroy)(object); } - static void e_meeting_time_selector_realize (GtkWidget *widget) { @@ -856,7 +843,6 @@ e_meeting_time_selector_realize (GtkWidget *widget) mts->color_key_gc = gdk_gc_new (widget->window); } - static void e_meeting_time_selector_unrealize (GtkWidget *widget) { @@ -1001,7 +987,6 @@ e_meeting_time_selector_draw_shadow (EMeetingTimeSelector *mts) GTK_SHADOW_IN, NULL, NULL, NULL, x, y, w, h); } - /* When the main canvas scrolls, we scroll the other canvases. */ static void e_meeting_time_selector_hadjustment_changed (GtkAdjustment *adjustment, @@ -1016,7 +1001,6 @@ e_meeting_time_selector_hadjustment_changed (GtkAdjustment *adjustment, } } - static void e_meeting_time_selector_vadjustment_changed (GtkAdjustment *adjustment, EMeetingTimeSelector *mts) @@ -1056,7 +1040,6 @@ e_meeting_time_selector_get_meeting_time (EMeetingTimeSelector *mts, *end_minute = mts->meeting_end_time.minute; } - gboolean e_meeting_time_selector_set_meeting_time (EMeetingTimeSelector *mts, gint start_year, @@ -1126,7 +1109,6 @@ e_meeting_time_selector_set_all_day (EMeetingTimeSelector *mts, e_meeting_time_selector_update_date_popup_menus (mts); } - void e_meeting_time_selector_set_working_hours_only (EMeetingTimeSelector *mts, gboolean working_hours_only) @@ -1149,7 +1131,6 @@ e_meeting_time_selector_set_working_hours_only (EMeetingTimeSelector *mts, e_meeting_time_selector_update_date_popup_menus (mts); } - void e_meeting_time_selector_set_working_hours (EMeetingTimeSelector *mts, gint day_start_hour, @@ -1188,7 +1169,6 @@ e_meeting_time_selector_set_working_hours (EMeetingTimeSelector *mts, e_meeting_time_selector_update_date_popup_menus (mts); } - void e_meeting_time_selector_set_zoomed_out (EMeetingTimeSelector *mts, gboolean zoomed_out) @@ -1285,7 +1265,6 @@ e_meeting_time_selector_get_autopick_option (EMeetingTimeSelector *mts) return E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE_AND_ONE_RESOURCE; } - void e_meeting_time_selector_set_autopick_option (EMeetingTimeSelector *mts, EMeetingTimeSelectorAutopickOption autopick_option) @@ -1391,7 +1370,6 @@ e_meeting_time_selector_dump (EMeetingTimeSelector *mts) } - /* This formats a EMeetingTimein a string and returns it. Note that it uses a static buffer. */ gchar * @@ -1411,7 +1389,6 @@ e_meeting_time_selector_dump_time (EMeetingTime*mtstime) return buffer; } - /* This formats a GDate in a string and returns it. Note that it uses a static buffer. */ gchar * @@ -1433,7 +1410,6 @@ e_meeting_time_selector_on_invite_others_button_clicked (GtkWidget *button, e_meeting_list_view_invite_others_dialog (mts->list_view); } - static void e_meeting_time_selector_on_options_button_clicked (GtkWidget *button, EMeetingTimeSelector *mts) @@ -1443,7 +1419,6 @@ e_meeting_time_selector_on_options_button_clicked (GtkWidget *button, mts, 1, GDK_CURRENT_TIME); } - static void e_meeting_time_selector_options_menu_position_callback (GtkMenu *menu, gint *x, @@ -1482,7 +1457,6 @@ e_meeting_time_selector_on_update_free_busy (GtkWidget *button, e_meeting_time_selector_refresh_free_busy (mts, 0, TRUE); } - static void e_meeting_time_selector_on_autopick_button_clicked (GtkWidget *button, EMeetingTimeSelector *mts) @@ -1492,7 +1466,6 @@ e_meeting_time_selector_on_autopick_button_clicked (GtkWidget *button, mts, 1, GDK_CURRENT_TIME); } - static void e_meeting_time_selector_autopick_menu_position_callback (GtkMenu *menu, gint *x, @@ -1519,7 +1492,6 @@ e_meeting_time_selector_autopick_menu_position_callback (GtkMenu *menu, *y = CLAMP (*y, 0, max_y); } - static void e_meeting_time_selector_on_autopick_option_toggled (GtkWidget *button, EMeetingTimeSelector *mts) @@ -1530,7 +1502,6 @@ e_meeting_time_selector_on_autopick_option_toggled (GtkWidget *button, gtk_menu_popdown (GTK_MENU (mts->autopick_menu)); } - static void e_meeting_time_selector_on_prev_button_clicked (GtkWidget *button, EMeetingTimeSelector *mts) @@ -1538,7 +1509,6 @@ e_meeting_time_selector_on_prev_button_clicked (GtkWidget *button, e_meeting_time_selector_autopick (mts, FALSE); } - static void e_meeting_time_selector_on_next_button_clicked (GtkWidget *button, EMeetingTimeSelector *mts) @@ -1546,7 +1516,6 @@ e_meeting_time_selector_on_next_button_clicked (GtkWidget *button, e_meeting_time_selector_autopick (mts, TRUE); } - /* This tries to find the previous or next meeting time for which all attendees will be available. */ static void @@ -1671,7 +1640,6 @@ e_meeting_time_selector_autopick (EMeetingTimeSelector *mts, } } - static void e_meeting_time_selector_calculate_time_difference (EMeetingTime*start, EMeetingTime*end, @@ -1692,7 +1660,6 @@ e_meeting_time_selector_calculate_time_difference (EMeetingTime*start, } } - /* This moves the given time forward to the next suitable start of a meeting. If zoomed_out is set, this means every hour. If not every half-hour. */ static void @@ -1769,7 +1736,6 @@ e_meeting_time_selector_find_nearest_interval (EMeetingTimeSelector *mts, } } - /* This moves the given time backward to the next suitable start of a meeting. If zoomed_out is set, this means every hour. If not every half-hour. */ static void @@ -1854,7 +1820,6 @@ e_meeting_time_selector_find_nearest_interval_backward (EMeetingTimeSelector *mt } } - /* This adds on the given days, hours & minutes to a EMeetingTimeSelectorTime. It is used to calculate the end of a period given a start & duration. Days, hours & minutes can be negative, to move backwards, but they should @@ -1886,7 +1851,6 @@ e_meeting_time_selector_adjust_time (EMeetingTime*mtstime, e_meeting_time_selector_fix_time_overflows (mtstime); } - /* This looks for any busy period of the given attendee which clashes with the start and end time. It uses a binary search. */ static EMeetingFreeBusyPeriod * @@ -1941,7 +1905,6 @@ e_meeting_time_selector_on_zoomed_out_toggled (GtkWidget *menuitem, e_meeting_time_selector_ensure_meeting_time_shown (mts); } - static void e_meeting_time_selector_on_working_hours_toggled (GtkWidget *menuitem, EMeetingTimeSelector *mts) @@ -1955,7 +1918,6 @@ e_meeting_time_selector_on_working_hours_toggled (GtkWidget *menuitem, e_meeting_time_selector_ensure_meeting_time_shown (mts); } - /* This recalculates day_width, first_hour_shown and last_hour_shown. */ static void e_meeting_time_selector_recalc_grid (EMeetingTimeSelector *mts) @@ -1994,7 +1956,6 @@ e_meeting_time_selector_recalc_grid (EMeetingTimeSelector *mts) mts->meeting_positions_valid = FALSE; } - /* This saves the first visible time in the given EMeetingTimeSelectorTime. */ static void e_meeting_time_selector_save_position (EMeetingTimeSelector *mts, @@ -2007,7 +1968,6 @@ e_meeting_time_selector_save_position (EMeetingTimeSelector *mts, e_meeting_time_selector_calculate_time (mts, scroll_x, mtstime); } - /* This restores a saved position. */ static void e_meeting_time_selector_restore_position (EMeetingTimeSelector *mts, @@ -2023,7 +1983,6 @@ e_meeting_time_selector_restore_position (EMeetingTimeSelector *mts, new_scroll_x, scroll_y); } - /* This returns the x pixel coords of the meeting time in the entire scroll region. It recalculates them if they have been marked as invalid. If it returns FALSE then no meeting time is set or the meeting time is @@ -2059,7 +2018,6 @@ e_meeting_time_selector_get_meeting_time_positions (EMeetingTimeSelector *mts, return TRUE; } - /* This recalculates the date format to used, by computing the width of the longest date strings in the widget's font and seeing if they fit. */ static void @@ -2169,7 +2127,6 @@ e_meeting_time_selector_recalc_date_format (EMeetingTimeSelector *mts) g_object_unref (layout); } - /* Turn off the background of the canvas windows. This reduces flicker considerably when scrolling. (Why isn't it in GnomeCanvas?). */ static void @@ -2180,7 +2137,6 @@ e_meeting_time_selector_on_canvas_realized (GtkWidget *widget, NULL, FALSE); } - /* This is called when the meeting start time GnomeDateEdit is changed, either via the "date_changed". "time_changed" or "activate" signals on one of the GtkEntry widgets. So don't use the widget parameter since it may be @@ -2227,7 +2183,6 @@ e_meeting_time_selector_on_start_time_changed (GtkWidget *widget, g_signal_emit (mts, mts_signals [CHANGED], 0); } - /* This is called when the meeting end time GnomeDateEdit is changed, either via the "date_changed", "time_changed" or "activate" signals on one of the GtkEntry widgets. So don't use the widget parameter since it may be @@ -2277,7 +2232,6 @@ e_meeting_time_selector_on_end_time_changed (GtkWidget *widget, g_signal_emit (mts, mts_signals [CHANGED], 0); } - /* This updates the ranges shown in the GnomeDateEdit popup menus, according to working_hours_only etc. */ static void @@ -2301,7 +2255,6 @@ e_meeting_time_selector_update_date_popup_menus (EMeetingTimeSelector *mts) e_date_edit_set_time_popup_range (end_edit, low_hour, high_hour); } - static void e_meeting_time_selector_on_canvas_size_allocate (GtkWidget *widget, GtkAllocation *allocation, @@ -2342,7 +2295,6 @@ e_meeting_time_selector_update_main_canvas_scroll_region (EMeetingTimeSelector * height); } - /* This changes the meeting time based on the given x coordinate and whether we are dragging the start or end bar. It returns the new position, which will be swapped if the start bar is dragged past the end bar or vice versa. @@ -2472,7 +2424,6 @@ e_meeting_time_selector_drag_meeting_time (EMeetingTimeSelector *mts, set_both_times = TRUE; } - /* Mark the calculated positions as invalid. */ mts->meeting_positions_valid = FALSE; @@ -2495,7 +2446,6 @@ e_meeting_time_selector_drag_meeting_time (EMeetingTimeSelector *mts, g_signal_emit (mts, mts_signals [CHANGED], 0); } - /* This is the timeout function which handles auto-scrolling when the user is dragging one of the meeting time vertical bars outside the left or right edge of the canvas. */ @@ -2648,7 +2598,6 @@ e_meeting_time_selector_timeout_handler (gpointer data) return TRUE; } - /* This removes our auto-scroll timeout function, if we have one installed. */ void e_meeting_time_selector_remove_timeout (EMeetingTimeSelector *mts) @@ -2659,7 +2608,6 @@ e_meeting_time_selector_remove_timeout (EMeetingTimeSelector *mts) } } - /* This updates the GnomeDateEdit widget displaying the meeting start time. */ static void e_meeting_time_selector_update_start_date_edit (EMeetingTimeSelector *mts) @@ -2672,7 +2620,6 @@ e_meeting_time_selector_update_start_date_edit (EMeetingTimeSelector *mts) mts->meeting_start_time.minute); } - /* This updates the GnomeDateEdit widget displaying the meeting end time. */ static void e_meeting_time_selector_update_end_date_edit (EMeetingTimeSelector *mts) @@ -2691,7 +2638,6 @@ e_meeting_time_selector_update_end_date_edit (EMeetingTimeSelector *mts) mts->meeting_end_time.minute); } - /* This ensures that the meeting time is shown on screen, by scrolling the canvas and possibly by changing the range of dates shown in the canvas. */ static void @@ -2731,7 +2677,6 @@ e_meeting_time_selector_ensure_meeting_time_shown (EMeetingTimeSelector *mts) new_scroll_x, scroll_y); } - /* This updates the range of dates shown in the canvas, to make sure that the currently selected meeting time is in the range. */ static void @@ -2746,7 +2691,6 @@ e_meeting_time_selector_update_dates_shown (EMeetingTimeSelector *mts) E_MEETING_TIME_SELECTOR_DAYS_SHOWN - 1); } - /* This checks if the time's hour is over 24 or its minute is over 60 and if so it updates the day/hour appropriately. Note that hours and minutes are stored in guint8's so they can't overflow by much. */ @@ -2802,7 +2746,6 @@ e_meeting_time_selector_calculate_day_and_position (EMeetingTimeSelector *mts, } } - /* This takes an x pixel coordinate within a day, and converts it to hours and minutes, depending on working_hours_only and zoomed_out. */ void @@ -2819,7 +2762,6 @@ e_meeting_time_selector_convert_day_position_to_hours_and_mins (EMeetingTimeSele *hours += mts->first_hour_shown; } - /* This takes an x pixel coordinate within the entire canvas scroll region and returns the time in which it falls. Note that it won't be extremely accurate since hours may only be a few pixels wide in the display. @@ -2845,7 +2787,6 @@ e_meeting_time_selector_calculate_time (EMeetingTimeSelector *mts, e_meeting_time_selector_convert_day_position_to_hours_and_mins (mts, day_position, &time->hour, &time->minute); } - /* This takes a EMeetingTime and calculates the x pixel coordinate within the entire canvas scroll region. It is used to draw the selected meeting time and all the busy periods. */ @@ -2915,7 +2856,6 @@ row_deleted_cb (GtkTreeModel *model, GtkTreePath *path, gpointer data) gtk_widget_queue_draw (mts->display_main); } - #define REFRESH_PAUSE 5 static gboolean diff --git a/calendar/gui/e-meeting-time-sel.h b/calendar/gui/e-meeting-time-sel.h index 97be769917..b38dd98f74 100644 --- a/calendar/gui/e-meeting-time-sel.h +++ b/calendar/gui/e-meeting-time-sel.h @@ -48,7 +48,6 @@ G_BEGIN_DECLS #define E_MEETING_TIME_SELECTOR_TEXT_Y_PAD 3 #define E_MEETING_TIME_SELECTOR_TEXT_X_PAD 2 - /* This is used to specify the format used when displaying the dates. The full format is like 'Sunday, September 12, 1999'. The abbreviated format is like 'Sun 12/9/99'. The short format is like '12/9/99'. The actual @@ -61,7 +60,6 @@ typedef enum E_MEETING_TIME_SELECTOR_DATE_SHORT } EMeetingTimeSelectorDateFormat; - /* This is used to specify a position regarding the vertical bars around the current meeting time, so we know which one is being dragged. */ typedef enum @@ -71,7 +69,6 @@ typedef enum E_MEETING_TIME_SELECTOR_POS_END } EMeetingTimeSelectorPosition; - /* This is used to specify the autopick option, which determines how we choose the previous/next appropriate meeting time. */ typedef enum @@ -87,12 +84,10 @@ extern const gchar *EMeetingTimeSelectorHours[24]; /* An array of hour strings for 12 hour time, "12:00am" .. "11:00pm". */ extern const gchar *EMeetingTimeSelectorHours12[24]; - #define E_MEETING_TIME_SELECTOR(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, e_meeting_time_selector_get_type (), EMeetingTimeSelector) #define E_MEETING_TIME_SELECTOR_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, e_meeting_time_selector_get_type (), EMeetingTimeSelectorClass) #define IS_E_MEETING_TIME_SELECTOR(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, e_meeting_time_selector_get_type ()) - typedef struct _EMeetingTimeSelector EMeetingTimeSelector; typedef struct _EMeetingTimeSelectorClass EMeetingTimeSelectorClass; @@ -200,7 +195,6 @@ struct _EMeetingTimeSelector than every hour. Defaults to FALSE. */ gboolean zoomed_out; - /* * Internal Data. */ @@ -263,7 +257,6 @@ struct _EMeetingTimeSelector guint style_change_idle_id; }; - struct _EMeetingTimeSelectorClass { GtkTableClass parent_class; @@ -271,7 +264,6 @@ struct _EMeetingTimeSelectorClass void (* changed) (EMeetingTimeSelector *mts); }; - /* * PUBLIC INTERFACE - note that this interface will probably change, when I * know where the data is coming from. This is mainly just for testing for now. @@ -351,8 +343,6 @@ gboolean e_meeting_time_selector_attendee_add_busy_period (EMeetingTimeSelector gint end_minute, EMeetingFreeBusyType busy_type); - - /* * INTERNAL ROUTINES - functions to communicate with the canvas items within * the EMeetingTimeSelector. diff --git a/calendar/gui/e-meeting-utils.h b/calendar/gui/e-meeting-utils.h index cd2e76df38..1777d2c7ff 100644 --- a/calendar/gui/e-meeting-utils.h +++ b/calendar/gui/e-meeting-utils.h @@ -42,4 +42,3 @@ G_END_DECLS #endif /* _E_MEETING_UTILS_H_ */ - diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c index 4c6cd9b865..1cfc2b662b 100644 --- a/calendar/gui/e-memo-table.c +++ b/calendar/gui/e-memo-table.c @@ -782,7 +782,6 @@ e_memo_table_get_model (EMemoTable *memo_table) return memo_table->priv->model; } - /** * e_memo_table_get_table: * @memo_table: A calendar table. @@ -1208,7 +1207,6 @@ e_memo_table_load_state (EMemoTable *memo_table, e_table_load_state (table, filename); } - /* Saves the state of the table (headers shown etc.) to the given file. */ void e_memo_table_save_state (EMemoTable *memo_table, diff --git a/calendar/gui/e-memos.c b/calendar/gui/e-memos.c index 3ac375abba..8a10802bff 100644 --- a/calendar/gui/e-memos.c +++ b/calendar/gui/e-memos.c @@ -52,7 +52,6 @@ #include "e-memos.h" #include "common/authentication.h" - /* Private part of the GnomeCalendar structure */ struct _EMemosPrivate { /* The memo lists for display */ @@ -269,7 +268,6 @@ e_memos_class_init (EMemosClass *klass) klass->source_removed = NULL; } - static void categories_changed_cb (gpointer object, gpointer user_data) { diff --git a/calendar/gui/e-memos.h b/calendar/gui/e-memos.h index 2c0f69f87d..4c49f56a79 100644 --- a/calendar/gui/e-memos.h +++ b/calendar/gui/e-memos.h @@ -57,7 +57,6 @@ struct _EMemosClass { void (* source_removed) (EMemos *memos, ESource *source); }; - GType e_memos_get_type (void); GtkWidget *e_memos_construct (EMemos *memos); @@ -73,7 +72,6 @@ void e_memos_new_memo (EMemos *memos); void e_memos_complete_selected (EMemos *memos); void e_memos_delete_selected (EMemos *memos); - void e_memos_setup_view_menus (EMemos *memos, BonoboUIComponent *uic); void e_memos_discard_view_menus (EMemos *memos); diff --git a/calendar/gui/e-select-names-renderer.c b/calendar/gui/e-select-names-renderer.c index f1aa1ec45d..0f82c3237e 100644 --- a/calendar/gui/e-select-names-renderer.c +++ b/calendar/gui/e-select-names-renderer.c @@ -27,7 +27,6 @@ #include "e-select-names-editable.h" #include "e-select-names-renderer.h" - struct _ESelectNamesRendererPriv { ESelectNamesEditable *editable; gchar *path; diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c index 9a5a894f4c..2f24ebfbc2 100644 --- a/calendar/gui/e-tasks.c +++ b/calendar/gui/e-tasks.c @@ -56,7 +56,6 @@ #include "e-cal-menu.h" #include "e-cal-model-tasks.h" - /* Private part of the GnomeCalendar structure */ struct _ETasksPrivate { /* The task lists for display */ @@ -244,7 +243,6 @@ table_drag_begin (ETable *table, } - static void table_drag_end (ETable *table, gint row, @@ -327,7 +325,6 @@ setup_widgets (ETasks *tasks) gtk_paned_add1 (GTK_PANED (priv->paned), priv->tasks_view); gtk_widget_show (priv->tasks_view); - e_table_drag_source_set (etable, GDK_BUTTON1_MASK, list_drag_types, num_list_drag_types, GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_ASK); @@ -408,7 +405,6 @@ e_tasks_class_init (ETasksClass *class) class->source_removed = NULL; } - /* Object initialization function for the gnome calendar */ static void e_tasks_init (ETasks *tasks) @@ -524,7 +520,6 @@ open_ecal (ETasks *tasks, ECal *cal, gboolean only_if_exists, open_func of) zone = calendar_config_get_icaltimezone (); e_cal_set_default_timezone (cal, zone, NULL); - set_status_message (tasks, _("Opening tasks at %s"), e_cal_get_uri (cal)); g_signal_connect (G_OBJECT (cal), "cal_opened", G_CALLBACK (of), tasks); @@ -594,7 +589,6 @@ e_tasks_remove_todo_source (ETasks *tasks, ESource *source) if (!client) return TRUE; - priv->clients_list = g_list_remove (priv->clients_list, client); g_signal_handlers_disconnect_matched (client, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, tasks); @@ -604,7 +598,6 @@ e_tasks_remove_todo_source (ETasks *tasks, ESource *source) g_hash_table_remove (priv->clients, uid); - g_signal_emit (tasks, e_tasks_signals[SOURCE_REMOVED], 0, source); return TRUE; diff --git a/calendar/gui/e-tasks.h b/calendar/gui/e-tasks.h index 628c34ace1..a37db26117 100644 --- a/calendar/gui/e-tasks.h +++ b/calendar/gui/e-tasks.h @@ -57,7 +57,6 @@ struct _ETasksClass { void (* source_removed) (ETasks *tasks, ESource *source); }; - GType e_tasks_get_type (void); GtkWidget *e_tasks_construct (ETasks *tasks); diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c index 28660fd3b9..f3e239aa63 100644 --- a/calendar/gui/e-timezone-entry.c +++ b/calendar/gui/e-timezone-entry.c @@ -49,7 +49,6 @@ struct _ETimezoneEntryPrivate { GtkWidget *button; }; - enum { CHANGED, LAST_SIGNAL @@ -70,7 +69,6 @@ static void add_relation (ETimezoneEntry *tentry, static void e_timezone_entry_set_entry (ETimezoneEntry *tentry); - static guint timezone_entry_signals[LAST_SIGNAL] = { 0 }; G_DEFINE_TYPE (ETimezoneEntry, e_timezone_entry, GTK_TYPE_HBOX) @@ -99,7 +97,6 @@ e_timezone_entry_class_init (ETimezoneEntryClass *class) class->changed = NULL; } - static void e_timezone_entry_init (ETimezoneEntry *tentry) { @@ -128,7 +125,6 @@ e_timezone_entry_init (ETimezoneEntry *tentry) } } - /** * e_timezone_entry_new: * @@ -149,7 +145,6 @@ e_timezone_entry_new (void) return GTK_WIDGET (tentry); } - static void e_timezone_entry_destroy (GtkObject *object) { @@ -166,7 +161,6 @@ e_timezone_entry_destroy (GtkObject *object) (* GTK_OBJECT_CLASS (e_timezone_entry_parent_class)->destroy) (object); } - /* The arrow button beside the date field has been clicked, so we show the popup with the ECalendar in. */ static void @@ -193,7 +187,6 @@ on_button_clicked (GtkWidget *widget, g_object_unref (timezone_dialog); } - static void on_entry_changed (GtkEntry *entry, ETimezoneEntry *tentry) @@ -201,7 +194,6 @@ on_entry_changed (GtkEntry *entry, g_signal_emit (GTK_OBJECT (tentry), timezone_entry_signals[CHANGED], 0); } - icaltimezone* e_timezone_entry_get_timezone (ETimezoneEntry *tentry) { @@ -272,7 +264,6 @@ e_timezone_entry_set_timezone (ETimezoneEntry *tentry, add_relation (tentry, priv->entry); } - /* Sets the default timezone. If the current timezone matches this, then the entry field is hidden. This is useful since most people do not use timezones so it makes the user interface simpler. */ @@ -291,7 +282,6 @@ e_timezone_entry_set_default_timezone (ETimezoneEntry *tentry, e_timezone_entry_set_entry (tentry); } - static void e_timezone_entry_set_entry (ETimezoneEntry *tentry) { @@ -325,7 +315,6 @@ e_timezone_entry_set_entry (ETimezoneEntry *tentry) g_free (name_buffer); } - static gboolean e_timezone_entry_mnemonic_activate (GtkWidget *widget, gboolean group_cycling) diff --git a/calendar/gui/e-timezone-entry.h b/calendar/gui/e-timezone-entry.h index 6c63fb8444..c1bf482aef 100644 --- a/calendar/gui/e-timezone-entry.h +++ b/calendar/gui/e-timezone-entry.h @@ -37,14 +37,12 @@ G_BEGIN_DECLS - #define E_TYPE_TIMEZONE_ENTRY (e_timezone_entry_get_type ()) #define E_TIMEZONE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_TIMEZONE_ENTRY, ETimezoneEntry)) #define E_TIMEZONE_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_TIMEZONE_ENTRY, ETimezoneEntryClass)) #define E_IS_TIMEZONE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_TIMEZONE_ENTRY)) #define E_IS_TIMEZONE_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_TIMEZONE_ENTRY)) - typedef struct _ETimezoneEntry ETimezoneEntry; typedef struct _ETimezoneEntryPrivate ETimezoneEntryPrivate; typedef struct _ETimezoneEntryClass ETimezoneEntryClass; diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c index 6ab551e6fc..8ad8b608a2 100644 --- a/calendar/gui/e-week-view-event-item.c +++ b/calendar/gui/e-week-view-event-item.c @@ -89,7 +89,6 @@ static ECalendarViewPosition e_week_view_event_item_get_position (EWeekViewEvent gdouble x, gdouble y); - /* The arguments we take */ enum { PROP_0, @@ -139,7 +138,6 @@ e_week_view_event_item_class_init (EWeekViewEventItemClass *class) G_PARAM_WRITABLE)); } - static void e_week_view_event_item_init (EWeekViewEventItem *wveitem) { @@ -147,7 +145,6 @@ e_week_view_event_item_init (EWeekViewEventItem *wveitem) wveitem->span_num = -1; } - static void e_week_view_event_item_set_property (GObject *object, guint property_id, @@ -174,7 +171,6 @@ e_week_view_event_item_set_property (GObject *object, G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); } - static void e_week_view_event_item_update (GnomeCanvasItem *item, double *affine, @@ -720,7 +716,6 @@ e_week_view_draw_time (EWeekView *week_view, g_object_unref (layout); } - static void e_week_view_event_item_draw_icons (EWeekViewEventItem *wveitem, GdkDrawable *drawable, @@ -859,7 +854,6 @@ e_week_view_event_item_draw_icons (EWeekViewEventItem *wveitem, gdk_gc_set_clip_mask (gc, NULL); } - /* This draws a little triangle to indicate that an event extends past the days visible on screen. */ static void @@ -922,7 +916,6 @@ e_week_view_event_item_draw_triangle (EWeekViewEventItem *wveitem, cairo_save (cr); gdk_cairo_set_source_color (cr, &week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BORDER]); - /* If the height is odd we can use the same central point for both lines. If it is even we use different end-points. */ c1 = c2 = y + (h / 2); @@ -951,7 +944,6 @@ e_week_view_event_item_point (GnomeCanvasItem *item, double x, double y, return 0.0; } - static gint e_week_view_event_item_event (GnomeCanvasItem *item, GdkEvent *event) { @@ -975,7 +967,6 @@ e_week_view_event_item_event (GnomeCanvasItem *item, GdkEvent *event) return FALSE; } - static gboolean e_week_view_event_item_button_press (EWeekViewEventItem *wveitem, GdkEvent *bevent) @@ -1045,7 +1036,6 @@ e_week_view_event_item_button_press (EWeekViewEventItem *wveitem, return FALSE; } - static gboolean e_week_view_event_item_button_release (EWeekViewEventItem *wveitem, GdkEvent *event) @@ -1109,7 +1099,6 @@ e_week_view_event_item_double_click (EWeekViewEventItem *wveitem, return TRUE; } - static ECalendarViewPosition e_week_view_event_item_get_position (EWeekViewEventItem *wveitem, gdouble x, diff --git a/calendar/gui/e-week-view-event-item.h b/calendar/gui/e-week-view-event-item.h index ebc5d07e07..6c077747f1 100644 --- a/calendar/gui/e-week-view-event-item.h +++ b/calendar/gui/e-week-view-event-item.h @@ -56,11 +56,8 @@ typedef struct { } EWeekViewEventItemClass; - GType e_week_view_event_item_get_type (void); - - G_END_DECLS #endif /* _E_WEEK_VIEW_EVENT_ITEM_H_ */ diff --git a/calendar/gui/e-week-view-layout.c b/calendar/gui/e-week-view-layout.c index 8f0cb5ece8..f28f77a020 100644 --- a/calendar/gui/e-week-view-layout.c +++ b/calendar/gui/e-week-view-layout.c @@ -45,7 +45,6 @@ static gint e_week_view_find_span_end (gboolean multi_week_view, gint display_start_day, gint day); - GArray* e_week_view_layout_events (GArray *events, GArray *old_spans, @@ -108,7 +107,6 @@ e_week_view_layout_events (GArray *events, return spans; } - static void e_week_view_layout_event (EWeekViewEvent *event, guint8 *grid, @@ -211,7 +209,6 @@ e_week_view_layout_event (EWeekViewEvent *event, event->num_spans = num_spans; } - /* Finds the day containing the given time. If include_midnight_in_prev_day is TRUE then if the time exactly matches the start of a day the previous day is returned. This is useful @@ -241,7 +238,6 @@ e_week_view_find_day (time_t time_to_find, g_return_val_if_reached (days_shown); } - /* This returns the last possible day in the same span as the given day. A span is all the days which are displayed next to each other from left to right. In the week view all spans are only 1 day, since Tuesday is below @@ -279,7 +275,6 @@ e_week_view_find_span_end (gboolean multi_week_view, } } - void e_week_view_layout_get_day_position (gint day, gboolean multi_week_view, @@ -403,7 +398,6 @@ e_week_view_layout_get_day_position (gint day, } } - /* Returns TRUE if the event span is visible or FALSE if it isn't. It also returns the number of days of the span that are visible. Usually this can easily be determined by the start & end days and row of diff --git a/calendar/gui/e-week-view-main-item.c b/calendar/gui/e-week-view-main-item.c index 3ea3e2e63b..ed4d14232b 100644 --- a/calendar/gui/e-week-view-main-item.c +++ b/calendar/gui/e-week-view-main-item.c @@ -98,14 +98,12 @@ e_week_view_main_item_class_init (EWeekViewMainItemClass *class) #endif } - static void e_week_view_main_item_init (EWeekViewMainItem *wvmitem) { wvmitem->week_view = NULL; } - static void e_week_view_main_item_set_property (GObject *object, guint property_id, @@ -125,7 +123,6 @@ e_week_view_main_item_set_property (GObject *object, G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); } - static void e_week_view_main_item_update (GnomeCanvasItem *item, double *affine, @@ -142,7 +139,6 @@ e_week_view_main_item_update (GnomeCanvasItem *item, item->y2 = INT_MAX; } - /* * DRAWING ROUTINES - functions to paint the canvas item. */ @@ -455,4 +451,3 @@ e_week_view_main_item_point (GnomeCanvasItem *item, double x, double y, return 0.0; } - diff --git a/calendar/gui/e-week-view-main-item.h b/calendar/gui/e-week-view-main-item.h index 135a25e662..3be9bbe5f3 100644 --- a/calendar/gui/e-week-view-main-item.h +++ b/calendar/gui/e-week-view-main-item.h @@ -52,11 +52,8 @@ typedef struct { } EWeekViewMainItemClass; - GType e_week_view_main_item_get_type (void); - - G_END_DECLS #endif /* _E_WEEK_VIEW_MAIN_ITEM_H_ */ diff --git a/calendar/gui/e-week-view-titles-item.c b/calendar/gui/e-week-view-titles-item.c index e9ff467b63..69108f43cb 100644 --- a/calendar/gui/e-week-view-titles-item.c +++ b/calendar/gui/e-week-view-titles-item.c @@ -82,14 +82,12 @@ e_week_view_titles_item_class_init (EWeekViewTitlesItemClass *class) G_PARAM_WRITABLE)); } - static void e_week_view_titles_item_init (EWeekViewTitlesItem *wvtitem) { wvtitem->week_view = NULL; } - static void e_week_view_titles_item_set_property (GObject *object, guint property_id, @@ -109,7 +107,6 @@ e_week_view_titles_item_set_property (GObject *object, G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); } - static void e_week_view_titles_item_update (GnomeCanvasItem *item, double *affine, @@ -126,7 +123,6 @@ e_week_view_titles_item_update (GnomeCanvasItem *item, item->y2 = INT_MAX; } - /* * DRAWING ROUTINES - functions to paint the canvas item. */ @@ -263,7 +259,6 @@ e_week_view_titles_item_draw (GnomeCanvasItem *canvas_item, g_object_unref (layout); } - /* 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. */ @@ -276,4 +271,3 @@ e_week_view_titles_item_point (GnomeCanvasItem *item, double x, double y, return 0.0; } - diff --git a/calendar/gui/e-week-view-titles-item.h b/calendar/gui/e-week-view-titles-item.h index 6ee6cdaa96..3b27034202 100644 --- a/calendar/gui/e-week-view-titles-item.h +++ b/calendar/gui/e-week-view-titles-item.h @@ -52,11 +52,8 @@ typedef struct { } EWeekViewTitlesItemClass; - GType e_week_view_titles_item_get_type (void); - - G_END_DECLS #endif /* _E_WEEK_VIEW_TITLES_ITEM_H_ */ diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index 6397ce94d1..838fda8478 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -373,7 +373,6 @@ model_row_changed_cb (ETableModel *etm, gint row, gpointer user_data) return; } - update_row (week_view, row); } @@ -664,7 +663,6 @@ e_week_view_new (ECalModel *model) return week_view; } - static void e_week_view_destroy (GtkObject *object) { @@ -713,7 +711,6 @@ e_week_view_destroy (GtkObject *object) GTK_OBJECT_CLASS (e_week_view_parent_class)->destroy (object); } - static void e_week_view_realize (GtkWidget *widget) { @@ -989,7 +986,6 @@ e_week_view_style_set (GtkWidget *widget, pango_font_metrics_unref (font_metrics); } - /* This recalculates the sizes of each column. */ static void e_week_view_size_allocate (GtkWidget *widget, GtkAllocation *allocation) @@ -1012,7 +1008,6 @@ e_week_view_size_allocate (GtkWidget *widget, GtkAllocation *allocation) gnome_canvas_set_scroll_region (GNOME_CANVAS (week_view->titles_canvas), 0, 0, new_x2, new_y2); - /* Set the scroll region of the main canvas to its allocated width, but with the height depending on the number of rows needed. */ gnome_canvas_get_scroll_region (GNOME_CANVAS (week_view->main_canvas), @@ -1030,7 +1025,6 @@ e_week_view_size_allocate (GtkWidget *widget, GtkAllocation *allocation) } } - static void e_week_view_recalc_cell_sizes (EWeekView *week_view) { @@ -1085,7 +1079,6 @@ e_week_view_recalc_cell_sizes (EWeekView *week_view) - week_view->row_offsets[row]; } - /* If the font hasn't been set yet just return. */ widget = GTK_WIDGET (week_view); style = gtk_widget_get_style (widget); @@ -1099,7 +1092,6 @@ e_week_view_recalc_cell_sizes (EWeekView *week_view) font_metrics = pango_context_get_metrics (pango_context, font_desc, pango_context_get_language (pango_context)); - /* Calculate the number of rows of events in each cell, for the large cells and the compressed weekend cells. */ if (week_view->multi_week_view) { @@ -1151,7 +1143,6 @@ e_week_view_recalc_cell_sizes (EWeekView *week_view) pango_font_metrics_unref (font_metrics); } - static gint e_week_view_focus_in (GtkWidget *widget, GdkEventFocus *event) { @@ -1170,7 +1161,6 @@ e_week_view_focus_in (GtkWidget *widget, GdkEventFocus *event) return FALSE; } - static gint e_week_view_focus_out (GtkWidget *widget, GdkEventFocus *event) { @@ -1189,7 +1179,6 @@ e_week_view_focus_out (GtkWidget *widget, GdkEventFocus *event) return FALSE; } - /* This draws a shadow around the top display and main display. */ static gint e_week_view_expose_event (GtkWidget *widget, @@ -1507,7 +1496,6 @@ e_week_view_set_selected_time_range_visible (EWeekView *week_view, gtk_widget_queue_draw (week_view->main_canvas); } - /* Returns the selected time range. */ static gboolean e_week_view_get_selected_time_range (ECalendarView *cal_view, @@ -1554,7 +1542,6 @@ e_week_view_get_visible_time_range (ECalendarView *cal_view, return TRUE; } - /* Note that the returned date may be invalid if no date has been set yet. */ void e_week_view_get_first_day_shown (EWeekView *week_view, @@ -1563,7 +1550,6 @@ e_week_view_get_first_day_shown (EWeekView *week_view, *date = week_view->first_day_shown; } - /* This sets the first day shown in the view. It will be rounded down to the nearest week. */ void @@ -1653,7 +1639,6 @@ e_week_view_set_first_day_shown (EWeekView *week_view, gtk_widget_queue_draw (week_view->main_canvas); } - /* Recalculates the time_t corresponding to the start of each day. */ static void e_week_view_recalc_day_starts (EWeekView *week_view, @@ -1695,7 +1680,6 @@ e_week_view_get_multi_week_view (EWeekView *week_view) return week_view->multi_week_view; } - void e_week_view_set_multi_week_view (EWeekView *week_view, gboolean multi_week_view) @@ -1754,7 +1738,6 @@ e_week_view_get_update_base_date (EWeekView *week_view) return week_view->update_base_date; } - void e_week_view_set_update_base_date (EWeekView *week_view, gboolean update_base_date) { @@ -1771,7 +1754,6 @@ e_week_view_get_weeks_shown (EWeekView *week_view) return week_view->weeks_shown; } - void e_week_view_set_weeks_shown (EWeekView *week_view, gint weeks_shown) @@ -1811,7 +1793,6 @@ e_week_view_set_weeks_shown (EWeekView *week_view, } } - gboolean e_week_view_get_compress_weekend (EWeekView *week_view) { @@ -1820,7 +1801,6 @@ e_week_view_get_compress_weekend (EWeekView *week_view) return week_view->compress_weekend; } - void e_week_view_set_compress_weekend (EWeekView *week_view, gboolean compress) @@ -1867,7 +1847,6 @@ e_week_view_get_show_event_end_times (EWeekView *week_view) return week_view->show_event_end_times; } - void e_week_view_set_show_event_end_times (EWeekView *week_view, gboolean show) @@ -1882,7 +1861,6 @@ e_week_view_set_show_event_end_times (EWeekView *week_view, } } - /* The first day of the week, 0 (Monday) to 6 (Sunday). */ gint e_week_view_get_week_start_day (EWeekView *week_view) @@ -1892,7 +1870,6 @@ e_week_view_get_week_start_day (EWeekView *week_view) return week_view->week_start_day; } - void e_week_view_set_week_start_day (EWeekView *week_view, gint week_start_day) @@ -2004,7 +1981,6 @@ e_week_view_foreach_event_with_uid (EWeekView *week_view, } } - static gboolean e_week_view_remove_event_cb (EWeekView *week_view, gint event_num, @@ -2066,7 +2042,6 @@ e_week_view_remove_event_cb (EWeekView *week_view, return TRUE; } - void e_week_view_get_day_position (EWeekView *week_view, gint day, @@ -2097,7 +2072,6 @@ e_week_view_get_day_position (EWeekView *week_view, } } - /* Returns the bounding box for a span of an event. Usually this can easily be determined by the start & end days and row of the span, which are set in e_week_view_layout_event(). Though we need a special case for the weekends @@ -2159,8 +2133,6 @@ e_week_view_get_span_position (EWeekView *week_view, return TRUE; } - - static gboolean e_week_view_on_button_press (GtkWidget *widget, GdkEventButton *event, @@ -2237,7 +2209,6 @@ e_week_view_on_button_press (GtkWidget *widget, return TRUE; } - static gboolean e_week_view_on_button_release (GtkWidget *widget, GdkEventButton *event, @@ -2293,7 +2264,6 @@ e_week_view_on_scroll (GtkWidget *widget, return TRUE; } - static gboolean e_week_view_on_motion (GtkWidget *widget, GdkEventMotion *mevent, @@ -2320,7 +2290,6 @@ e_week_view_on_motion (GtkWidget *widget, return FALSE; } - /* Converts a position in the canvas window to a day offset from the first day displayed. Returns -1 if the position is outside the grid. */ static gint @@ -2380,7 +2349,6 @@ e_week_view_convert_position_to_day (EWeekView *week_view, return week * 7 + day; } - static void e_week_view_update_selection (EWeekView *week_view, gint day) @@ -2421,7 +2389,6 @@ e_week_view_update_selection (EWeekView *week_view, } } - static void e_week_view_free_events (EWeekView *week_view) { @@ -2471,7 +2438,6 @@ e_week_view_free_events (EWeekView *week_view) } } - /* This adds one event to the view, adding it to the appropriate array. */ static gboolean e_week_view_add_event (ECalComponent *comp, @@ -2546,7 +2512,6 @@ e_week_view_add_event (ECalComponent *comp, return TRUE; } - /* This lays out the events, or reshapes them, as necessary. */ static void e_week_view_check_layout (EWeekView *week_view) @@ -2575,7 +2540,6 @@ e_week_view_check_layout (EWeekView *week_view) week_view->events_need_reshape = FALSE; } - static void e_week_view_ensure_events_sorted (EWeekView *week_view) { @@ -2588,7 +2552,6 @@ e_week_view_ensure_events_sorted (EWeekView *week_view) } } - gint e_week_view_event_sort_func (gconstpointer arg1, gconstpointer arg2) @@ -2611,7 +2574,6 @@ e_week_view_event_sort_func (gconstpointer arg1, return 0; } - static void e_week_view_reshape_events (EWeekView *week_view) { @@ -2900,7 +2862,6 @@ e_week_view_reshape_event_span (EWeekView *week_view, the icons in the middle, but making sure we don't go over the times. */ - /* Calculate the space necessary to display a time, e.g. "13:00". */ time_width = e_week_view_get_time_string_width (week_view); @@ -3112,7 +3073,6 @@ e_week_view_start_editing_event (EWeekView *week_view, return TRUE; } - /* This stops any current edit. */ void e_week_view_stop_editing_event (EWeekView *week_view) @@ -3129,7 +3089,6 @@ e_week_view_stop_editing_event (EWeekView *week_view) gtk_window_set_focus (GTK_WINDOW (toplevel), NULL); } - /* Cancels the current edition by resetting the appointment's text to its original value */ static void cancel_editing (EWeekView *week_view) @@ -3304,7 +3263,6 @@ e_week_view_on_text_item_event (GnomeCanvasItem *item, &nspan)) return FALSE; - g_object_set_data ((GObject *)item, "event-num", GINT_TO_POINTER (nevent)); pevent = tooltip_get_view_event (week_view, -1, nevent); @@ -3510,7 +3468,6 @@ e_week_view_change_event_time (EWeekView *week_view, time_t start_dt, time_t end week_view->last_edited_comp_string = e_cal_component_get_as_string (comp); - if (e_cal_component_has_recurrences (comp)) { if (!recur_component_dialog (client, comp, &mod, NULL, FALSE)) { gtk_widget_queue_draw (week_view->main_canvas); @@ -3565,7 +3522,6 @@ e_week_view_on_editing_started (EWeekView *week_view, g_signal_emit_by_name (week_view, "selection_changed"); } - static void e_week_view_on_editing_stopped (EWeekView *week_view, GnomeCanvasItem *item) @@ -3725,7 +3681,6 @@ e_week_view_on_editing_stopped (EWeekView *week_view, g_signal_emit_by_name (week_view, "selection_changed"); } - gboolean e_week_view_find_event_from_item (EWeekView *week_view, GnomeCanvasItem *item, @@ -3755,7 +3710,6 @@ e_week_view_find_event_from_item (EWeekView *week_view, return FALSE; } - /* Finds the index of the event with the given uid. Returns TRUE if an event with the uid was found. Note that for recurring events there may be several EWeekViewEvents, one @@ -3808,7 +3762,6 @@ e_week_view_find_event_from_uid (EWeekView *week_view, return FALSE; } - gboolean e_week_view_is_one_day_event (EWeekView *week_view, gint event_num) @@ -4409,7 +4362,6 @@ e_week_view_on_jump_button_event (GnomeCanvasItem *item, return FALSE; } - /* Converts an hour from 0-23 to the preferred time format, and returns the suffix to add and the width of it in the normal font. */ void @@ -4441,7 +4393,6 @@ e_week_view_convert_time_to_display (EWeekView *week_view, } } - gint e_week_view_get_time_string_width (EWeekView *week_view) { @@ -4470,7 +4421,6 @@ e_week_view_queue_layout (EWeekView *week_view) } } - /* Removes any queued layout. */ static void e_week_view_cancel_layout (EWeekView *week_view) @@ -4481,7 +4431,6 @@ e_week_view_cancel_layout (EWeekView *week_view) } } - static gboolean e_week_view_layout_timeout_cb (gpointer data) { @@ -4494,7 +4443,6 @@ e_week_view_layout_timeout_cb (gpointer data) return FALSE; } - /* Returns the number of selected events (0 or 1 at present). */ gint e_week_view_get_num_events_selected (EWeekView *week_view) diff --git a/calendar/gui/e-week-view.h b/calendar/gui/e-week-view.h index eff5466895..b536e5d5a3 100644 --- a/calendar/gui/e-week-view.h +++ b/calendar/gui/e-week-view.h @@ -147,12 +147,10 @@ struct _EWeekViewEvent { guint8 num_spans; }; - #define E_WEEK_VIEW(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, e_week_view_get_type (), EWeekView) #define E_WEEK_VIEW_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, e_week_view_get_type (), EWeekViewClass) #define E_IS_WEEK_VIEW(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, e_week_view_get_type ()) - typedef struct _EWeekView EWeekView; typedef struct _EWeekViewClass EWeekViewClass; @@ -349,7 +347,6 @@ struct _EWeekViewClass ECalendarViewClass parent_class; }; - GType e_week_view_get_type (void); GtkWidget* e_week_view_new (ECalModel *model); diff --git a/calendar/gui/ea-cal-view-event.c b/calendar/gui/ea-cal-view-event.c index 5da164323f..5f0af90261 100644 --- a/calendar/gui/ea-cal-view-event.c +++ b/calendar/gui/ea-cal-view-event.c @@ -48,7 +48,6 @@ static gboolean ea_cal_view_event_do_action (AtkAction *action, gint i); static gint ea_cal_view_event_get_n_actions (AtkAction *action); static G_CONST_RETURN gchar * ea_cal_view_event_action_get_name (AtkAction *action, gint i); - #ifdef ACC_DEBUG static gint n_ea_cal_view_event_created = 0, n_ea_cal_view_event_destroyed = 0; static void ea_cal_view_finalize (GObject *object); @@ -64,7 +63,6 @@ ea_cal_view_event_get_type (void) GTypeQuery query; GType derived_atk_type; - if (!type) { static GTypeInfo tinfo = { sizeof (EaCalViewEventClass), @@ -91,7 +89,6 @@ ea_cal_view_event_get_type (void) NULL }; - /* * Figure out the size of the class and instance * we are run-time deriving from (atk object for E_TEXT, in this case) @@ -113,7 +110,6 @@ ea_cal_view_event_get_type (void) g_type_add_interface_static (type, ATK_TYPE_ACTION, &atk_action_info); - } return type; @@ -253,7 +249,6 @@ ea_cal_view_event_get_name (AtkObject *accessible) gchar *summary_string; const gchar *summary; - g_return_val_if_fail (EA_IS_CAL_VIEW_EVENT (accessible), NULL); atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible); diff --git a/calendar/gui/ea-cal-view-event.h b/calendar/gui/ea-cal-view-event.h index 548e42b4a7..b4b193de2d 100644 --- a/calendar/gui/ea-cal-view-event.h +++ b/calendar/gui/ea-cal-view-event.h @@ -54,5 +54,4 @@ AtkObject *ea_cal_view_event_new (GObject *obj); G_END_DECLS - #endif /* __EA_CAL_VIEW_EVENT_H__ */ diff --git a/calendar/gui/ea-calendar.c b/calendar/gui/ea-calendar.c index d09efae4d2..b5d4b75281 100644 --- a/calendar/gui/ea-calendar.c +++ b/calendar/gui/ea-calendar.c @@ -34,7 +34,6 @@ #include "calendar/ea-week-view-main-item.h" #include "calendar/ea-gnome-calendar.h" - EA_FACTORY (EA_TYPE_CAL_VIEW, ea_cal_view, ea_cal_view_new) EA_FACTORY (EA_TYPE_DAY_VIEW, ea_day_view, ea_day_view_new) EA_FACTORY_GOBJECT (EA_TYPE_DAY_VIEW_MAIN_ITEM, ea_day_view_main_item, ea_day_view_main_item_new) diff --git a/calendar/gui/ea-day-view-cell.c b/calendar/gui/ea-day-view-cell.c index fa491e87ea..2d42a47fc6 100644 --- a/calendar/gui/ea-day-view-cell.c +++ b/calendar/gui/ea-day-view-cell.c @@ -258,7 +258,6 @@ ea_day_view_cell_ref_state_set (AtkObject *obj) atk_component_get_extents (ATK_COMPONENT (parent), &parent_x, &parent_y, &parent_width, &parent_height, ATK_XY_WINDOW); - if (x + width < parent_x || x > parent_x + parent_width || y + height < parent_y || y > parent_y + parent_height) /* the cell is out of the main canvas */ diff --git a/calendar/gui/ea-day-view-main-item.c b/calendar/gui/ea-day-view-main-item.c index 3bfd56f0b3..89b6f1a57b 100644 --- a/calendar/gui/ea-day-view-main-item.c +++ b/calendar/gui/ea-day-view-main-item.c @@ -181,7 +181,6 @@ ea_day_view_main_item_get_type (void) NULL }; - /* * Figure out the size of the class and instance * we are run-time deriving from (GailCanvasItem, in this case) diff --git a/calendar/gui/ea-gnome-calendar.h b/calendar/gui/ea-gnome-calendar.h index b0d2cf71d2..db9acdb47e 100644 --- a/calendar/gui/ea-gnome-calendar.h +++ b/calendar/gui/ea-gnome-calendar.h @@ -56,5 +56,4 @@ const gchar * ea_gnome_calendar_get_label_description (GnomeCalendar *gcal); G_END_DECLS - #endif /* __EA_GNOME_CALENDAR_H__ */ diff --git a/calendar/gui/ea-jump-button.c b/calendar/gui/ea-jump-button.c index eb24bea42c..a6775ade55 100644 --- a/calendar/gui/ea-jump-button.c +++ b/calendar/gui/ea-jump-button.c @@ -51,7 +51,6 @@ ea_jump_button_get_type (void) GTypeQuery query; GType derived_atk_type; - if (!type) { static GTypeInfo tinfo = { sizeof (EaJumpButtonClass), diff --git a/calendar/gui/ea-jump-button.h b/calendar/gui/ea-jump-button.h index cd3b6e26bb..be0a357a14 100644 --- a/calendar/gui/ea-jump-button.h +++ b/calendar/gui/ea-jump-button.h @@ -54,5 +54,4 @@ AtkObject *ea_jump_button_new (GObject *obj); G_END_DECLS - #endif /* __EA_JUMP_BUTTON_H__ */ diff --git a/calendar/gui/ea-week-view-cell.c b/calendar/gui/ea-week-view-cell.c index e724592ec8..57554427da 100644 --- a/calendar/gui/ea-week-view-cell.c +++ b/calendar/gui/ea-week-view-cell.c @@ -270,7 +270,6 @@ ea_week_view_cell_ref_state_set (AtkObject *obj) atk_component_get_extents (ATK_COMPONENT (parent), &parent_x, &parent_y, &parent_width, &parent_height, ATK_XY_WINDOW); - if (x + width < parent_x || x > parent_x + parent_width || y + height < parent_y || y > parent_y + parent_height) /* the cell is out of the main canvas */ diff --git a/calendar/gui/ea-week-view-main-item.c b/calendar/gui/ea-week-view-main-item.c index 74f4695a69..3d0bd9e8e8 100644 --- a/calendar/gui/ea-week-view-main-item.c +++ b/calendar/gui/ea-week-view-main-item.c @@ -181,7 +181,6 @@ ea_week_view_main_item_get_type (void) NULL }; - /* * Figure out the size of the class and instance * we are run-time deriving from (GailCanvasItem, in this case) diff --git a/calendar/gui/ea-week-view.h b/calendar/gui/ea-week-view.h index bb71c17e74..09409ec4cf 100644 --- a/calendar/gui/ea-week-view.h +++ b/calendar/gui/ea-week-view.h @@ -55,5 +55,4 @@ AtkObject* ea_week_view_new (GtkWidget *widget); G_END_DECLS - #endif /* __EA_WEEK_VIEW_H__ */ diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index 25b0336d16..bd131327c6 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -195,7 +195,6 @@ enum { static guint gnome_calendar_signals[LAST_SIGNAL]; - static void gnome_calendar_destroy (GtkObject *object); @@ -936,7 +935,6 @@ view_selection_changed_cb (GtkWidget *view, GnomeCalendar *gcal) g_signal_emit (gcal, gnome_calendar_signals[CALENDAR_SELECTION_CHANGED], 0); } - /** * gnome_calendar_emit_user_created_signal * Emits "user_created" signal on a gcal and use calendar as a store where was event created. @@ -977,7 +975,6 @@ user_created_cb (GtkWidget *view, GnomeCalendar *gcal) gnome_calendar_add_source (gcal, E_CAL_SOURCE_TYPE_EVENT, e_cal_get_source (ecal)); } - static void set_week_start (GnomeCalendar *calendar) { @@ -1331,7 +1328,6 @@ categories_changed_cb (gpointer object, gpointer user_data) g_ptr_array_free (cat_array, TRUE); } - static void view_progress_cb (ECalModel *model, const gchar *message, gint percent, ECalSourceType type, GnomeCalendar *gcal) { @@ -1808,7 +1804,6 @@ gnome_calendar_goto (GnomeCalendar *gcal, time_t new_time) } } - static void update_view_times (GnomeCalendar *gcal, time_t start_time) { @@ -1975,7 +1970,6 @@ set_view (GnomeCalendar *gcal, GnomeCalendarViewType view_type, gboolean range_s focus_current_view (gcal); } - /** * gnome_calendar_set_view: * @gcal: A calendar. @@ -2108,7 +2102,6 @@ display_view_cb (GalViewInstance *view_instance, GalView *view, gpointer data) return; } - display_view (gcal, view_type, TRUE); if (!priv->base_view_time) @@ -2687,7 +2680,6 @@ gnome_calendar_set_default_source (GnomeCalendar *gcal, ESource *source) return FALSE; } - open_ecal (gcal, priv->default_client, FALSE, default_client_cal_opened_cb); return TRUE; @@ -2791,7 +2783,6 @@ gnome_calendar_new_task (GnomeCalendar *gcal, time_t *dtstart, time_t *dtend) gtk_window_present (GTK_WINDOW (editor)); } - /* Returns the selected time range for the current view. Note that this may be different from the fields in the GnomeCalendar, since the view may clip this or choose a more appropriate time. */ @@ -2804,7 +2795,6 @@ gnome_calendar_get_current_time_range (GnomeCalendar *gcal, start_time, end_time); } - /* Gets the visible time range for the current view. Returns FALSE if no time range has been set yet. */ gboolean @@ -3013,7 +3003,6 @@ gnome_calendar_hpane_resized (GtkWidget *w, GdkEventButton *e, GnomeCalendar *gc else gtk_widget_set_size_request (E_DAY_VIEW (priv->day_view)->time_canvas, priv->hpane_pos - 20, -1); - return FALSE; } static void @@ -3081,7 +3070,6 @@ gnome_calendar_paste_clipboard (GnomeCalendar *gcal) e_calendar_view_paste_clipboard (E_CALENDAR_VIEW (widget)); } - /* Get the current timezone. */ icaltimezone* gnome_calendar_get_timezone (GnomeCalendar *gcal) @@ -3092,7 +3080,6 @@ gnome_calendar_get_timezone (GnomeCalendar *gcal) return gcal->priv->zone; } - static void gnome_calendar_notify_dates_shown_changed (GnomeCalendar *gcal) { @@ -3121,7 +3108,6 @@ gnome_calendar_notify_dates_shown_changed (GnomeCalendar *gcal) update_memo_view (gcal); } - /* Returns the number of selected events (0 or 1 at present). */ gint gnome_calendar_get_num_events_selected (GnomeCalendar *gcal) diff --git a/calendar/gui/gnome-cal.h b/calendar/gui/gnome-cal.h index 0803a4fb63..d904c10aa7 100644 --- a/calendar/gui/gnome-cal.h +++ b/calendar/gui/gnome-cal.h @@ -99,7 +99,6 @@ struct _GnomeCalendarClass { void (* goto_date) (GnomeCalendar *gcal, GnomeCalendarGotoDateType date); }; - GType gnome_calendar_get_type (void); GtkWidget *gnome_calendar_construct (GnomeCalendar *gcal); @@ -164,7 +163,6 @@ gint gnome_calendar_get_num_events_selected (GnomeCalendar *gcal); /* Get the current timezone. */ icaltimezone *gnome_calendar_get_timezone (GnomeCalendar *gcal); - /* Clipboard operations */ void gnome_calendar_cut_clipboard (GnomeCalendar *gcal); void gnome_calendar_copy_clipboard (GnomeCalendar *gcal); diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c index 2287f59248..10eda35811 100644 --- a/calendar/gui/itip-utils.c +++ b/calendar/gui/itip-utils.c @@ -300,7 +300,6 @@ typedef struct { icalcomponent *zones; } ItipUtilTZData; - static void foreach_tzid_callback (icalparameter *param, gpointer data) { @@ -411,7 +410,6 @@ comp_from (ECalComponentItipMethod method, ECalComponent *comp) } return g_strdup (itip_strip_mailto (organizer.value)); - default: if (!e_cal_component_has_attendees (comp)) return NULL; @@ -1396,22 +1394,18 @@ reply_to_calendar_comp (ECalComponentItipMethod method, e_cal_component_free_text_list (text_list); - e_cal_component_get_summary (comp, &text); if (text.value) subject = g_strdup (text.value); - e_cal_component_get_organizer (comp, &organizer); if (organizer.value) orig_from = g_strdup (itip_strip_mailto (organizer.value)); - e_cal_component_get_location (comp, &location); if (!location) location = "Unspecified"; - e_cal_component_get_dtstart (comp, &dtstart); if (dtstart.value) { start_zone = icaltimezone_get_builtin_timezone_from_tzid (dtstart.tzid); @@ -1427,7 +1421,6 @@ reply_to_calendar_comp (ECalComponentItipMethod method, time = g_strdup (ctime (&start)); } - body = g_string_new ("<br><br><hr><br><b>______ Original Appointment ______ </b><br><br><table>"); if (orig_from && *orig_from) diff --git a/calendar/gui/memos-component.h b/calendar/gui/memos-component.h index f1ba3de204..b46095c629 100644 --- a/calendar/gui/memos-component.h +++ b/calendar/gui/memos-component.h @@ -29,14 +29,12 @@ #include <widgets/misc/e-activity-handler.h> #include "Evolution.h" - #define MEMOS_TYPE_COMPONENT (memos_component_get_type ()) #define MEMOS_COMPONENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MEMOS_TYPE_COMPONENT, MemosComponent)) #define MEMOS_COMPONENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MEMOS_TYPE_COMPONENT, MemosComponentClass)) #define MEMOS_IS_COMPONENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MEMOS_TYPE_COMPONENT)) #define MEMOS_IS_COMPONENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), MEMOS_TYPE_COMPONENT)) - typedef struct _MemosComponent MemosComponent; typedef struct _MemosComponentPrivate MemosComponentPrivate; typedef struct _MemosComponentClass MemosComponentClass; @@ -53,7 +51,6 @@ struct _MemosComponentClass { POA_GNOME_Evolution_Component__epv epv; }; - GType memos_component_get_type (void); MemosComponent *memos_component_peek (void); diff --git a/calendar/gui/print.c b/calendar/gui/print.c index 7501374cea..fb68435769 100644 --- a/calendar/gui/print.c +++ b/calendar/gui/print.c @@ -163,7 +163,6 @@ static const gint sept_1752[42] = { #define SEPT_1752_START 2 /* Start day within month */ #define SEPT_1752_END 20 /* End day within month */ - struct pdinfo { gint days_shown; @@ -226,7 +225,6 @@ convert_timet_to_struct_tm (time_t time, icaltimezone *zone) return &my_tm; } - /* Fills the 42-element days array with the day numbers for the specified month. Slots outside the * bounds of the month are filled with zeros. The starting and ending indexes of the days are * returned in the start and end arguments. @@ -361,7 +359,6 @@ print_border_with_triangles (GtkPrintContext *pc, cairo_restore (cr); } - /* Prints a rectangle, with or without a border, and filled or outline. width = width of border, -ve means no border. fillcolor = shade of fill, -ve means no fill. */ @@ -762,7 +759,6 @@ bound_text (GtkPrintContext *context, return y1 + pango_units_to_double (layout_height); } - /* Draw the borders, lines, and times down the left of the day view. */ static void print_day_background (GtkPrintContext *context, GnomeCalendar *gcal, @@ -866,7 +862,6 @@ print_day_background (GtkPrintContext *context, GnomeCalendar *gcal, pango_font_description_free (font_minute); } - /* This adds one event to the view, adding it to the appropriate array. */ static gint print_day_add_event (ECalModelComponent *comp_data, @@ -941,7 +936,6 @@ print_day_add_event (ECalModelComponent *comp_data, return E_DAY_VIEW_LONG_EVENT; } - static gboolean print_day_details_cb (ECalComponent *comp, time_t istart, time_t iend, gpointer data) @@ -956,7 +950,6 @@ print_day_details_cb (ECalComponent *comp, time_t istart, time_t iend, return TRUE; } - static void free_event_array (GArray *array) { @@ -1165,7 +1158,6 @@ print_day_long_event (GtkPrintContext *context, PangoFontDescription *font, g_free (text); } - static void print_day_event (GtkPrintContext *context, PangoFontDescription *font, double left, double right, double top, double bottom, @@ -1244,7 +1236,6 @@ print_day_event (GtkPrintContext *context, PangoFontDescription *font, g_free (text); } - static void print_day_details (GtkPrintContext *context, GnomeCalendar *gcal, time_t whence, double left, double right, double top, double bottom) @@ -1343,7 +1334,6 @@ print_day_details (GtkPrintContext *context, GnomeCalendar *gcal, time_t whence, /* Now adjust to get rid of the time column. */ left += DAY_VIEW_TIME_COLUMN_WIDTH; - /* lay out the short events, within the day. */ e_day_view_layout_day_events (pdi.events[0], DAY_VIEW_ROWS, DAY_VIEW_MINS_PER_ROW, pdi.cols_per_row, -1); @@ -1389,7 +1379,6 @@ print_is_one_day_week_event (EWeekViewEvent *event, return FALSE; } - static void print_week_long_event (GtkPrintContext *context, PangoFontDescription *font, struct psinfo *psi, @@ -1456,7 +1445,6 @@ print_week_long_event (GtkPrintContext *context, PangoFontDescription *font, print_text_size (context, text, PANGO_ALIGN_CENTER, x1, x2, y1, y2); } - static void print_week_day_event (GtkPrintContext *context, PangoFontDescription *font, struct psinfo *psi, @@ -1495,7 +1483,6 @@ print_week_day_event (GtkPrintContext *context, PangoFontDescription *font, print_text_size (context, text, PANGO_ALIGN_LEFT, x1, x2, y1, y2 + 3); } - static void print_week_event (GtkPrintContext *context, PangoFontDescription *font, struct psinfo *psi, @@ -1556,7 +1543,6 @@ print_week_event (GtkPrintContext *context, PangoFontDescription *font, + span->row * psi->row_height; y2 = y1 + psi->row_height * 0.5; - red = .9; green = .9; blue = .9; @@ -1621,7 +1607,6 @@ print_week_event (GtkPrintContext *context, PangoFontDescription *font, g_free (text); } - static void print_week_view_background (GtkPrintContext *context, PangoFontDescription *font, @@ -1806,7 +1791,6 @@ print_week_summary (GtkPrintContext *context, GnomeCalendar *gcal, cell_height = (bottom - top) / 6; } - /* Calculate the row height, using the normal font and with room for space or a rectangle around it. */ psi.row_height = font_size * 1.2; @@ -1841,7 +1825,6 @@ print_week_summary (GtkPrintContext *context, GnomeCalendar *gcal, #endif } - /* XXX Evolution doesn't have a "year" view. */ #if 0 static void @@ -1964,7 +1947,6 @@ print_month_summary (GtkPrintContext *context, GnomeCalendar *gcal, time_t whenc left, right, top, bottom); } - static void print_todo_details (GtkPrintContext *context, GnomeCalendar *gcal, time_t start, time_t end, @@ -2048,7 +2030,6 @@ print_todo_details (GtkPrintContext *context, GnomeCalendar *gcal, y = bound_text (context, font_summary, summary.value, -1, x + 14, y + 4, xend, yend, FALSE, NULL, NULL); - y += get_font_size (font_summary)-5; cr = gtk_print_context_get_cairo_context (context); cairo_move_to (cr, x, y); @@ -2105,14 +2086,12 @@ print_day_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date) l, 4, l + SMALL_MONTH_WIDTH, HEADER_HEIGHT + 4, DATE_MONTH | DATE_YEAR, date, date, FALSE); - l += SMALL_MONTH_SPACING + SMALL_MONTH_WIDTH; print_month_small (context, gcal, time_add_month_with_zone (date, 1, zone), l, 4, l + SMALL_MONTH_WIDTH, HEADER_HEIGHT + 4, DATE_MONTH | DATE_YEAR, 0, 0, FALSE); - /* Print the date, e.g. '8th May, 2001'. */ format_date (date, DATE_DAY | DATE_MONTH | DATE_YEAR, buf, 100); @@ -2168,7 +2147,6 @@ print_week_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date) 0.0, width, HEADER_HEIGHT + 20, height); - /* Print the border around the main view. */ print_border (context, 0.0, width, HEADER_HEIGHT , height, 1.0, -1.0); @@ -2206,7 +2184,6 @@ print_week_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date) 24 + 3, 24 + 3 + 24); } - static void print_month_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date) { @@ -2623,7 +2600,6 @@ print_comp_draw_real (GtkPrintOperation *operation, top += get_font_size (font) - 6; } - /* URL */ e_cal_component_get_url (comp, &url); if (url && url[0]) { diff --git a/calendar/gui/tasks-component.h b/calendar/gui/tasks-component.h index aae49fc287..851d3d0381 100644 --- a/calendar/gui/tasks-component.h +++ b/calendar/gui/tasks-component.h @@ -28,14 +28,12 @@ #include <misc/e-activity-handler.h> #include "Evolution.h" - #define TASKS_TYPE_COMPONENT (tasks_component_get_type ()) #define TASKS_COMPONENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TASKS_TYPE_COMPONENT, TasksComponent)) #define TASKS_COMPONENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TASKS_TYPE_COMPONENT, TasksComponentClass)) #define TASKS_IS_COMPONENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TASKS_TYPE_COMPONENT)) #define TASKS_IS_COMPONENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), TASKS_TYPE_COMPONENT)) - typedef struct _TasksComponent TasksComponent; typedef struct _TasksComponentPrivate TasksComponentPrivate; typedef struct _TasksComponentClass TasksComponentClass; @@ -52,7 +50,6 @@ struct _TasksComponentClass { POA_GNOME_Evolution_Component__epv epv; }; - GType tasks_component_get_type (void); #endif /* _TASKS_COMPONENT_H_ */ diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c index 5fa7f7a541..61f7eb4848 100644 --- a/calendar/gui/tasks-control.c +++ b/calendar/gui/tasks-control.c @@ -49,7 +49,6 @@ #define FIXED_MARGIN .05 - static void tasks_control_activate_cb (BonoboControl *control, gboolean activate, gpointer user_data); @@ -246,7 +245,6 @@ tasks_control_activate (BonoboControl *control, ETasks *tasks) bonobo_ui_component_set_prop(uic, "/commands/ViewPreview", "state", state?"1":"0", NULL); } - void tasks_control_deactivate (BonoboControl *control, ETasks *tasks) { diff --git a/calendar/gui/weekday-picker.c b/calendar/gui/weekday-picker.c index 913144d4a7..12c09b43c5 100644 --- a/calendar/gui/weekday-picker.c +++ b/calendar/gui/weekday-picker.c @@ -201,7 +201,6 @@ day_event_cb (GnomeCanvasItem *item, GdkEvent *event, gpointer data) return TRUE; } - /* Creates the canvas items for the weekday picker. The items are empty until * they are configured elsewhere. */ diff --git a/composer/e-composer-header.c b/composer/e-composer-header.c index 713c123b74..dd274c4b88 100644 --- a/composer/e-composer-header.c +++ b/composer/e-composer-header.c @@ -429,7 +429,7 @@ e_composer_header_set_visible (EComposerHeader *header, if (!visible) gtk_label_set_markup ((GtkLabel *)header->priv->action_label, g_object_get_data ((GObject *)header->priv->action_label, "show")); else - gtk_label_set_markup ((GtkLabel *)header->priv->action_label, g_object_get_data ((GObject *)header->priv->action_label, "hide")); + gtk_label_set_markup ((GtkLabel *)header->priv->action_label, g_object_get_data ((GObject *)header->priv->action_label, "hide")); } g_object_notify (G_OBJECT (header), "visible"); } diff --git a/e-util/e-bconf-map.c b/e-util/e-bconf-map.c index 3e44526071..6b6f16d4cf 100644 --- a/e-util/e-bconf-map.c +++ b/e-util/e-bconf-map.c @@ -37,10 +37,8 @@ #include "e-bconf-map.h" - #define d(x) - static gchar hexnib[256] = { -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, @@ -88,7 +86,6 @@ e_bconf_url_decode (const gchar *val) return res; } - xmlNodePtr e_bconf_get_path (xmlDocPtr doc, const gchar *path) { @@ -194,7 +191,6 @@ e_bconf_get_string (xmlNodePtr root, const gchar *name) return res; } - /* lookup functions */ typedef gchar * (* bconf_lookup_func) (xmlNodePtr root, const gchar *name, e_bconf_map_t *nap); @@ -235,7 +231,6 @@ bconf_lookup_enum (xmlNodePtr root, const gchar *name, e_bconf_map_t *map) return NULL; } - static bconf_lookup_func lookup_table[] = { bconf_lookup_bool, bconf_lookup_long, bconf_lookup_string, bconf_lookup_enum }; @@ -298,7 +293,6 @@ build_xml (xmlNodePtr root, e_bconf_map_t *map, gint index, xmlNodePtr source) } } - gint e_bconf_import_xml_blob (GConfClient *gconf, xmlDocPtr config_xmldb, e_bconf_map_t *map, const gchar *bconf_path, const gchar *gconf_path, @@ -360,7 +354,6 @@ e_bconf_import_xml_blob (GConfClient *gconf, xmlDocPtr config_xmldb, e_bconf_map return 0; } - static gint gconf_type[] = { GCONF_VALUE_BOOL, GCONF_VALUE_BOOL, GCONF_VALUE_INT, GCONF_VALUE_STRING, GCONF_VALUE_STRING }; gint diff --git a/e-util/e-bconf-map.h b/e-util/e-bconf-map.h index 4e72f5ebb3..181533dde4 100644 --- a/e-util/e-bconf-map.h +++ b/e-util/e-bconf-map.h @@ -48,7 +48,6 @@ typedef struct _e_bconf_map { struct _e_bconf_map *child; } e_bconf_map_t; - gchar *e_bconf_hex_decode (const gchar *val); gchar *e_bconf_url_decode (const gchar *val); @@ -64,7 +63,6 @@ gint e_bconf_import_xml_blob (GConfClient *gconf, xmlDocPtr config_xmldb, e_bcon const gchar *bconf_path, const gchar *gconf_path, const gchar *name, const gchar *idparam); - enum { E_GCONF_MAP_BOOL, E_GCONF_MAP_BOOLNOT, diff --git a/e-util/e-binding.h b/e-util/e-binding.h index 12f4db8505..a36c94ec81 100644 --- a/e-util/e-binding.h +++ b/e-util/e-binding.h @@ -102,7 +102,6 @@ EMutualBinding *e_mutual_binding_new_with_negation const gchar *property2); void e_mutual_binding_unbind (EMutualBinding *binding); - /* Useful transformation functions */ gboolean e_binding_transform_color_to_string (const GValue *src_value, diff --git a/e-util/e-bit-array.c b/e-util/e-bit-array.c index 551ffe2143..898a1933dc 100644 --- a/e-util/e-bit-array.c +++ b/e-util/e-bit-array.c @@ -396,7 +396,6 @@ e_bit_array_toggle_single_row (EBitArray *eba, gint row) eba->data[BOX(row)] |= BITMASK(row); } - static void e_bit_array_init (EBitArray *eba) { diff --git a/e-util/e-bit-array.h b/e-util/e-bit-array.h index 6f021c51b1..52439c75c8 100644 --- a/e-util/e-bit-array.h +++ b/e-util/e-bit-array.h @@ -51,7 +51,6 @@ typedef struct { GObjectClass parent_class; } EBitArrayClass; - GType e_bit_array_get_type (void); EBitArray *e_bit_array_new (gint count); @@ -95,5 +94,4 @@ gboolean e_bit_array_cross_or (EBitArray *esm); G_END_DECLS - #endif /* _E_BIT_ARRAY_H_ */ diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c index 8740c78054..ae431ee094 100644 --- a/e-util/e-dialog-utils.c +++ b/e-util/e-dialog-utils.c @@ -242,7 +242,6 @@ e_dialog_set_transient_for_xid (GtkWindow *dialog, gdk_window_set_transient_for (gtk_widget_get_window (GTK_WIDGET (dialog)), parent); } - static void save_ok (GtkWidget *widget, gpointer data) diff --git a/e-util/e-dialog-utils.h b/e-util/e-dialog-utils.h index 3ebad46a49..98d85e151d 100644 --- a/e-util/e-dialog-utils.h +++ b/e-util/e-dialog-utils.h @@ -48,5 +48,4 @@ GtkWidget * e_file_get_save_filesel (GtkWindow *parent, const gchar *title, cons gboolean e_file_can_save(GtkWindow *parent, const gchar *uri); gboolean e_file_check_local(const gchar *name); - #endif diff --git a/e-util/e-error.c b/e-util/e-error.c index c78083495e..0671bdecf5 100644 --- a/e-util/e-error.c +++ b/e-util/e-error.c @@ -518,7 +518,6 @@ e_error_newv(GtkWindow *parent, const gchar *tag, const gchar *arg0, va_list ap) } else gtk_window_set_title((GtkWindow *)dialog, dgettext(table->translation_domain, type_map[e->type].title)); - if (e->primary) { g_string_append(out, "<span weight=\"bold\" size=\"larger\">"); ee_build_label(out, e->primary, args, TRUE); diff --git a/e-util/e-html-utils.c b/e-util/e-html-utils.c index 619cb6599e..b80ee17891 100644 --- a/e-util/e-html-utils.c +++ b/e-util/e-html-utils.c @@ -435,7 +435,6 @@ e_text_to_html (const gchar *input, guint flags) return e_text_to_html_full (input, flags, 0); } - #ifdef E_HTML_UTILS_TEST struct { diff --git a/e-util/e-icon-factory.c b/e-util/e-icon-factory.c index dddd4fa431..85985ef673 100644 --- a/e-util/e-icon-factory.c +++ b/e-util/e-icon-factory.c @@ -55,7 +55,6 @@ static GHashTable *name_to_icon = NULL; static GtkIconTheme *icon_theme = NULL; static GStaticMutex mutex = G_STATIC_MUTEX_INIT; - /* Note: takes ownership of the pixbufs (eg. does not ref them) */ static Icon * icon_new (const gchar *name, GdkPixbuf *pixbuf) @@ -225,7 +224,6 @@ e_icon_factory_shutdown (void) name_to_icon = NULL; } - /** * e_icon_factory_get_icon_filename: * @icon_name: name of the icon @@ -262,7 +260,6 @@ e_icon_factory_get_icon_filename (const gchar *icon_name, return filename; } - /** * e_icon_factory_get_icon: * @icon_name: name of the icon diff --git a/e-util/e-import.h b/e-util/e-import.h index 84c5061132..5a3165e117 100644 --- a/e-util/e-import.h +++ b/e-util/e-import.h @@ -258,7 +258,6 @@ GType e_import_hook_get_type(void); /* for implementors */ void e_import_hook_class_add_target_map(EImportHookClass *klass, const EImportHookTargetMap *); - G_END_DECLS #endif /* __E_IMPORT_H__ */ diff --git a/e-util/e-mktemp.c b/e-util/e-mktemp.c index 0e4cc6c7f3..509b312ee8 100644 --- a/e-util/e-mktemp.c +++ b/e-util/e-mktemp.c @@ -185,7 +185,6 @@ e_mktemp (const gchar *template) return ret; } - gint e_mkstemp (const gchar *template) { @@ -208,7 +207,6 @@ e_mkstemp (const gchar *template) return fd; } - gchar * e_mkdtemp (const gchar *template) { diff --git a/e-util/e-mktemp.h b/e-util/e-mktemp.h index c9b1d55b18..08f75ea67e 100644 --- a/e-util/e-mktemp.h +++ b/e-util/e-mktemp.h @@ -20,7 +20,6 @@ * */ - #ifndef __E_MKTEMP_H__ #define __E_MKTEMP_H__ diff --git a/e-util/e-pilot-map.c b/e-util/e-pilot-map.c index 80eb361027..660bdedc9a 100644 --- a/e-util/e-pilot-map.c +++ b/e-util/e-pilot-map.c @@ -268,7 +268,6 @@ e_pilot_map_remove_by_uid (EPilotMap *map, const gchar *uid) g_hash_table_remove (map->uid_map, uid); } - guint32 e_pilot_map_lookup_pid (EPilotMap *map, const gchar *uid, gboolean touch) { diff --git a/e-util/e-pilot-util.h b/e-util/e-pilot-util.h index 476320c58b..6b9b0ad884 100644 --- a/e-util/e-pilot-util.h +++ b/e-util/e-pilot-util.h @@ -35,5 +35,4 @@ gchar *e_pilot_utf8_from_pchar (const gchar *string); ESource *e_pilot_get_sync_source (ESourceList *source_list); void e_pilot_set_sync_source (ESourceList *source_list, ESource *source); - #endif /* E_PILOT_UTIL_H */ diff --git a/e-util/e-plugin.h b/e-util/e-plugin.h index 64f4ccd2e5..18949bf893 100644 --- a/e-util/e-plugin.h +++ b/e-util/e-plugin.h @@ -375,7 +375,6 @@ struct _EPluginTypeHookClass { GType e_plugin_type_hook_get_type(void); - /* README: Currently there is only one flag. But we may need more in the future and hence makes sense to keep as an enum */ @@ -384,6 +383,5 @@ typedef enum _EPluginFlags { E_PLUGIN_FLAGS_SYSTEM_PLUGIN = 1 << 0 } EPluginFlags; - #endif /* ! _E_PLUGIN_H */ diff --git a/e-util/e-signature-list.c b/e-util/e-signature-list.c index 1480f37e68..094d4785da 100644 --- a/e-util/e-signature-list.c +++ b/e-util/e-signature-list.c @@ -51,10 +51,8 @@ static void e_signature_list_init (ESignatureList *list, ESignatureListClass *kl static void e_signature_list_finalize (GObject *object); static void e_signature_list_dispose (GObject *object); - static EListClass *parent_class = NULL; - GType e_signature_list_get_type (void) { @@ -77,7 +75,6 @@ e_signature_list_get_type (void) return type; } - static void e_signature_list_class_init (ESignatureListClass *klass) { @@ -325,7 +322,6 @@ e_signature_list_construct (ESignatureList *signature_list, GConfClient *gconf) } } - /** * e_signature_list_save: * @signature_list: an #ESignatureList @@ -363,7 +359,6 @@ e_signature_list_save (ESignatureList *signature_list) gconf_client_suggest_sync (signature_list->priv->gconf, NULL); } - /** * e_signature_list_add: * @signatures: signature list @@ -379,7 +374,6 @@ e_signature_list_add (ESignatureList *signatures, ESignature *signature) g_signal_emit (signatures, signals[SIGNATURE_ADDED], 0, signature); } - /** * e_signature_list_change: * @signatures: signature list @@ -394,7 +388,6 @@ e_signature_list_change (ESignatureList *signatures, ESignature *signature) g_signal_emit (signatures, signals[SIGNATURE_CHANGED], 0, signature); } - /** * e_signature_list_remove: * @signatures: signature list @@ -414,7 +407,6 @@ e_signature_list_remove (ESignatureList *signatures, ESignature *signature) g_object_unref (signature); } - /** * e_signature_list_find: * @signatures: signature list diff --git a/e-util/e-signature-list.h b/e-util/e-signature-list.h index 1c27a12453..b662272180 100644 --- a/e-util/e-signature-list.h +++ b/e-util/e-signature-list.h @@ -59,7 +59,6 @@ struct _ESignatureListClass { void (* signature_removed) (ESignatureList *, ESignature *); }; - GType e_signature_list_get_type (void); ESignatureList *e_signature_list_new (GConfClient *gconf); diff --git a/e-util/e-signature.c b/e-util/e-signature.c index 60659f8c55..86e29fe34a 100644 --- a/e-util/e-signature.c +++ b/e-util/e-signature.c @@ -37,15 +37,12 @@ #include "e-signature.h" - static void e_signature_class_init (ESignatureClass *klass); static void e_signature_init (ESignature *sig, ESignatureClass *klass); static void e_signature_finalize (GObject *object); - static GObjectClass *parent_class = NULL; - GType e_signature_get_type (void) { @@ -97,7 +94,6 @@ e_signature_finalize (GObject *object) G_OBJECT_CLASS (parent_class)->finalize (object); } - /** * e_signature_new: * @@ -115,7 +111,6 @@ e_signature_new (void) return signature; } - /** * e_signature_new_from_xml: * @xml: an XML signature description @@ -137,7 +132,6 @@ e_signature_new_from_xml (const gchar *xml) return signature; } - static gboolean xml_set_bool (xmlNodePtr node, const gchar *name, gboolean *val) { @@ -201,7 +195,6 @@ xml_set_content (xmlNodePtr node, gchar **val) } } - /** * e_signature_uid_from_xml: * @xml: an XML signature description @@ -232,7 +225,6 @@ e_signature_uid_from_xml (const gchar *xml) return uid; } - /** * e_signature_set_from_xml: * @signature: an #ESignature @@ -314,7 +306,6 @@ e_signature_set_from_xml (ESignature *signature, const gchar *xml) return changed; } - /** * e_signature_to_xml: * @signature: an #ESignature diff --git a/e-util/e-signature.h b/e-util/e-signature.h index a58a42992c..3dced1903d 100644 --- a/e-util/e-signature.h +++ b/e-util/e-signature.h @@ -54,7 +54,6 @@ struct _ESignatureClass { }; - GType e_signature_get_type (void); ESignature *e_signature_new (void); diff --git a/e-util/e-sorter-array.c b/e-util/e-sorter-array.c index b3b4c4a2f2..39f3e61fa8 100644 --- a/e-util/e-sorter-array.c +++ b/e-util/e-sorter-array.c @@ -106,7 +106,6 @@ esa_backsort(ESorterArray *esa) } } - static gint esa_model_to_sorted (ESorter *es, gint row) { diff --git a/e-util/e-sorter.c b/e-util/e-sorter.c index 602b189075..14b469b734 100644 --- a/e-util/e-sorter.c +++ b/e-util/e-sorter.c @@ -63,7 +63,6 @@ e_sorter_new (void) return es; } - static gint es_model_to_sorted (ESorter *es, gint row) { @@ -76,7 +75,6 @@ es_sorted_to_model (ESorter *es, gint row) return row; } - static void es_get_model_to_sorted_array (ESorter *es, gint **array, gint *count) { @@ -87,7 +85,6 @@ es_get_sorted_to_model_array (ESorter *es, gint **array, gint *count) { } - static gboolean es_needs_sorting(ESorter *es) { @@ -118,7 +115,6 @@ e_sorter_sorted_to_model (ESorter *es, gint row) return -1; } - void e_sorter_get_model_to_sorted_array (ESorter *es, gint **array, gint *count) { @@ -137,7 +133,6 @@ e_sorter_get_sorted_to_model_array (ESorter *es, gint **array, gint *count) E_SORTER_GET_CLASS(es)->get_sorted_to_model_array (es, array, count); } - gboolean e_sorter_needs_sorting(ESorter *es) { diff --git a/e-util/e-text-event-processor-emacs-like.h b/e-util/e-text-event-processor-emacs-like.h index a93db0f440..0b9c6c143c 100644 --- a/e-util/e-text-event-processor-emacs-like.h +++ b/e-util/e-text-event-processor-emacs-like.h @@ -38,7 +38,6 @@ G_BEGIN_DECLS #define E_IS_TEXT_EVENT_PROCESSOR_EMACS_LIKE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE)) #define E_IS_TEXT_EVENT_PROCESSOR_EMACS_LIKE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE)) - typedef struct _ETextEventProcessorEmacsLike ETextEventProcessorEmacsLike; typedef struct _ETextEventProcessorEmacsLikeClass ETextEventProcessorEmacsLikeClass; @@ -55,11 +54,9 @@ struct _ETextEventProcessorEmacsLikeClass ETextEventProcessorClass parent_class; }; - GType e_text_event_processor_emacs_like_get_type (void); ETextEventProcessor *e_text_event_processor_emacs_like_new (void); G_END_DECLS - #endif /* __E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_H__ */ diff --git a/e-util/e-text-event-processor.h b/e-util/e-text-event-processor.h index 1f313bd35d..9e02cb050e 100644 --- a/e-util/e-text-event-processor.h +++ b/e-util/e-text-event-processor.h @@ -60,11 +60,9 @@ struct _ETextEventProcessorClass gint (* event) (ETextEventProcessor *tep, ETextEventProcessorEvent *event); }; - GType e_text_event_processor_get_type (void); gint e_text_event_processor_handle_event (ETextEventProcessor *tep, ETextEventProcessorEvent *event); G_END_DECLS - #endif /* __E_TEXT_EVENT_PROCESSOR_H__ */ diff --git a/e-util/e-unicode.h b/e-util/e-unicode.h index 77d1a351cb..737c5088eb 100644 --- a/e-util/e-unicode.h +++ b/e-util/e-unicode.h @@ -109,4 +109,3 @@ G_END_DECLS #endif - diff --git a/e-util/e-util.c b/e-util/e-util.c index bb3fb739a8..8423665d08 100644 --- a/e-util/e-util.c +++ b/e-util/e-util.c @@ -1107,7 +1107,6 @@ e_ascii_dtostr (gchar *buffer, gint buf_len, const gchar *format, gdouble d) format_char == 'g' || format_char == 'G')) return NULL; - g_snprintf (buffer, buf_len, format, d); locale_data = localeconv (); diff --git a/e-util/e-xml-utils.h b/e-util/e-xml-utils.h index c327d61e17..fa123a1d04 100644 --- a/e-util/e-xml-utils.h +++ b/e-util/e-xml-utils.h @@ -40,7 +40,6 @@ xmlNode *e_xml_get_child_by_name_by_lang_list (const xmlNode *parent, xmlNode *e_xml_get_child_by_name_no_lang (const xmlNode *parent, const gchar *name); - gint e_xml_get_integer_prop_by_name (const xmlNode *parent, const xmlChar *prop_name); gint e_xml_get_integer_prop_by_name_with_default (const xmlNode *parent, @@ -50,7 +49,6 @@ void e_xml_set_integer_prop_by_name (xmlNode *parent, const xmlChar *prop_name, gint value); - guint e_xml_get_uint_prop_by_name (const xmlNode *parent, const xmlChar *prop_name); guint e_xml_get_uint_prop_by_name_with_default (const xmlNode *parent, @@ -60,7 +58,6 @@ void e_xml_set_uint_prop_by_name (xmlNode *parent, const xmlChar *prop_name, guint value); - gboolean e_xml_get_bool_prop_by_name (const xmlNode *parent, const xmlChar *prop_name); gboolean e_xml_get_bool_prop_by_name_with_default (const xmlNode *parent, @@ -79,7 +76,6 @@ void e_xml_set_double_prop_by_name ( xmlNode *parent, const xmlChar *prop_name, gdouble value); - gchar *e_xml_get_string_prop_by_name (const xmlNode *parent, const xmlChar *prop_name); gchar *e_xml_get_string_prop_by_name_with_default (const xmlNode *parent, diff --git a/em-format/em-format.c b/em-format/em-format.c index 9540067602..71cd977b0a 100644 --- a/em-format/em-format.c +++ b/em-format/em-format.c @@ -1990,7 +1990,6 @@ em_format_snoop_type (CamelMimePart *part) } else res = name_type; - if (res != name_type) g_free (name_type); diff --git a/em-format/em-format.h b/em-format/em-format.h index a92da57822..7e59ecf462 100644 --- a/em-format/em-format.h +++ b/em-format/em-format.h @@ -106,7 +106,6 @@ enum _em_format_handler_t { EM_FORMAT_HANDLER_INLINE_DISPOSITION = 1<<1 }; - typedef struct _EMFormatPURI EMFormatPURI; typedef void (*EMFormatPURIFunc)(EMFormat *md, CamelStream *stream, EMFormatPURI *puri); diff --git a/em-format/em-stripsig-filter.c b/em-format/em-stripsig-filter.c index 39e6d02dad..42d824778b 100644 --- a/em-format/em-stripsig-filter.c +++ b/em-format/em-stripsig-filter.c @@ -30,7 +30,6 @@ #include "em-stripsig-filter.h" - static void em_stripsig_filter_class_init (EMStripSigFilterClass *klass); static void em_stripsig_filter_init (EMStripSigFilter *filter, EMStripSigFilterClass *klass); @@ -40,10 +39,8 @@ static void filter_complete (CamelMimeFilter *filter, const gchar *in, gsize len gchar **out, gsize *outlen, gsize *outprespace); static void filter_reset (CamelMimeFilter *filter); - static CamelMimeFilterClass *parent_class = NULL; - CamelType em_stripsig_filter_get_type (void) { @@ -63,7 +60,6 @@ em_stripsig_filter_get_type (void) return type; } - static void em_stripsig_filter_class_init (EMStripSigFilterClass *klass) { @@ -154,7 +150,6 @@ filter_reset (CamelMimeFilter *filter) stripsig->midline = FALSE; } - /** * em_stripsig_filter_new: * diff --git a/em-format/em-stripsig-filter.h b/em-format/em-stripsig-filter.h index 9a09d1aab2..39493e5e88 100644 --- a/em-format/em-stripsig-filter.h +++ b/em-format/em-stripsig-filter.h @@ -48,7 +48,6 @@ struct _EMStripSigFilterClass { }; - CamelType em_stripsig_filter_get_type (void); CamelMimeFilter *em_stripsig_filter_new (void); diff --git a/filter/filter-code.c b/filter/filter-code.c index c0f0420d19..9c7eb152ea 100644 --- a/filter/filter-code.c +++ b/filter/filter-code.c @@ -34,10 +34,8 @@ static void filter_code_class_init (FilterCodeClass *class); static void filter_code_init (FilterCode *fc); static void filter_code_finalise (GObject *obj); - static FilterInputClass *parent_class; - GType filter_code_get_type (void) { @@ -89,7 +87,6 @@ filter_code_finalise (GObject *obj) G_OBJECT_CLASS (parent_class)->finalize (obj); } - /** * filter_code_new: * diff --git a/filter/filter-colour.c b/filter/filter-colour.c index 7672a77be6..f466f63390 100644 --- a/filter/filter-colour.c +++ b/filter/filter-colour.c @@ -44,7 +44,6 @@ static void filter_colour_class_init (FilterColourClass *klass); static void filter_colour_init (FilterColour *fc); static void filter_colour_finalise (GObject *obj); - static FilterElementClass *parent_class; GType diff --git a/filter/filter-colour.h b/filter/filter-colour.h index ff19d66686..cfd10d12a6 100644 --- a/filter/filter-colour.h +++ b/filter/filter-colour.h @@ -21,7 +21,6 @@ * */ - #ifndef _FILTER_COLOUR_H #define _FILTER_COLOUR_H diff --git a/filter/filter-datespec.c b/filter/filter-datespec.c index a7ef49981e..69813448f9 100644 --- a/filter/filter-datespec.c +++ b/filter/filter-datespec.c @@ -400,7 +400,6 @@ set_values (FilterDatespec *fds) gtk_combo_box_set_active (GTK_COMBO_BOX (p->combobox_type), note_type); } - static void set_combobox_type (GtkComboBox *combobox, FilterDatespec *fds) { diff --git a/filter/filter-file.c b/filter/filter-file.c index ea14fadb12..72d7bac458 100644 --- a/filter/filter-file.c +++ b/filter/filter-file.c @@ -50,10 +50,8 @@ static void filter_file_class_init (FilterFileClass *klass); static void filter_file_init (FilterFile *ff); static void filter_file_finalise (GObject *obj); - static FilterElementClass *parent_class = NULL; - GType filter_file_get_type (void) { @@ -129,7 +127,6 @@ filter_file_new (void) return (FilterFile *) g_object_new (FILTER_TYPE_FILE, NULL, NULL); } - FilterFile * filter_file_new_type_name (const gchar *type) { diff --git a/filter/filter-file.h b/filter/filter-file.h index 2b4af5f76f..af8d05fe7a 100644 --- a/filter/filter-file.h +++ b/filter/filter-file.h @@ -53,7 +53,6 @@ struct _FilterFileClass { /* signals */ }; - GType filter_file_get_type (void); FilterFile *filter_file_new (void); diff --git a/filter/filter-input.c b/filter/filter-input.c index 690ccd6e48..ad22dd6846 100644 --- a/filter/filter-input.c +++ b/filter/filter-input.c @@ -51,10 +51,8 @@ static void filter_input_class_init (FilterInputClass *klass); static void filter_input_init (FilterInput *fi); static void filter_input_finalise (GObject *obj); - static FilterElementClass *parent_class = NULL; - GType filter_input_get_type (void) { diff --git a/filter/filter-int.c b/filter/filter-int.c index 9d72fdfdc8..ab8208e45e 100644 --- a/filter/filter-int.c +++ b/filter/filter-int.c @@ -45,10 +45,8 @@ static void filter_int_class_init (FilterIntClass *klass); static void filter_int_init (FilterInt *fi); static void filter_int_finalise (GObject *obj); - static FilterElementClass *parent_class; - GType filter_int_get_type (void) { diff --git a/filter/filter-option.c b/filter/filter-option.c index 07e7ee950d..14bb796ff6 100644 --- a/filter/filter-option.c +++ b/filter/filter-option.c @@ -51,10 +51,8 @@ static void filter_option_class_init (FilterOptionClass *klass); static void filter_option_init (FilterOption *fo); static void filter_option_finalise (GObject *obj); - static FilterElementClass *parent_class; - GType filter_option_get_type (void) { diff --git a/filter/filter-part.c b/filter/filter-part.c index 79b9da9ac0..2e74f9c926 100644 --- a/filter/filter-part.c +++ b/filter/filter-part.c @@ -41,10 +41,8 @@ static void filter_part_class_init (FilterPartClass *klass); static void filter_part_init (FilterPart *fp); static void filter_part_finalise (GObject *obj); - static GObjectClass *parent_class = NULL; - GType filter_part_get_type (void) { @@ -234,7 +232,6 @@ filter_part_xml_encode (FilterPart *fp) return part; } - gint filter_part_xml_decode (FilterPart *fp, xmlNodePtr node) { @@ -333,7 +330,6 @@ filter_part_find_element (FilterPart *ff, const gchar *name) return NULL; } - GtkWidget * filter_part_get_widget (FilterPart *ff) { diff --git a/filter/filter-rule.h b/filter/filter-rule.h index 9009fd1db0..94e80695bd 100644 --- a/filter/filter-rule.h +++ b/filter/filter-rule.h @@ -97,7 +97,6 @@ struct _FilterRuleClass { void (*changed) (FilterRule *fr); }; - GType filter_rule_get_type (void); FilterRule *filter_rule_new (void); @@ -132,5 +131,4 @@ void filter_rule_emit_changed (FilterRule *fr); FilterRule *filter_rule_next_list (GList *l, FilterRule *last, const gchar *source); FilterRule *filter_rule_find_list (GList *l, const gchar *name, const gchar *source); - #endif /* ! _FILTER_RULE_H */ diff --git a/filter/rule-context.c b/filter/rule-context.c index 5f00adff71..84cf2e4e92 100644 --- a/filter/rule-context.c +++ b/filter/rule-context.c @@ -82,7 +82,6 @@ enum { static guint signals[LAST_SIGNAL] = { 0 }; - GType rule_context_get_type(void) { diff --git a/filter/rule-editor.c b/filter/rule-editor.c index 2927938200..59006f7597 100644 --- a/filter/rule-editor.c +++ b/filter/rule-editor.c @@ -72,7 +72,6 @@ struct _RuleEditorPrivate { static GtkDialogClass *parent_class = NULL; - GType rule_editor_get_type (void) { diff --git a/mail/e-searching-tokenizer.c b/mail/e-searching-tokenizer.c index ed4a01c4c5..b9a00cddf3 100644 --- a/mail/e-searching-tokenizer.c +++ b/mail/e-searching-tokenizer.c @@ -90,7 +90,6 @@ loop: return v; } - /* note: our tags of interest are 7 bit ascii, only, no need to do any fancy utf8 stuff */ /* tags should be upper case if this list gets longer than 10 entries, consider binary search */ diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index 71a2457409..436d24f62b 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -1746,7 +1746,6 @@ emae_refresh_providers (EMAccountEditor *emae, EMAccountEditorService *service) i++; } - gtk_cell_layout_clear ((GtkCellLayout *)dropdown); gtk_combo_box_set_model (dropdown, (GtkTreeModel *)store); gtk_cell_layout_pack_start ((GtkCellLayout *)dropdown, cell, TRUE); diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index ce72600ed4..472d499b06 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -1044,7 +1044,6 @@ forward_attached (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, Cam e_msg_composer_attach (composer, part); - if (uids) setup_forward_attached_callbacks (composer, folder, uids); @@ -1400,7 +1399,6 @@ em_utils_receipt_done (CamelFolder *folder, CamelMimeMessage *msg, CamelMessageI mail_send (); } - void em_utils_send_receipt (CamelFolder *folder, CamelMimeMessage *message) { @@ -2012,7 +2010,6 @@ em_utils_get_reply_all (CamelMimeMessage *message, CamelInternetAddress *to, Cam get_reply_all (message, to, cc, postto); } - enum { ATTRIB_UNKNOWN, ATTRIB_CUSTOM, @@ -2284,7 +2281,6 @@ em_utils_construct_composer_text (CamelMimeMessage *message, EMFormat *source) return text; } - static void reply_to_message(CamelFolder *folder, const gchar *uid, CamelMimeMessage *message, gpointer user_data) { diff --git a/mail/em-config.c b/mail/em-config.c index a44554b800..357e88555b 100644 --- a/mail/em-config.c +++ b/mail/em-config.c @@ -224,7 +224,6 @@ em_config_target_new_account(EMConfig *emp, struct _EAccount *account) return t; } - /* ********************************************************************** */ /* Popup menu plugin handler */ diff --git a/mail/em-filter-editor.c b/mail/em-filter-editor.c index 378192a8da..8d720742c6 100644 --- a/mail/em-filter-editor.c +++ b/mail/em-filter-editor.c @@ -41,10 +41,8 @@ static void em_filter_editor_class_init (EMFilterEditorClass *klass); static void em_filter_editor_init (EMFilterEditor *fe); static void em_filter_editor_finalise (GObject *obj); - static RuleEditorClass *parent_class = NULL; - GType em_filter_editor_get_type (void) { diff --git a/mail/em-filter-source-element.c b/mail/em-filter-source-element.c index 1fd5a518ad..40af002d29 100644 --- a/mail/em-filter-source-element.c +++ b/mail/em-filter-source-element.c @@ -34,7 +34,6 @@ #include <libedataserver/e-account-list.h> #include <camel/camel-url.h> - static void em_filter_source_element_class_init(EMFilterSourceElementClass *klass); static void em_filter_source_element_init(EMFilterSourceElement *fs); static void em_filter_source_element_finalize(GObject *obj); @@ -64,10 +63,8 @@ struct _EMFilterSourceElementPrivate { gchar *current_url; }; - static FilterElementClass *parent_class = NULL; - GType em_filter_source_element_get_type(void) { @@ -319,7 +316,6 @@ format_sexp(FilterElement *fe, GString *out) e_sexp_encode_string(out, fs->priv->current_url); } - static void em_filter_source_element_add_source(EMFilterSourceElement *fs, const gchar *account_name, const gchar *name, const gchar *addr, const gchar *url) diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index be0b076a44..ce3a3c493f 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -910,7 +910,6 @@ emfb_set_search_folder(EMFolderView *emfv, CamelFolder *folder, const gchar *uri message_list_thaw(emfv->list); } - static void emfb_set_folder(EMFolderView *emfv, CamelFolder *folder, const gchar *uri) { diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c index 03970bbc05..198264e62b 100644 --- a/mail/em-folder-selector.c +++ b/mail/em-folder-selector.c @@ -226,7 +226,6 @@ em_folder_selector_new (EMFolderTree *emft, guint32 flags, const gchar *title, c return (GtkWidget *) emfs; } - static void emfs_create_name_activate (GtkEntry *entry, EMFolderSelector *emfs) { @@ -274,7 +273,6 @@ em_folder_selector_create_new (EMFolderTree *emft, guint32 flags, const gchar *t return (GtkWidget *) emfs; } - void em_folder_selector_set_selected (EMFolderSelector *emfs, const gchar *uri) { diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c index 6049626f16..699c8dab14 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -702,7 +702,6 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model, } } - static void folder_subscribed (CamelStore *store, CamelFolderInfo *fi, diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index 1c35699452..f298d19629 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -1791,7 +1791,6 @@ tree_drag_leave (GtkWidget *widget, GdkDragContext *context, guint time, EMFolde gtk_tree_view_set_drag_dest_row(tree_view, NULL, GTK_TREE_VIEW_DROP_BEFORE); } - #define SCROLL_EDGE_SIZE 15 static gboolean @@ -2107,7 +2106,6 @@ em_folder_tree_set_selected_list (EMFolderTree *emft, GList *list, gboolean expa } } - #if 0 static void dump_fi (CamelFolderInfo *fi, gint depth) @@ -2144,7 +2142,6 @@ em_folder_tree_set_selected (EMFolderTree *emft, g_list_free(l); } - void em_folder_tree_select_next_path (EMFolderTree *emft, gboolean skip_read_folders) { diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c index 21ec52b142..904e3908ce 100644 --- a/mail/em-folder-utils.c +++ b/mail/em-folder-utils.c @@ -583,7 +583,6 @@ static MailMsgInfo create_folder_info = { (MailMsgFreeFunc) emfu_create_folder__free }; - static gint emfu_create_folder_real (CamelStore *store, const gchar *full_name, void (* done) (CamelFolderInfo *fi, gpointer user_data), gpointer user_data) { diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index 8bb0c1e336..26ebac670f 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -395,7 +395,6 @@ emfv_edit_paste(BonoboUIComponent *uid, gpointer data, const gchar *path) // //} - //static void //emp_uri_popup_vfolder_recipient(EPopup *ep, EPopupItem *pitem, gpointer data) //{ @@ -653,7 +652,6 @@ emfv_list_done_message_selected(CamelFolder *folder, const gchar *uid, CamelMime g_object_unref (emfv); } - static gboolean emfv_message_selected_timeout(gpointer data) { diff --git a/mail/em-format-hook.c b/mail/em-format-hook.c index dd61fd6520..31aa123bdd 100644 --- a/mail/em-format-hook.c +++ b/mail/em-format-hook.c @@ -33,7 +33,6 @@ #include <glib/gi18n.h> - /* class name -> klass map for EMFormat and subclasses */ static GHashTable *emfh_types; diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index e4aa4e06ab..375eadafe2 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -175,7 +175,6 @@ struct _attach_puri { camel_cipher_validity_encrypt_t encrypt; }; - static void efhd_message_prefix(EMFormat *emf, CamelStream *stream, CamelMimePart *part, EMFormatHandler *info); static void efhd_builtin_init(EMFormatHTMLDisplayClass *efhc); diff --git a/mail/em-format-html.c b/mail/em-format-html.c index 9da3484f99..31c4cf0e88 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -2216,7 +2216,6 @@ efh_format_address (EMFormatHTML *efh, GString *out, struct _camel_header_addres if (limit > 0 && i>(limit)) { - if (!strcmp (field, _("To"))) { str = g_strdup_printf ("<a href=\"##TO##\"><img src=\"%s/minus.png\" /></a> ", EVOLUTION_ICONSDIR); } diff --git a/mail/em-inline-filter.c b/mail/em-inline-filter.c index ab46628dd5..2b68ed65b9 100644 --- a/mail/em-inline-filter.c +++ b/mail/em-inline-filter.c @@ -83,7 +83,6 @@ em_inline_filter_init (CamelObject *object) emif->data = g_byte_array_new(); } - static void em_inline_filter_finalize (CamelObject *object) { diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c index 8bea632f24..d572c89eaf 100644 --- a/mail/em-subscribe-editor.c +++ b/mail/em-subscribe-editor.c @@ -801,7 +801,6 @@ static void sub_editor_busy(EMSubscribeEditor *se, gint dir) } } - #define DEFAULT_WIDTH 600 #define DEFAULT_HEIGHT 400 diff --git a/mail/em-utils.c b/mail/em-utils.c index a971b90f34..b47b934ee2 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -343,7 +343,6 @@ em_filename_make_safe (gchar *string) } } - /* Saving messages... */ static const gchar * @@ -536,7 +535,6 @@ exit: gtk_widget_destroy (file_chooser); } - /** * em_utils_save_part_to_file: * @parent: parent window @@ -2264,7 +2262,6 @@ em_utils_clear_get_password_canceled_accounts_flag (void) } } - void em_utils_show_error_silent (GtkWidget *widget) { diff --git a/mail/em-vfolder-editor.c b/mail/em-vfolder-editor.c index 9c6f5f8908..84acd5f293 100644 --- a/mail/em-vfolder-editor.c +++ b/mail/em-vfolder-editor.c @@ -41,7 +41,6 @@ static FilterRule *create_rule (RuleEditor *re); static RuleEditorClass *parent_class = NULL; - static void em_vfolder_editor_finalise (GObject *obj) { diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c index 2dfac64eb1..4d690115ac 100644 --- a/mail/em-vfolder-rule.c +++ b/mail/em-vfolder-rule.c @@ -567,7 +567,6 @@ source_remove(GtkWidget *widget, struct _source_data *data) set_sensitive(data); } - GtkWidget *em_vfolder_editor_sourcelist_new(gchar *widget_name, gchar *string1, gchar *string2, gint int1, gint int2); diff --git a/mail/importers/mail-importer.h b/mail/importers/mail-importer.h index 7759a4e4e7..6c5878e633 100644 --- a/mail/importers/mail-importer.h +++ b/mail/importers/mail-importer.h @@ -73,7 +73,6 @@ BonoboObject *outlook_importer_new(void); BonoboObject *mail_importer_factory_cb(BonoboGenericFactory *factory, const gchar *iid, gpointer data); - /* Defines copied from nsMsgMessageFlags.h in Mozilla source. */ /* Evolution only cares about these headers I think */ #define MSG_FLAG_READ 0x0001 diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c index fd7fc5752b..ece7e75ca5 100644 --- a/mail/mail-autofilter.c +++ b/mail/mail-autofilter.c @@ -74,7 +74,6 @@ rule_match_recipients (RuleContext *context, FilterRule *rule, CamelInternetAddr } } - /* remove 're' part of a subject */ static const gchar * strip_re (const gchar *subject) diff --git a/mail/mail-component.c b/mail/mail-component.c index 176a6cb875..0963a81726 100644 --- a/mail/mail-component.c +++ b/mail/mail-component.c @@ -302,7 +302,6 @@ impl_createView (PortableServer_Servant servant, // e_user_creatable_items_handler_new("mail", create_local_item_cb, tree_widget), // (GDestroyNotify)g_object_unref); - g_signal_connect (component_view->view_control, "activate", G_CALLBACK (view_control_activate_cb), view_widget); // g_signal_connect (tree_widget, "folder-selected", G_CALLBACK (folder_selected_cb), view_widget); diff --git a/mail/mail-config.c b/mail/mail-config.c index b1cfd5ab29..1ac6892b74 100644 --- a/mail/mail-config.c +++ b/mail/mail-config.c @@ -483,7 +483,6 @@ mail_config_clear (void) config_clear_mime_types (); } - void mail_config_write (void) { diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c index b3d7a1e12b..bf728aa963 100644 --- a/mail/mail-folder-cache.c +++ b/mail/mail-folder-cache.c @@ -858,7 +858,6 @@ update_folders(CamelStore *store, CamelFolderInfo *fi, gpointer data) return res; } - struct _ping_store_msg { MailMsg base; diff --git a/mail/mail-mt.c b/mail/mail-mt.c index c5b6edaa14..490f54f8e5 100644 --- a/mail/mail-mt.c +++ b/mail/mail-mt.c @@ -159,7 +159,6 @@ end_event_callback (CamelObject *o, EActivity *activity, gpointer error) } } - #ifdef MALLOC_CHECK #include <mcheck.h> @@ -352,7 +351,6 @@ void mail_msg_cancel(guint msgid) MAIL_MT_UNLOCK(mail_msg_lock); } - /* waits for a message to be finished processing (freed) the messageid is from MailMsg->seq */ void mail_msg_wait(guint msgid) diff --git a/mail/mail-ops.c b/mail/mail-ops.c index 1c00420f89..eb3fd0cb00 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -587,8 +587,6 @@ mail_send_message(CamelFolder *queue, const gchar *uid, const gchar *destination camel_object_ref(folder); } - - camel_folder_append_message (folder, message, info, NULL, ex); if (camel_exception_is_set (ex)) { CamelFolder *sent_folder; @@ -2266,7 +2264,6 @@ mail_save_part (CamelMimePart *part, const gchar *path, return id; } - /* ** PREPARE OFFLINE ***************************************************** */ struct _prep_offline_msg { diff --git a/mail/mail-session.c b/mail/mail-session.c index bdb5d915c9..4bd0a5f78d 100644 --- a/mail/mail-session.c +++ b/mail/mail-session.c @@ -151,7 +151,6 @@ mail_session_get_type (void) return mail_session_type; } - static gchar * make_key (CamelService *service, const gchar *item) { diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index 487eea0e10..96d60ab5f0 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -301,7 +301,6 @@ static MailMsgInfo vfolder_adduri_info = { (MailMsgFreeFunc) vfolder_adduri_free }; - /* uri should be a camel uri */ static gint vfolder_adduri(const gchar *uri, GList *folders, gint remove) @@ -1124,7 +1123,6 @@ new_rule_clicked(GtkWidget *w, gint button, gpointer data) return; } - g_object_ref(rule); rule_context_add_rule((RuleContext *)context, rule); data_dir = em_utils_get_data_dir (); diff --git a/mail/message-list.c b/mail/message-list.c index d28e9a9d0e..d3db1f37ba 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -719,7 +719,6 @@ message_list_select_all (MessageList *message_list) e_selection_model_select_all (etsm); } - typedef struct thread_select_info { MessageList *ml; GPtrArray *paths; @@ -1081,7 +1080,6 @@ static const gchar *score_map[] = { N_("Highest"), }; - static gchar * ml_value_to_string (ETreeModel *etm, gint col, gconstpointer value, gpointer data) { @@ -2700,7 +2698,6 @@ message_list_construct (MessageList *message_list) g_signal_connect((message_list->tree), "selection_change", G_CALLBACK (on_selection_changed_cmd), message_list); - e_tree_drag_source_set(message_list->tree, GDK_BUTTON1_MASK, ml_drag_types, sizeof(ml_drag_types)/sizeof(ml_drag_types[0]), GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_ASK); @@ -2843,7 +2840,6 @@ is_node_selectable (MessageList *ml, CamelMessageInfo *info) return FALSE; } - /* We try and find something that is selectable in our tree. There is * actually no assurance that we'll find something that will still be * there next time, but its probably going to work most of the time. */ @@ -3382,7 +3378,6 @@ build_flat_diff(MessageList *ml, CamelFolderChangeInfo *changes) } #endif /* ! BROKEN_ETREE */ - static void mail_folder_hide_by_flag (CamelFolder *folder, MessageList *ml, CamelFolderChangeInfo **changes, gint flag) { @@ -4391,7 +4386,6 @@ regen_list_done (struct _regen_list_msg *m) if (m->ml->priv->destroyed) return; - if (!m->complete) return; @@ -4656,14 +4650,12 @@ mail_regen_list (MessageList *ml, const gchar *search, const gchar *hideexpr, Ca } } - gdouble message_list_get_scrollbar_position (MessageList *ml) { return gtk_range_get_value ((GtkRange *) ((GtkScrolledWindow *) ml)->vscrollbar); } - void message_list_set_scrollbar_position (MessageList *ml, double pos) { diff --git a/mail/message-tag-editor.c b/mail/message-tag-editor.c index d3a1d15bfe..1936cd8717 100644 --- a/mail/message-tag-editor.c +++ b/mail/message-tag-editor.c @@ -21,7 +21,6 @@ * */ - #ifdef HAVE_CONFIG_H #include <config.h> #endif @@ -86,7 +85,6 @@ message_tag_editor_init (MessageTagEditor *editor) gtk_dialog_set_default_response (GTK_DIALOG (editor), GTK_RESPONSE_OK); } - static void message_tag_editor_finalise (GObject *obj) { @@ -109,7 +107,6 @@ message_tag_editor_get_tag_list (MessageTagEditor *editor) return MESSAGE_TAG_EDITOR_GET_CLASS (editor)->get_tag_list (editor); } - static void set_tag_list (MessageTagEditor *editor, CamelTag *tags) { diff --git a/mail/message-tag-editor.h b/mail/message-tag-editor.h index 3b097c190c..0187f81e92 100644 --- a/mail/message-tag-editor.h +++ b/mail/message-tag-editor.h @@ -55,7 +55,6 @@ struct _MessageTagEditorClass { /* signals */ }; - GType message_tag_editor_get_type (void); /* methods */ diff --git a/mail/message-tag-followup.c b/mail/message-tag-followup.c index 9959f99142..6ccd74459a 100644 --- a/mail/message-tag-followup.c +++ b/mail/message-tag-followup.c @@ -49,7 +49,6 @@ static void message_tag_followup_finalise (GObject *obj); static CamelTag *get_tag_list (MessageTagEditor *editor); static void set_tag_list (MessageTagEditor *editor, CamelTag *tags); - #define DEFAULT_FLAG 2 /* Follow-Up */ static const gchar *available_flags[] = { N_("Call"), @@ -67,10 +66,8 @@ static const gchar *available_flags[] = { static gint num_available_flags = sizeof (available_flags) / sizeof (available_flags[0]); - static MessageTagEditorClass *parent_class = NULL; - GType message_tag_followup_get_type (void) { @@ -119,7 +116,6 @@ message_tag_followup_init (MessageTagFollowUp *editor) editor->completed_date = 0; } - static void message_tag_followup_finalise (GObject *obj) { @@ -130,7 +126,6 @@ message_tag_followup_finalise (GObject *obj) G_OBJECT_CLASS (parent_class)->finalize (obj); } - static CamelTag * get_tag_list (MessageTagEditor *editor) { diff --git a/mail/message-tag-followup.h b/mail/message-tag-followup.h index c7ed55c61a..87dde7637a 100644 --- a/mail/message-tag-followup.h +++ b/mail/message-tag-followup.h @@ -60,7 +60,6 @@ struct _MessageTagFollowUpClass { /* signals */ }; - GType message_tag_followup_get_type (void); MessageTagEditor *message_tag_followup_new (void); diff --git a/modules/addressbook/addressbook-config.c b/modules/addressbook/addressbook-config.c index e663de03da..8c1c3376ec 100644 --- a/modules/addressbook/addressbook-config.c +++ b/modules/addressbook/addressbook-config.c @@ -627,7 +627,6 @@ eabc_general_name(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget * return w; } - static GtkWidget * eabc_general_offline(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { @@ -718,7 +717,6 @@ ssl_combobox_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog) gtk_widget_set_tooltip_text (sdialog->ssl_combobox, ldap_get_ssl_tooltip (sdialog->ssl)); } - static GtkWidget * eabc_general_host(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { @@ -1241,7 +1239,6 @@ addressbook_config_edit_source (GtkWidget *parent, ESource *source) else sdialog->window = e_config_create_window((EConfig *)ec, NULL, _("New Address Book")); - /* forces initial validation */ if (!sdialog->original_source) e_config_target_changed((EConfig *)ec, E_CONFIG_TARGET_CHANGED_STATE); diff --git a/modules/addressbook/e-book-shell-migrate.c b/modules/addressbook/e-book-shell-migrate.c index fce6e0a634..c237f40d94 100644 --- a/modules/addressbook/e-book-shell-migrate.c +++ b/modules/addressbook/e-book-shell-migrate.c @@ -207,7 +207,6 @@ get_source_name (ESourceGroup *group, const gchar *path) conflict = check_for_conflict (group, s->str); - /* if there was a conflict back up 2 levels (skipping the /subfolder/ element) */ if (conflict) starting_index -= 2; @@ -1223,7 +1222,6 @@ e_book_shell_backend_migrate (EShellBackend *shell_backend, if (personal_source) g_object_unref (personal_source); - migration_context_free (context); return TRUE; diff --git a/modules/addressbook/openldap-extract.h b/modules/addressbook/openldap-extract.h index 996bf370a8..2d8c34b242 100644 --- a/modules/addressbook/openldap-extract.h +++ b/modules/addressbook/openldap-extract.h @@ -97,7 +97,6 @@ typedef struct ldap_objectclass { gchar **oc_at_oids_may; /* OPTIONAL */ } LDAPObjectClass; - static void vfree(gpointer *vec) { diff --git a/modules/calendar/e-cal-shell-migrate.c b/modules/calendar/e-cal-shell-migrate.c index 9887a5332c..9f611f9944 100644 --- a/modules/calendar/e-cal-shell-migrate.c +++ b/modules/calendar/e-cal-shell-migrate.c @@ -231,7 +231,6 @@ get_source_name (ESourceGroup *group, const gchar *path) conflict = check_for_conflict (group, s->str); - /* if there was a conflict back up 2 levels (skipping the /subfolder/ element) */ if (conflict) starting_index -= 2; diff --git a/modules/calendar/e-memo-shell-migrate.c b/modules/calendar/e-memo-shell-migrate.c index d2e7df6d1b..20b9fea43e 100644 --- a/modules/calendar/e-memo-shell-migrate.c +++ b/modules/calendar/e-memo-shell-migrate.c @@ -153,7 +153,6 @@ add_gw_esource (ESourceList *source_list, const gchar *group_name, const gchar const gchar *poa_address; const gchar *offline_sync; - poa_address = url->host; if (!poa_address || strlen (poa_address) ==0) return; diff --git a/modules/calendar/e-task-shell-migrate.c b/modules/calendar/e-task-shell-migrate.c index ced54bafdf..2e7928fd14 100644 --- a/modules/calendar/e-task-shell-migrate.c +++ b/modules/calendar/e-task-shell-migrate.c @@ -197,7 +197,6 @@ get_source_name (ESourceGroup *group, const gchar *path) conflict = check_for_conflict (group, s->str); - /* if there was a conflict back up 2 levels (skipping the /subfolder/ element) */ if (conflict) starting_index -= 2; diff --git a/modules/mail/e-mail-shell-migrate.c b/modules/mail/e-mail-shell-migrate.c index 2158580bf9..4bdb66d215 100644 --- a/modules/mail/e-mail-shell-migrate.c +++ b/modules/mail/e-mail-shell-migrate.c @@ -1089,7 +1089,6 @@ em_migrate_session_new (const gchar *path) return session; } - #endif /* !G_OS_WIN32 */ static GtkWidget *window; @@ -2941,13 +2940,11 @@ migrate_to_db (EShellBackend *shell_backend) i++; em_migrate_set_progress ( (double)i/(len+1)); - while (e_iterator_is_valid (iter)) { EAccount *account = (EAccount *) e_iterator_get (iter); EAccountService *service; const gchar *name; - service = account->source; name = account->name; em_migrate_set_progress ( (double)i/(len+1)); @@ -3091,7 +3088,6 @@ e_mail_shell_migrate (EShellBackend *shell_backend, #endif } - if (major < 2 || (major == 2 && minor < 22)) em_update_message_notify_settings_2_21 (); diff --git a/modules/mail/e-mail-shell-settings.c b/modules/mail/e-mail-shell-settings.c index 7f73bf3f15..827d3bf5e7 100644 --- a/modules/mail/e-mail-shell-settings.c +++ b/modules/mail/e-mail-shell-settings.c @@ -408,7 +408,6 @@ e_mail_shell_settings_init (EShell *shell) shell_settings, "mail-use-custom-fonts", "/apps/evolution/mail/display/fonts/use_custom"); - /*** Composer Preferences ***/ e_shell_settings_install_property ( diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c index 36afca41ae..d9ec9e751b 100644 --- a/modules/mail/em-mailer-prefs.c +++ b/modules/mail/em-mailer-prefs.c @@ -308,7 +308,6 @@ jh_remove_cb (GtkWidget *widget, gpointer user_data) } } - static GtkListStore * init_junk_tree (GtkWidget *label_tree, EMMailerPrefs *prefs) { @@ -544,7 +543,6 @@ custom_junk_button_toggled (GtkToggleButton *toggle, EMMailerPrefs *prefs) gtk_widget_set_sensitive ((GtkWidget *) prefs->junk_header_remove, FALSE); } - } static void @@ -667,7 +665,6 @@ http_images_changed (GtkWidget *widget, EMMailerPrefs *prefs) gconf_client_set_int (prefs->gconf, "/apps/evolution/mail/display/load_http_images", when, NULL); } - static GtkWidget * emmp_widget_glade(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { @@ -1206,7 +1203,6 @@ em_mailer_prefs_new (EShell *shell) return GTK_WIDGET (new); } - static struct _EMMailerPrefsHeader * emmp_header_from_xmldoc (xmlDocPtr doc) { diff --git a/modules/mail/em-network-prefs.c b/modules/mail/em-network-prefs.c index e530d4d076..4c05fca77d 100644 --- a/modules/mail/em-network-prefs.c +++ b/modules/mail/em-network-prefs.c @@ -66,10 +66,8 @@ static void em_network_prefs_init (EMNetworkPrefs *dialog); static void em_network_prefs_destroy (GtkObject *obj); static void em_network_prefs_finalise (GObject *obj); - static GtkVBoxClass *parent_class = NULL; - GType em_network_prefs_get_type (void) { diff --git a/plugins/addressbook-file/addressbook-file.c b/plugins/addressbook-file/addressbook-file.c index 960c844aa4..2168d324cc 100644 --- a/plugins/addressbook-file/addressbook-file.c +++ b/plugins/addressbook-file/addressbook-file.c @@ -45,7 +45,6 @@ e_book_file_dummy (EPlugin *epl, EConfigHookItemFactoryData *data) relative_uri = e_source_peek_relative_uri (source); g_free (uri_text); - if (relative_uri && *relative_uri) { return NULL; } diff --git a/plugins/attachment-reminder/attachment-reminder.c b/plugins/attachment-reminder/attachment-reminder.c index e0b85f5b89..0ff48d3f69 100644 --- a/plugins/attachment-reminder/attachment-reminder.c +++ b/plugins/attachment-reminder/attachment-reminder.c @@ -62,7 +62,6 @@ typedef struct { GtkListStore *store; } UIData; - enum { CLUE_KEYWORD_COLUMN, CLUE_N_COLUMNS @@ -157,7 +156,6 @@ check_for_attachment_clues (gchar *msg) gconf = gconf_client_get_default (); - /* Get the list from gconf */ clue_list = gconf_client_get_list ( gconf, GCONF_KEY_ATTACH_REMINDER_CLUES, GCONF_VALUE_STRING, NULL ); diff --git a/plugins/audio-inline/audio-inline.c b/plugins/audio-inline/audio-inline.c index c6a7b94db1..9de5512e0f 100644 --- a/plugins/audio-inline/audio-inline.c +++ b/plugins/audio-inline/audio-inline.c @@ -62,7 +62,6 @@ org_gnome_audio_inline_pobject_free (EMFormatHTMLPObject *o) d(printf ("audio inline formatter: pobject free\n")); - if (po->play_button) { g_object_unref (po->play_button); po->play_button = NULL; @@ -246,7 +245,6 @@ org_gnome_audio_inline_play_clicked (GtkWidget *button, EMFormatHTMLPObject *pob gst_element_set_state (po->playbin, GST_STATE_READY); } - if (po->playbin) { /* start playing */ gst_element_set_state (po->playbin, GST_STATE_PLAYING); diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c index b4f0d98011..860a70a3d5 100644 --- a/plugins/backup-restore/backup-restore.c +++ b/plugins/backup-restore/backup-restore.c @@ -55,18 +55,18 @@ static void backup (const gchar *filename, gboolean restart) { if (restart) - execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--backup", "--restart", filename, (char *)NULL); + execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--backup", "--restart", filename, (gchar *)NULL); else - execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--backup", filename, (char *)NULL); + execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--backup", filename, (gchar *)NULL); } static void restore (const gchar *filename, gboolean restart) { if (restart) - execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--restore", "--restart", filename, (char *)NULL); + execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--restore", "--restart", filename, (gchar *)NULL); else - execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--restore", filename, (char *)NULL); + execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--restore", filename, (gchar *)NULL); } static gboolean @@ -162,7 +162,6 @@ org_gnome_backup_restore_backup (EPlugin *ep, ESMenuTargetShell *target) dir = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dlg)); gtk_widget_destroy (dlg); - if (epbr_perform_pre_backup_checks (dir)) { mask = dialog_prompt_user (GTK_WINDOW (target->target.widget), _("_Restart Evolution after backup"), "org.gnome.backup-restore:backup-confirm", NULL); @@ -310,7 +309,6 @@ backup_restore_page (EPlugin *ep, EConfigHookItemFactoryData *hook_data) gtk_box_pack_start ((GtkBox *)box, hbox, FALSE, FALSE, 0); gtk_widget_set_sensitive (hbox, FALSE); - gtk_container_add ((GtkContainer *) GNOME_DRUID_PAGE_STANDARD (page)->vbox, box); gtk_widget_show_all (box); gnome_druid_append_page (GNOME_DRUID (hook_data->parent), GNOME_DRUID_PAGE (page)); diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c index 1ca9a52dc2..f28593836e 100644 --- a/plugins/backup-restore/backup.c +++ b/plugins/backup-restore/backup.c @@ -80,7 +80,6 @@ static GOptionEntry options[] = { static gboolean check (const gchar *filename); - static GString * replace_string (const gchar *text, const gchar *find, const gchar *replace) { diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c index 964be67565..c7d7cdfdcb 100644 --- a/plugins/bbdb/bbdb.c +++ b/plugins/bbdb/bbdb.c @@ -448,8 +448,6 @@ add_email_to_contact (EContact *contact, const gchar *email) e_contact_set (contact, E_CONTACT_EMAIL, (gpointer) emails); } - - /* Code to implement the configuration user interface follows */ static void diff --git a/plugins/bbdb/bbdb.h b/plugins/bbdb/bbdb.h index 994aab0385..9b35d85c1e 100644 --- a/plugins/bbdb/bbdb.h +++ b/plugins/bbdb/bbdb.h @@ -31,7 +31,6 @@ #define GAIM_ADDRESSBOOK 1 #define AUTOMATIC_CONTACTS_ADDRESSBOOK 0 - /* How often to poll the buddy list for changes (every two minutes) */ #define BBDB_BLIST_CHECK_INTERVAL (2 * 60) @@ -43,5 +42,4 @@ gboolean bbdb_check_gaim_enabled (void); void bbdb_sync_buddy_list (void); void bbdb_sync_buddy_list_check (void); - #endif /* __BBDB_H__ */ diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c index 98eb3d05e4..292f5d9fc0 100644 --- a/plugins/bbdb/gaimbuddies.c +++ b/plugins/bbdb/gaimbuddies.c @@ -174,7 +174,6 @@ bbdb_sync_buddy_list (void) } - /* Update the last-sync'd time */ { GConfClient *gconf; @@ -407,7 +406,6 @@ get_buddy_icon_from_setting (xmlNodePtr setting) icon = path; } - return icon; } diff --git a/plugins/bogo-junk-plugin/bf-junk-filter.c b/plugins/bogo-junk-plugin/bf-junk-filter.c index 7da5584db4..3de8c30955 100644 --- a/plugins/bogo-junk-plugin/bf-junk-filter.c +++ b/plugins/bogo-junk-plugin/bf-junk-filter.c @@ -52,7 +52,6 @@ #include <camel/camel-debug.h> #include <gconf/gconf-client.h> - #ifndef BOGOFILTER_BINARY #define BOGOFILTER_BINARY "/usr/bin/bogofilter" #endif @@ -61,7 +60,6 @@ #define EM_JUNK_BF_GCONF_DIR "/apps/evolution/mail/junk/bogofilter" - #define d(x) (camel_debug("junk")?(x):0) static gboolean enabled = FALSE; @@ -84,7 +82,6 @@ gint e_plugin_lib_enable (EPluginLib *ep, gint enable); #define EM_JUNK_BF_GCONF_DIR_LENGTH (G_N_ELEMENTS (em_junk_bf_gconf_dir) - 1) - static gboolean em_junk_bf_unicode = TRUE; static void @@ -380,4 +377,3 @@ org_gnome_bogo_convert_unicode (struct _EPlugin *epl, struct _EConfigHookItemFac return (GtkWidget *)check; } - diff --git a/plugins/caldav/caldav-source.c b/plugins/caldav/caldav-source.c index d28f24a8d4..3407353574 100644 --- a/plugins/caldav/caldav-source.c +++ b/plugins/caldav/caldav-source.c @@ -462,4 +462,3 @@ oge_caldav (EPlugin *epl, return widget; } - diff --git a/plugins/default-source/default-source.c b/plugins/default-source/default-source.c index 3f2c4635d5..198d2f2671 100644 --- a/plugins/default-source/default-source.c +++ b/plugins/default-source/default-source.c @@ -56,7 +56,6 @@ commit_default_book (EPlugin *epl, EConfigTarget *target) if (e_source_get_property (source, "default")) e_book_set_default_source (source, NULL); - } static void @@ -69,7 +68,6 @@ default_source_changed (GtkWidget *check_box, ESource *source) e_source_set_property (source, "default", NULL); } - GtkWidget * org_gnome_default_book (EPlugin *epl, EConfigHookItemFactoryData *data) { diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c index e160e706c8..c7fee4a2b9 100644 --- a/plugins/email-custom-header/email-custom-header.c +++ b/plugins/email-custom-header/email-custom-header.c @@ -38,7 +38,6 @@ #include "e-util/e-util.h" #include "email-custom-header.h" - #define d(x) #define GCONF_KEY_CUSTOM_HEADER "/apps/evolution/eplugin/email_custom_header/customHeader" diff --git a/plugins/email-custom-header/email-custom-header.h b/plugins/email-custom-header/email-custom-header.h index 9bba66d655..ac2b8f1204 100644 --- a/plugins/email-custom-header/email-custom-header.h +++ b/plugins/email-custom-header/email-custom-header.h @@ -58,7 +58,6 @@ typedef struct { GtkWidget *header_value_combo_box; } HeaderValueComboBox; - struct _CustomHeaderOptionsDialogClass { GObjectClass parent_class; void (* emch_response) (CustomHeaderOptionsDialog *esd, gint status); diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c index 46f4101bb9..296e44282c 100644 --- a/plugins/exchange-operations/exchange-account-setup.c +++ b/plugins/exchange-operations/exchange-account-setup.c @@ -80,7 +80,6 @@ CamelServiceAuthType camel_exchange_password_authtype = { TRUE }; - typedef struct { gboolean state; gchar *message; @@ -297,14 +296,12 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data) } g_signal_connect (radio_oof, "toggled", G_CALLBACK (toggled_state), NULL); - gtk_table_attach (tbl_oof_status, GTK_WIDGET (lbl_status), 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0); gtk_table_attach (tbl_oof_status, GTK_WIDGET (radio_iof), 1, 2, 0, 1, GTK_FILL, GTK_FILL, 0, 0); gtk_table_attach (tbl_oof_status, GTK_WIDGET (radio_oof), 1, 2, 1, 2, GTK_FILL, GTK_FILL, 0, 0); gtk_box_pack_start (GTK_BOX (vbox_oof), GTK_WIDGET (tbl_oof_status), FALSE, FALSE, 0); - scrwnd_oof = (GtkScrolledWindow*) g_object_new (GTK_TYPE_SCROLLED_WINDOW, "hscrollbar-policy", GTK_POLICY_AUTOMATIC, "vscrollbar-policy", GTK_POLICY_AUTOMATIC, "shadow-type", GTK_SHADOW_IN, NULL); gtk_box_pack_start (GTK_BOX (vbox_oof), GTK_WIDGET (scrwnd_oof), FALSE, FALSE, 0); txtview_oof = (GtkTextView*) g_object_new (GTK_TYPE_TEXT_VIEW, "justification", GTK_JUSTIFY_LEFT, "wrap-mode", GTK_WRAP_WORD, "editable", TRUE, NULL); @@ -510,7 +507,6 @@ owa_authenticate_user(GtkWidget *button, EConfig *config) camel_url_set_host (url, valid ? exchange_params->host : ""); - if (valid) camel_url_set_param (url, "save-passwd", remember_password? "true" : "false"); @@ -964,7 +960,6 @@ exchange_authtype_changed (GtkComboBox *dropdown, EConfig *config) camel_url_free(url_transport); } - GtkWidget * org_gnome_exchange_auth_section (EPlugin *epl, EConfigHookItemFactoryData *data) { diff --git a/plugins/exchange-operations/exchange-config-listener.c b/plugins/exchange-operations/exchange-config-listener.c index 4e10acabdd..a45d9bc309 100644 --- a/plugins/exchange-operations/exchange-config-listener.c +++ b/plugins/exchange-operations/exchange-config-listener.c @@ -177,7 +177,6 @@ finalize (GObject *object) E2K_MAKE_TYPE (exchange_config_listener, ExchangeConfigListener, class_init, init, PARENT_TYPE) - #define EVOLUTION_URI_PREFIX "evolution:/" #define EVOLUTION_URI_PREFIX_LEN (sizeof (EVOLUTION_URI_PREFIX) - 1) @@ -251,7 +250,6 @@ add_defaults_for_account (ExchangeConfigListener *config_listener, } } - static gboolean is_active_exchange_account (EAccount *account) { @@ -355,7 +353,6 @@ add_account_esources (ExchangeAccount *account, g_object_unref (source); g_free (relative_uri); - } else if (folder->type == EXCHANGE_TASKS_FOLDER){ relative_uri = g_strdup (folder->uri + @@ -1281,7 +1278,6 @@ exchange_add_autocompletion_folders (GConfClient *gc_client, ExchangeAccount *ac } #endif - /** * exchange_camel_urls_is_equal * @@ -1331,7 +1327,6 @@ exchange_camel_urls_is_equal (const gchar *url1, const gchar *url2) return TRUE; } - /** * remove_selected_non_offline_esources * @@ -1356,7 +1351,6 @@ remove_selected_non_offline_esources (ExchangeAccount *account, const gchar *gco const gchar *offline_mode=NULL; gchar *selected_gconf_key; - if (gconf_key && !strcmp (gconf_key, CONF_KEY_CAL)) { selected_gconf_key = g_strdup (CONF_KEY_SELECTED_CAL_SOURCES); } else if (gconf_key && !strcmp (gconf_key, CONF_KEY_TASKS)) { diff --git a/plugins/exchange-operations/exchange-contacts.c b/plugins/exchange-operations/exchange-contacts.c index aec27f3f69..7fb9f858b6 100644 --- a/plugins/exchange-operations/exchange-contacts.c +++ b/plugins/exchange-operations/exchange-contacts.c @@ -51,7 +51,6 @@ enum { gboolean contacts_src_exists = FALSE; gchar *contacts_old_src_uri = NULL; - static GPtrArray *e_exchange_contacts_get_contacts (void); void e_exchange_contacts_pcontacts_on_change (GtkTreeView *treeview, ESource *source); GtkWidget *e_exchange_contacts_pcontacts (EPlugin *epl, EConfigHookItemFactoryData *data); diff --git a/plugins/exchange-operations/exchange-delegates-user.c b/plugins/exchange-operations/exchange-delegates-user.c index 085bce398b..bc8cb1e357 100644 --- a/plugins/exchange-operations/exchange-delegates-user.c +++ b/plugins/exchange-operations/exchange-delegates-user.c @@ -48,7 +48,6 @@ #include <string.h> - #define EXCHANGE_DELEGATES_USER_CUSTOM -3 /* Can't use E2K_PERMISSIONS_ROLE_CUSTOM, because it's -1, which * means "end of list" to e_dialog_combo_box_get/set @@ -80,7 +79,6 @@ static const gchar *widget_names[] = { "calendar_perms_combobox", "task_perms_combobox", "inbox_perms_combobox", "contact_perms_combobox", }; - enum { EDITED, LAST_SIGNAL @@ -193,7 +191,6 @@ em_utils_delegates_done (CamelFolder *folder, CamelMimeMessage *msg, CamelMessag mail_send (); } - /** * exchange_delegates_user_edit: * @user: a delegate @@ -281,7 +278,6 @@ exchange_delegates_user_edit (ExchangeAccount *account, } } - /* The following piece of code is used to construct a mail message to be sent to a Delegate summarizing all the permissions set for him on the user's various folders. */ diff --git a/plugins/exchange-operations/exchange-delegates-user.h b/plugins/exchange-operations/exchange-delegates-user.h index deb5b04152..3d886d7262 100644 --- a/plugins/exchange-operations/exchange-delegates-user.h +++ b/plugins/exchange-operations/exchange-delegates-user.h @@ -76,8 +76,6 @@ ExchangeDelegatesUser *exchange_delegates_user_new_from_gc (E2kGlobalCatalog gboolean exchange_delegates_user_edit (ExchangeAccount *account, ExchangeDelegatesUser *user, GtkWidget *parent_window); - - G_END_DECLS #endif /* __EXCHANGE_DELEGATES_USER_H__ */ diff --git a/plugins/exchange-operations/exchange-delegates.c b/plugins/exchange-operations/exchange-delegates.c index 5ecc02e0b1..7b466ead07 100644 --- a/plugins/exchange-operations/exchange-delegates.c +++ b/plugins/exchange-operations/exchange-delegates.c @@ -280,7 +280,6 @@ get_folder_security (ExchangeDelegates *delegates) return TRUE; } - static const gchar *delegation_props[] = { PR_DELEGATES_DISPLAY_NAMES, PR_DELEGATES_ENTRYIDS, @@ -603,7 +602,6 @@ remove_button_clicked_cb (GtkWidget *widget, gpointer data) g_object_unref (user); } - static gboolean proppatch_sd (E2kContext *ctx, ExchangeDelegatesFolder *folder) { @@ -887,7 +885,6 @@ delegates_destroy (ExchangeDelegates *delegates) g_free (delegates); } - static void dialog_response (GtkDialog *dialog, gint response, gpointer user_data) { diff --git a/plugins/exchange-operations/exchange-folder-subscription.c b/plugins/exchange-operations/exchange-folder-subscription.c index f8772373cb..043d5797e4 100644 --- a/plugins/exchange-operations/exchange-folder-subscription.c +++ b/plugins/exchange-operations/exchange-folder-subscription.c @@ -25,7 +25,6 @@ #include "config.h" #endif - #include <glade/glade-xml.h> #include <gtk/gtk.h> #include <e-util/e-error.h> @@ -57,7 +56,6 @@ user_clicked (GtkWidget *button, ENameSelector *name_selector) gtk_widget_show (GTK_WIDGET (name_selector_dialog)); } - static GtkWidget * setup_name_selector (GladeXML *glade_xml, ENameSelector **name_selector_ret) { diff --git a/plugins/exchange-operations/exchange-folder.c b/plugins/exchange-operations/exchange-folder.c index 959bdec8e5..7c9f1bff41 100644 --- a/plugins/exchange-operations/exchange-folder.c +++ b/plugins/exchange-operations/exchange-folder.c @@ -24,7 +24,6 @@ #include "config.h" #endif - #include <glib/gi18n.h> #include <gtk/gtk.h> #include <gconf/gconf-client.h> @@ -62,7 +61,6 @@ static void exchange_get_folder (gchar *uri, CamelFolder *folder, gpointer data) #define CONF_KEY_SELECTED_CAL_SOURCES "/apps/evolution/calendar/display/selected_calendars" - static EPopupItem popup_inbox_items[] = { { E_POPUP_ITEM, (gchar *) "29.inbox_unsubscribe", (gchar *) N_("Unsubscribe Folder..."), org_gnome_exchange_folder_inbox_unsubscribe, NULL, (gchar *) "folder-new", 0, EM_POPUP_FOLDER_INFERIORS } }; @@ -143,7 +141,6 @@ org_gnome_exchange_folder_inbox_unsubscribe (EPopup *ep, EPopupItem *p, gpointer /* To get the CamelStore/Folder */ mail_get_folder (inbox_physical_uri, 0, exchange_get_folder, target_uri, mail_msg_unordered_push); - } static CamelFolderInfo * @@ -539,7 +536,6 @@ org_gnome_exchange_folder_unsubscribe (EPopup *ep, EPopupItem *p, gpointer data) unsubscribe_dialog_response (GTK_DIALOG (dialog), response, data); } - void org_gnome_exchange_folder_subscription (EPlugin *ep, EMMenuTargetSelect *target, const gchar *fname) { diff --git a/plugins/exchange-operations/exchange-mail-send-options.c b/plugins/exchange-operations/exchange-mail-send-options.c index 87f851a8c8..4cc582f25f 100644 --- a/plugins/exchange-operations/exchange-mail-send-options.c +++ b/plugins/exchange-operations/exchange-mail-send-options.c @@ -113,7 +113,6 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data) dialog->options->delegate_address); } - else { e_msg_composer_remove_header (composer, "Sender"); e_msg_composer_add_header (composer, "From", sender_id); diff --git a/plugins/exchange-operations/exchange-permissions-dialog.c b/plugins/exchange-operations/exchange-permissions-dialog.c index 9456754377..d8182a6fe1 100644 --- a/plugins/exchange-operations/exchange-permissions-dialog.c +++ b/plugins/exchange-operations/exchange-permissions-dialog.c @@ -122,8 +122,6 @@ init (GObject *object) E2K_MAKE_TYPE (exchange_permissions_dialog, ExchangePermissionsDialog, class_init, init, PARENT_TYPE) - - static void get_widgets (ExchangePermissionsDialog *dialog, GladeXML *xml); static void setup_user_list (ExchangePermissionsDialog *dialog); @@ -300,7 +298,6 @@ dialog_response (ExchangePermissionsDialog *dialog, gint response, gtk_widget_destroy (GTK_WIDGET (dialog)); } - static void set_permissions (ExchangePermissionsDialog *dialog, guint32 perms) { @@ -313,7 +310,6 @@ set_permissions (ExchangePermissionsDialog *dialog, guint32 perms) dialog->priv->changed = TRUE; } - /* User list functions */ static void @@ -518,7 +514,6 @@ setup_user_list (ExchangePermissionsDialog *dialog) g_list_free (sids); } - /* Role option menu functions */ static void @@ -577,8 +572,6 @@ display_role (ExchangePermissionsDialog *dialog) gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->priv->role_optionmenu), role); } - - /* Toggle buttons */ static void check_toggled (GtkToggleButton *toggle, gpointer user_data) @@ -691,8 +684,6 @@ display_permissions (ExchangePermissionsDialog *dialog) dialog->priv->frozen = FALSE; } - - static void get_widgets (ExchangePermissionsDialog *dialog, GladeXML *xml) { diff --git a/plugins/exchange-operations/exchange-send-options.h b/plugins/exchange-operations/exchange-send-options.h index f41ac85371..131fee0954 100644 --- a/plugins/exchange-operations/exchange-send-options.h +++ b/plugins/exchange-operations/exchange-send-options.h @@ -26,8 +26,6 @@ #include <gtk/gtk.h> - - #define EXCHANGE_TYPE_SENDOPTIONS_DIALOG (exchange_sendoptions_dialog_get_type ()) #define EXCHANGE_SENDOPTIONS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EXCHANGE_TYPE_SENDOPTIONS_DIALOG, ExchangeSendOptionsDialog)) #define EXCHANGE_SENDOPTIONS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EXCHANGE_TYPE_SENDOPTIONS_DIALOG, ExchangeSendOptionsDialogClass)) @@ -73,7 +71,6 @@ struct _ExchangeSendOptionsDialog { ExchangeSendOptionsDialogPrivate *priv; }; - struct _ExchangeSendOptionsDialogClass { GObjectClass parent_class; void (* esod_response) (ExchangeSendOptionsDialog *esd, gint status); diff --git a/plugins/exchange-operations/exchange-user-dialog.c b/plugins/exchange-operations/exchange-user-dialog.c index 3b7602f6e4..6cb20e682d 100644 --- a/plugins/exchange-operations/exchange-user-dialog.c +++ b/plugins/exchange-operations/exchange-user-dialog.c @@ -91,8 +91,6 @@ init (E2kUserDialog *dialog) E2K_MAKE_TYPE (e2k_user_dialog, E2kUserDialog, class_init, init, PARENT_TYPE) - - static void parent_window_destroyed (gpointer user_data, GObject *where_parent_window_was) { diff --git a/plugins/external-editor/external-editor.c b/plugins/external-editor/external-editor.c index a7f06b62bf..dcd81650f5 100644 --- a/plugins/external-editor/external-editor.c +++ b/plugins/external-editor/external-editor.c @@ -205,7 +205,6 @@ run_error_dialog (gchar *text) return FALSE; } - void async_external_editor (EMsgComposer *composer) { diff --git a/plugins/google-account-setup/google-contacts-source.c b/plugins/google-account-setup/google-contacts-source.c index 2253d8a7a0..43f4f14c3f 100644 --- a/plugins/google-account-setup/google-contacts-source.c +++ b/plugins/google-account-setup/google-contacts-source.c @@ -360,4 +360,3 @@ plugin_google_contacts (EPlugin *epl, return NULL; } - diff --git a/plugins/google-account-setup/google-source.c b/plugins/google-account-setup/google-source.c index 45d21ba762..e0655ce6aa 100644 --- a/plugins/google-account-setup/google-source.c +++ b/plugins/google-account-setup/google-source.c @@ -66,8 +66,6 @@ GtkWidget * plugin_google (EPlugin *epl, /*****************************************************************************/ /* plugin intialization */ - - static void ensure_google_source_group (void) { @@ -97,7 +95,6 @@ e_plugin_lib_enable (EPluginLib *ep, gint enable) return 0; } - /********************************************************************************************************************/ static gboolean @@ -655,7 +652,6 @@ plugin_google (EPlugin *epl, row + 2, row + 3, GTK_EXPAND | GTK_FILL, 0, 0, 0); - hbox = gtk_hbox_new (FALSE, 6); gtk_widget_show (hbox); diff --git a/plugins/groupwise-account-setup/camel-gw-listener.c b/plugins/groupwise-account-setup/camel-gw-listener.c index a86eeaae9e..957b9da1c8 100644 --- a/plugins/groupwise-account-setup/camel-gw-listener.c +++ b/plugins/groupwise-account-setup/camel-gw-listener.c @@ -64,7 +64,6 @@ static GObjectClass *parent_class = NULL; static void dispose (GObject *object); static void finalize (GObject *object); - static void camel_gw_listener_class_init (CamelGwListenerClass *class) { @@ -197,7 +196,6 @@ add_esource (const gchar *conf_key, GwAccountInfo *info, const gchar *source_na use_ssl = camel_url_get_param (url, "use_ssl"); - offline_sync = camel_url_get_param (url, "offline_sync"); client = gconf_client_get_default(); @@ -210,7 +208,6 @@ add_esource (const gchar *conf_key, GwAccountInfo *info, const gchar *source_na if (!can_create) e_source_group_set_property (group, "create_source", "no"); - relative_uri = g_strdup_printf ("%s@%s/", url->user, poa_address); source = e_source_new (source_name, relative_uri); e_source_set_property (source, "auth", "1"); @@ -327,7 +324,6 @@ remove_esource (const gchar *conf_key, const gchar *group_name, gchar * source_n } - } g_object_unref (list); @@ -410,7 +406,6 @@ modify_esource (const gchar * conf_key, GwAccountInfo *old_account_info, EAccoun camel_url_free (url); g_free (old_relative_uri); - } /* add sources for calendar and tasks if the account added is groupwise account adds the new account info to groupwise_accounts list */ @@ -427,7 +422,6 @@ add_calendar_tasks_sources (GwAccountInfo *info) camel_url_free (url); - } /* removes calendar and tasks sources if the account removed is groupwise account @@ -682,7 +676,6 @@ modify_addressbook_sources ( EAccount *account, GwAccountInfo *existing_account_ GConfClient *client; const gchar *poa_address; - url = camel_url_new (existing_account_info->source_url, NULL); if (url == NULL) { return; @@ -747,7 +740,6 @@ modify_addressbook_sources ( EAccount *account, GwAccountInfo *existing_account_ camel_url_free (url); g_object_unref (client); - } static void @@ -798,7 +790,6 @@ remove_addressbook_sources (GwAccountInfo *existing_account_info) g_free (base_uri); camel_url_free (url); - } static void @@ -857,7 +848,6 @@ account_removed (EAccountList *account_listener, EAccount *account) g_free (info); } - static void account_changed (EAccountList *account_listener, EAccount *account) { diff --git a/plugins/groupwise-account-setup/groupwise-account-setup.c b/plugins/groupwise-account-setup/groupwise-account-setup.c index 8899b17653..6375446d7e 100644 --- a/plugins/groupwise-account-setup/groupwise-account-setup.c +++ b/plugins/groupwise-account-setup/groupwise-account-setup.c @@ -124,7 +124,6 @@ e_plugin_lib_enable (EPluginLib *ep, gint enable) return 0; } - GtkWidget * org_gnome_groupwise_account_setup(struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data); GtkWidget * diff --git a/plugins/groupwise-features/addressbook-groupwise.c b/plugins/groupwise-features/addressbook-groupwise.c index 4ee5af017e..a5568d3bba 100644 --- a/plugins/groupwise-features/addressbook-groupwise.c +++ b/plugins/groupwise-features/addressbook-groupwise.c @@ -64,6 +64,5 @@ GtkWidget * e_book_groupwise_dummy (EPlugin *epl, EConfigHookItemFactoryData *data) { - return NULL; } diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c index d770afa2d4..7ecccdf532 100644 --- a/plugins/groupwise-features/install-shared.c +++ b/plugins/groupwise-features/install-shared.c @@ -108,7 +108,6 @@ install_folder_response (EMFolderSelector *emfs, gint response, gpointer *data) if(e_gw_connection_accept_shared_folder (cnc, folder_name, container_id, (gchar *)item_id, NULL) == E_GW_CONNECTION_STATUS_OK) { - folder = camel_store_get_folder (store, "Mailbox", 0, NULL); /*changes = camel_folder_change_info_new (); camel_folder_change_info_remove_uid (changes, (gchar *) item_id); diff --git a/plugins/groupwise-features/junk-settings.c b/plugins/groupwise-features/junk-settings.c index 23c3820130..5c8c76928e 100644 --- a/plugins/groupwise-features/junk-settings.c +++ b/plugins/groupwise-features/junk-settings.c @@ -355,7 +355,6 @@ remove_clicked(GtkButton *button, JunkSettings *js) gtk_list_store_remove (GTK_LIST_STORE (js->model), &(js->iter)); } - static void user_selected(GtkTreeSelection *selection, JunkSettings *js) { @@ -438,4 +437,3 @@ junk_settings_new (EGwConnection *ccnc) return (JunkSettings *) new; } - diff --git a/plugins/groupwise-features/mail-retract.c b/plugins/groupwise-features/mail-retract.c index 9e2920d6ab..9eccc698ec 100644 --- a/plugins/groupwise-features/mail-retract.c +++ b/plugins/groupwise-features/mail-retract.c @@ -35,7 +35,6 @@ void org_gnome_retract_message (EPlugin *ep, EMPopupTargetSelect *t); - static void retract_mail_settings (EPopup *ep, EPopupItem *item, gpointer data) { EGwConnection *cnc; diff --git a/plugins/groupwise-features/mail-send-options.c b/plugins/groupwise-features/mail-send-options.c index 05d22bedce..4faaf9bbc6 100644 --- a/plugins/groupwise-features/mail-send-options.c +++ b/plugins/groupwise-features/mail-send-options.c @@ -171,4 +171,3 @@ org_gnome_composer_send_options (EPlugin *ep, EMEventTargetComposer *t) G_CALLBACK (send_options_commit), dialog); } - diff --git a/plugins/groupwise-features/process-meeting.c b/plugins/groupwise-features/process-meeting.c index 5a8a991288..299b19e3b6 100644 --- a/plugins/groupwise-features/process-meeting.c +++ b/plugins/groupwise-features/process-meeting.c @@ -34,7 +34,6 @@ #include <e-util/e-error.h> #include <libecal/e-cal.h> - typedef struct { ECal *ecal; icalcomponent *icalcomp; @@ -122,7 +121,6 @@ receive_objects (gpointer data) GError *error = NULL; ReceiveData *r_data = data; - icalcomponent_set_method (r_data->icalcomp, ICAL_METHOD_REQUEST); if (!e_cal_receive_objects (r_data->ecal, r_data->icalcomp, &error)) { @@ -311,7 +309,6 @@ is_meeting_owner (ECalComponent *comp, ECal *client) return ret_val; } - typedef struct { ECal *client; ECalComponent *comp; diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c index 20d477a345..cc572a6893 100644 --- a/plugins/groupwise-features/proxy-login.c +++ b/plugins/groupwise-features/proxy-login.c @@ -273,7 +273,6 @@ proxy_login_get_cnc (EAccount *account, GtkWindow *password_dlg_parrent) return cnc; } - static void proxy_login_cb (GtkDialog *dialog, gint state) { @@ -373,7 +372,6 @@ proxy_soap_login (gchar *email) g_free (password); } - static void proxy_login_add_new_store (gchar *uri, CamelStore *store, gpointer user_data) { diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c index 7f526f8389..637a13cb2d 100644 --- a/plugins/groupwise-features/proxy.c +++ b/plugins/groupwise-features/proxy.c @@ -366,7 +366,6 @@ proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog) return 0; } - e_error_run (NULL, "org.gnome.evolution.proxy:user-is-proxy",email ,NULL); return -1; } @@ -417,7 +416,6 @@ proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog) return 0; } - static gboolean proxy_dialog_initialize_widgets (EAccount *account) { @@ -754,7 +752,6 @@ proxy_page_changed_cb (GtkNotebook *notebook, GtkNotebookPage *page, gint num, E if (e_gw_connection_get_proxy_access_list(prd->cnc, &priv->proxy_list)!= E_GW_CONNECTION_STATUS_OK) return FALSE; - list_iter = priv->proxy_list; for (;list_iter; list_iter = g_list_next(list_iter)) { @@ -787,7 +784,6 @@ proxy_cancel(GtkWidget *button, EAccount *account) g_object_unref (priv->xml); } - static void proxy_add_ok (GtkWidget *button, EAccount *account) { diff --git a/plugins/groupwise-features/proxy.h b/plugins/groupwise-features/proxy.h index ca1b651f2c..0661239e59 100644 --- a/plugins/groupwise-features/proxy.h +++ b/plugins/groupwise-features/proxy.h @@ -49,7 +49,6 @@ struct _proxyDialogClass { GObjectClass parent_class; }; - GType proxy_dialog_get_type (void); proxyDialog *proxy_dialog_new (void); GtkWidget * org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data); diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c index b75d9abebb..16c639b38e 100644 --- a/plugins/groupwise-features/send-options.c +++ b/plugins/groupwise-features/send-options.c @@ -103,7 +103,6 @@ get_cnc (GtkWindow *parent_window) return cnc; } - static void e_send_options_load_general_opts (ESendOptionsGeneral *gopts, EGwSendOptionsGeneral *ggopts) { @@ -364,7 +363,6 @@ get_source (ESourceList *list) gchar **temp = g_strsplit (account->source->url, ";", -1); gchar *uri = temp [0]; - l = e_source_list_peek_groups (list); for (p = l; p != NULL; p = p->next) { @@ -559,4 +557,3 @@ send_options_abort (EPlugin *epl, EConfigHookItemFactoryData *data) send_options_finalize (); } - diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c index 2f50f3a0cb..54bb3a6eeb 100644 --- a/plugins/groupwise-features/share-folder-common.c +++ b/plugins/groupwise-features/share-folder-common.c @@ -353,7 +353,6 @@ org_gnome_create_option(EPlugin *ep, EMPopupTargetFolder *t) gint i = 0; static gint first = 0; - if (! g_strrstr (t->uri, "groupwise://")) return; diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c index 87404db6bc..29ff8acc8a 100644 --- a/plugins/groupwise-features/share-folder.c +++ b/plugins/groupwise-features/share-folder.c @@ -182,7 +182,6 @@ free_all (ShareFolder *sf) /* e_gw_connection_free_container_list (sf->container_list); */ } - static void display_container (EGwContainer *container , ShareFolder *sf) { @@ -297,7 +296,6 @@ get_container_list (ShareFolder *sf) } } - static void shared_clicked (GtkRadioButton *button, ShareFolder *sf) { @@ -349,7 +347,6 @@ add_clicked(GtkButton *button, ShareFolder *sf) return; } - /*check whether already exists*/ if (sf->users_list && email){ new_user = find_node (sf->users_list, (gchar *)email); @@ -448,7 +445,6 @@ share_folder (ShareFolder *sf) g_warning("Container is Null"); } - } else { if (new_list) { if (e_gw_connection_share_folder (sf->cnc, sf->container_id, new_list, sf->sub, sf->mesg, 0) == E_GW_CONNECTION_STATUS_OK) { @@ -505,7 +501,6 @@ not_cancel_clicked(GtkButton *button, GtkWidget *window) gtk_widget_destroy(window); } - static void notification_clicked(GtkButton *button, ShareFolder *sf) { @@ -789,4 +784,3 @@ share_folder_new (EGwConnection *ccnc, gchar *id) return (ShareFolder *) new; } - diff --git a/plugins/groupwise-features/status-track.c b/plugins/groupwise-features/status-track.c index d9173e09e2..d1f8fabb34 100644 --- a/plugins/groupwise-features/status-track.c +++ b/plugins/groupwise-features/status-track.c @@ -42,7 +42,6 @@ #include <e-gw-connection.h> #include "share-folder.h" - void org_gnome_track_status (gpointer ep, EMPopupTargetSelect *t); static gchar * diff --git a/plugins/hula-account-setup/camel-hula-listener.c b/plugins/hula-account-setup/camel-hula-listener.c index 04fa4605d2..5bed477a49 100644 --- a/plugins/hula-account-setup/camel-hula-listener.c +++ b/plugins/hula-account-setup/camel-hula-listener.c @@ -31,7 +31,6 @@ #include <libedataserver/e-account.h> #include "camel-hula-listener.h" - static GList *hula_accounts = NULL; struct _CamelHulaListenerPrivate { @@ -59,7 +58,6 @@ static GObjectClass *parent_class = NULL; static void dispose (GObject *object); static void finalize (GObject *object); - static void camel_hula_listener_class_init (CamelHulaListenerClass *class) { @@ -235,7 +233,6 @@ add_esource (const gchar *conf_key, const gchar *group_name, const gchar *sourc g_free (relative_uri); } - static void remove_esource (const gchar *conf_key, const gchar *group_name, gchar * source_name, const gchar * relative_uri) { @@ -294,7 +291,6 @@ remove_esource (const gchar *conf_key, const gchar *group_name, gchar * source_n } - } g_object_unref (list); @@ -363,7 +359,6 @@ modify_esource (const gchar * conf_key, HulaAccountInfo *old_account_info, const camel_url_free (url); g_free (old_relative_uri); - } /* add sources for calendar if the account added is HULA account adds the new account info to HULA accounts list */ @@ -378,7 +373,6 @@ add_calendar_sources (HulaAccountInfo *info) camel_url_free (url); - } /* removes calendar sources if the account removed is HULA account @@ -457,7 +451,6 @@ account_removed (EAccountList *account_listener, EAccount *account) g_free (info); } - static void account_changed (EAccountList *account_listener, EAccount *account) { diff --git a/plugins/hula-account-setup/hula-account-setup.c b/plugins/hula-account-setup/hula-account-setup.c index c334019d71..3f5898b724 100644 --- a/plugins/hula-account-setup/hula-account-setup.c +++ b/plugins/hula-account-setup/hula-account-setup.c @@ -47,7 +47,6 @@ e_plugin_lib_enable (EPluginLib *ep, gint enable) return 0; } - GtkWidget * org_gnome_evolution_hula_account_setup (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data) { diff --git a/plugins/ipod-sync/evolution-ipod-sync.c b/plugins/ipod-sync/evolution-ipod-sync.c index a60bd2dfd3..a381e2a80b 100644 --- a/plugins/ipod-sync/evolution-ipod-sync.c +++ b/plugins/ipod-sync/evolution-ipod-sync.c @@ -69,7 +69,6 @@ ipod_check_status (gboolean silent) if (!libhal_ctx_init(ctx, NULL)) return FALSE; - mount_point = find_ipod_mount_point (ctx); if (mount_point == NULL) { diff --git a/plugins/ipod-sync/evolution-ipod-sync.h b/plugins/ipod-sync/evolution-ipod-sync.h index 8760c43ceb..656cf266f1 100644 --- a/plugins/ipod-sync/evolution-ipod-sync.h +++ b/plugins/ipod-sync/evolution-ipod-sync.h @@ -35,4 +35,3 @@ gboolean try_umount (gchar *device); gchar *find_ipod_mount_point (LibHalContext *ctx); gchar *ipod_get_mount (void); - diff --git a/plugins/ipod-sync/ipod-sync.c b/plugins/ipod-sync/ipod-sync.c index 7615d6e7cb..f5672ef1d0 100644 --- a/plugins/ipod-sync/ipod-sync.c +++ b/plugins/ipod-sync/ipod-sync.c @@ -54,7 +54,6 @@ void org_gnome_sync_tasks (EPlugin *ep, ECalPopupTargetSource *target); void org_gnome_sync_memos (EPlugin *ep, ECalPopupTargetSource *target); void org_gnome_sync_addressbook (EPlugin *ep, EABPopupTargetSource *target); - static void display_error_message (GtkWidget *parent, const gchar *message) { @@ -113,8 +112,6 @@ open_for_writing (GtkWindow *parent, const gchar *uri, GError **error) return NULL; } - - static void destination_save_addressbook (EPlugin *ep, EABPopupTargetSource *target) { diff --git a/plugins/ipod-sync/sync.c b/plugins/ipod-sync/sync.c index 8c930eb82b..91e99c02e1 100644 --- a/plugins/ipod-sync/sync.c +++ b/plugins/ipod-sync/sync.c @@ -308,7 +308,6 @@ uri_list_to_vcal_string (GSList *uris, ECalSourceType type) continue; } - e_cal_get_object_list (cal, "#t", &objects, NULL); for (o = objects; o != NULL; o = o->next) diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c index 558d514f86..c824760409 100644 --- a/plugins/itip-formatter/itip-formatter.c +++ b/plugins/itip-formatter/itip-formatter.c @@ -139,7 +139,6 @@ struct _itip_puri { }; - void format_itip (EPlugin *ep, EMFormatHookTarget *target); GtkWidget *itip_formatter_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data); static void itip_attachment_frame(EMFormat *emf, CamelStream *stream, EMFormatPURI *puri); @@ -464,7 +463,6 @@ set_buttons_sensitive (struct _itip_puri *pitip) itip_view_set_buttons_sensitive (ITIP_VIEW (pitip->view), pitip->current_ecal != NULL && !read_only); } - static void cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data) { @@ -1493,7 +1491,6 @@ extract_itip_data (struct _itip_puri *pitip, GtkContainer *container, gboolean * ECalComponent *comp; gchar *my_address; - if (!pitip->vcalendar) { set_itip_error (pitip, container, _("The calendar attached is not valid"), @@ -1921,7 +1918,6 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data) camel_folder_delete_message (pitip->folder, pitip->uid); } - if (itip_view_get_rsvp (ITIP_VIEW (pitip->view)) && status) { ECalComponent *comp = NULL; icalcomponent *ical_comp; @@ -2366,7 +2362,6 @@ format_itip_object (EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject return TRUE; } - static void puri_free (EMFormatPURI *puri) { @@ -2421,7 +2416,6 @@ puri_free (EMFormatPURI *puri) g_free (pitip->uid); } - void format_itip (EPlugin *ep, EMFormatHookTarget *target) { @@ -2465,7 +2459,6 @@ format_itip (EPlugin *ep, EMFormatHookTarget *target) puri->vcalendar = g_strndup ((gchar *)((CamelStreamMem *) mem)->buffer->data, ((CamelStreamMem *) mem)->buffer->len); camel_object_unref (mem); - camel_stream_printf (target->stream, "<table border=0 width=\"100%%\" cellpadding=3><tr>"); camel_stream_printf (target->stream, "<td valign=top><object classid=\"%s\"></object></td><td width=100%% valign=top>", classid); camel_stream_printf (target->stream, "</td></tr></table>"); diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c index 5007bf6541..a5505597a0 100644 --- a/plugins/itip-formatter/itip-view.c +++ b/plugins/itip-formatter/itip-view.c @@ -562,7 +562,6 @@ set_journal_sender_text (ItipView *view) g_free (sender); } - static void set_sender_text (ItipView *view) { @@ -1568,7 +1567,6 @@ itip_view_get_comment (ItipView *view) return priv->comment; } - void itip_view_set_description (ItipView *view, const gchar *description) { @@ -1600,7 +1598,6 @@ itip_view_get_description (ItipView *view) return priv->description; } - void itip_view_set_start (ItipView *view, struct tm *start) { diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c index a893895949..46b434b65f 100644 --- a/plugins/mail-notification/mail-notification.c +++ b/plugins/mail-notification/mail-notification.c @@ -857,7 +857,6 @@ void org_gnome_mail_read_notify (EPlugin *ep, EMEventTargetMessage *t); gint e_plugin_lib_enable (EPluginLib *ep, gint enable); GtkWidget *e_plugin_lib_get_configure_widget (EPlugin *epl); - void org_gnome_mail_new_notify (EPlugin *ep, EMEventTargetFolder *t) { diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c index 445b5f80bd..39973ba60f 100644 --- a/plugins/pst-import/pst-importer.c +++ b/plugins/pst-import/pst-importer.c @@ -97,7 +97,6 @@ void org_credativ_evolution_readpst_import (EImport *ei, EImportTarget *target, void org_credativ_evolution_readpst_cancel (EImport *ei, EImportTarget *target, EImportImporter *im); gint e_plugin_lib_enable (EPluginLib *ep, gint enable); - /* em-folder-selection-button.h is private, even though other internal evo plugins use it! so declare the functions here TODO: sort out whether this should really be private @@ -211,7 +210,6 @@ folder_selected (EMFolderSelectionButton *button, EImportTargetURI *target) target->uri_dest = g_strdup (em_folder_selection_button_get_selection (button)); } - /** * Suggest a folder to import data into * @param target diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c index e0cd35b069..84a41f23ad 100644 --- a/plugins/publish-calendar/publish-calendar.c +++ b/plugins/publish-calendar/publish-calendar.c @@ -826,7 +826,6 @@ e_plugin_lib_enable (EPlugin *ep, gint enable) GThread *thread = NULL; GError *error = NULL; - client = gconf_client_get_default (); uris = gconf_client_get_list (client, "/apps/evolution/calendar/publish/uris", GCONF_VALUE_STRING, NULL); thread = g_thread_create ((GThreadFunc) publish_uris_set_timeout, uris, FALSE, &error); diff --git a/plugins/python/python-plugin-loader.h b/plugins/python/python-plugin-loader.h index 4f31ddd5a7..66bd8d5ba2 100644 --- a/plugins/python/python-plugin-loader.h +++ b/plugins/python/python-plugin-loader.h @@ -44,5 +44,4 @@ struct _EPluginPythonClass { gpointer org_gnome_evolution_python_get_type(gpointer a, gpointer b); - #endif /* ! _ORG_GNOME_EVOLUTION_PYTHON_H */ diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c index 5736786725..66f5a92f74 100644 --- a/plugins/sa-junk-plugin/em-junk-filter.c +++ b/plugins/sa-junk-plugin/em-junk-filter.c @@ -70,7 +70,6 @@ static void em_junk_sa_init (void); static void em_junk_sa_finalize (void); static void em_junk_sa_kill_spamd (void); - static gboolean em_junk_sa_tested = FALSE; static gboolean em_junk_sa_spamd_tested = FALSE; static gboolean em_junk_sa_use_spamc = FALSE; @@ -111,7 +110,6 @@ pipe_to_sa_full (CamelMimeMessage *msg, const gchar *in, const gchar **argv, gin gchar *program; pid_t pid; - if (camel_debug_start ("junk")) { gint i; @@ -298,7 +296,6 @@ em_junk_sa_test_spamd_running (const gchar *binary, gboolean system) return rv; } - /* One time test to see if spamd is running with --allow-tell. The call to spamc should return 0 if it is. (Thanks to Karsten Bräckelmann @@ -670,7 +667,6 @@ get_spamassassin_version () } } - if(out) g_byte_array_free (out, TRUE); } @@ -928,4 +924,3 @@ org_gnome_sa_use_remote_tests (struct _EPlugin *epl, struct _EConfigHookItemFact return (GtkWidget *)vbox; } - diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c index 4e59b80edd..b296bb9736 100644 --- a/plugins/save-calendar/csv-format.c +++ b/plugins/save-calendar/csv-format.c @@ -66,15 +66,12 @@ display_error_message (GtkWidget *parent, GError *error) gtk_widget_destroy (dialog); } - enum { /* CSV helper enum */ ECALCOMPONENTTEXT, ECALCOMPONENTATTENDEE, CONSTCHAR }; - - /* Some helpers for the csv stuff */ static GString * add_list_to_csv (GString *line, GSList *list_in, CsvConfig *config, gint type) @@ -202,7 +199,6 @@ string_needsquotes (const gchar *value, CsvConfig *config) needquotes = strstr (value, config->quote) ? TRUE:FALSE; } - /* * If the special-char is char+onespace (so like {, } {" }, {\n }) and it occurs * the value that is going to be written @@ -218,7 +214,6 @@ string_needsquotes (const gchar *value, CsvConfig *config) * first character of {, } and didn't trust the user). */ - if (!needquotes) { gint len = strlen (config->delimiter); if ((len == 2) && (config->delimiter[1] == ' ')) { @@ -521,10 +516,6 @@ do_save_calendar_csv (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource return; } - - - - static GtkWidget * create_options_widget (FormatHandler *handler) { @@ -570,7 +561,6 @@ create_options_widget (FormatHandler *handler) gtk_container_add (GTK_CONTAINER (csv_options), vbox); - return csv_options; } diff --git a/plugins/save-calendar/rdf-format.c b/plugins/save-calendar/rdf-format.c index 685fbdd6e5..ff68dfcfe4 100644 --- a/plugins/save-calendar/rdf-format.c +++ b/plugins/save-calendar/rdf-format.c @@ -161,7 +161,6 @@ add_time_to_rdf (xmlNodePtr node, const gchar *tag, icaltimetype *time) } } - static void add_string_to_rdf (xmlNodePtr node, const gchar *tag, const gchar *value) { @@ -172,9 +171,6 @@ add_string_to_rdf (xmlNodePtr node, const gchar *tag, const gchar *value) } } - - - static void do_save_calendar_rdf (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource *target, ECalSourceType type, gchar *dest_uri) { @@ -332,7 +328,6 @@ do_save_calendar_rdf (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource e_cal_component_get_last_modified (comp, &temp_time); add_time_to_rdf (node, "lastModified",temp_time); - /* Important note! * The documentation is not requiring this! * diff --git a/plugins/save-calendar/save-calendar.c b/plugins/save-calendar/save-calendar.c index 6042de7d6f..119009f69e 100644 --- a/plugins/save-calendar/save-calendar.c +++ b/plugins/save-calendar/save-calendar.c @@ -50,7 +50,6 @@ void org_gnome_save_calendar (EPlugin *ep, ECalPopupTargetSource *target); void org_gnome_save_tasks (EPlugin *ep, ECalPopupTargetSource *target); void org_gnome_save_memos (EPlugin *ep, ECalPopupTargetSource *target); - static void extra_widget_foreach_hide (GtkWidget *widget, gpointer data) { @@ -74,7 +73,6 @@ on_type_combobox_changed (GtkComboBox *combobox, gpointer data) gtk_tree_model_get (model, &iter, DEST_HANDLER, &handler, -1); - if (handler->options_widget) { gtk_widget_show (handler->options_widget); @@ -154,7 +152,6 @@ ask_destination_and_save (EPlugin *ep, ECalPopupTargetSource *target, ECalSource format_handlers = g_list_next (format_handlers); } - g_signal_connect (G_OBJECT(combo), "changed", G_CALLBACK (on_type_combobox_changed), extra_widget); @@ -171,7 +168,6 @@ ask_destination_and_save (EPlugin *ep, ECalPopupTargetSource *target, ECalSource gtk_widget_show (GTK_WIDGET(combo)); gtk_widget_show (extra_widget); - if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) { gchar *tmp = NULL; diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c index ae479fb41e..78a0cf40a1 100644 --- a/plugins/templates/templates.c +++ b/plugins/templates/templates.c @@ -90,7 +90,6 @@ GtkWidget *e_plugin_lib_get_configure_widget (EPlugin *epl); gboolean e_plugin_ui_init (GtkUIManager *ui_manager, EMsgComposer *composer); - /* Thanks to attachment reminder plugin for this*/ static void commit_changes (UIData *ui); @@ -541,7 +540,6 @@ reply_with_template (EPopup *ep, EPopupItem *item, gpointer data) camel_mime_message_set_recipients (new, CAMEL_RECIPIENT_TYPE_TO, camel_mime_message_get_from (reply_to)); - /* Copy the CC and BCC from the template.*/ camel_mime_message_set_recipients (new, CAMEL_RECIPIENT_TYPE_CC, camel_mime_message_get_recipients (template, CAMEL_RECIPIENT_TYPE_CC)); diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c index bde3fa61fb..2acd12322e 100644 --- a/plugins/tnef-attachments/tnef-plugin.c +++ b/plugins/tnef-attachments/tnef-plugin.c @@ -75,8 +75,6 @@ guchar getRruleCount(guchar a, guchar b); guchar getRruleMonthNum(guchar a, guchar b); gchar * getRruleDayname(guchar a); - - void org_gnome_format_tnef(gpointer ep, EMFormatHookTarget *t) { @@ -194,7 +192,6 @@ org_gnome_format_tnef(gpointer ep, EMFormatHookTarget *t) g_free(tmpdir); } - gint e_plugin_lib_enable(EPluginLib *ep, gint enable); gint @@ -477,7 +474,6 @@ void saveVCard(TNEFStruct *tnef) { fprintf(fptr,"\n"); } - /* Business Address */ boolean = 0; if ((pobox = MAPIFindProperty(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, PR_POST_OFFICE_BOX))) != MAPI_UNDEFINED) { @@ -632,7 +628,6 @@ void saveVCard(TNEFStruct *tnef) { fprintf(fptr,"\n"); } - fprintProperty(tnef, fptr, PT_STRING8, PR_CALLBACK_TELEPHONE_NUMBER, "TEL;X-EVOLUTION-CALLBACK:%s\n"); fprintProperty(tnef, fptr, PT_STRING8, PR_PRIMARY_TELEPHONE_NUMBER, "TEL;PREF:%s\n"); fprintProperty(tnef, fptr, PT_STRING8, PR_MOBILE_TELEPHONE_NUMBER, "TEL;CELL:%s\n"); @@ -653,7 +648,6 @@ void saveVCard(TNEFStruct *tnef) { fprintProperty(tnef, fptr, PT_STRING8, PR_BUSINESS_FAX_NUMBER, "TEL;WORK;FAX:%s\n"); fprintProperty(tnef, fptr, PT_STRING8, PR_HOME_FAX_NUMBER, "TEL;HOME;FAX:%s\n"); - /* Email addresses */ if ((vl=MAPIFindUserProp(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, 0x8083))) == MAPI_UNDEFINED) { vl=MAPIFindUserProp(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, 0x8084)); @@ -680,8 +674,6 @@ void saveVCard(TNEFStruct *tnef) { fprintProperty(tnef, fptr, PT_STRING8, PR_BUSINESS_HOME_PAGE, "URL:%s\n"); fprintUserProp(tnef, fptr, PT_STRING8, 0x80d8, "FBURL:%s\n"); - - /* Birthday */ if ((vl=MAPIFindProperty(&(tnef->MapiProperties), PROP_TAG(PT_SYSTIME, PR_BIRTHDAY))) != MAPI_UNDEFINED) { fprintf(fptr, "BDAY:"); @@ -1187,7 +1179,6 @@ void saveVTask(TNEFStruct *tnef) { fprintf(fptr, "ORGANIZER:%s\n", filename->data); } - if ((filename = MAPIFindProperty(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, PR_DISPLAY_TO))) != MAPI_UNDEFINED) { filename = MAPIFindUserProp(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, 0x811f)); } diff --git a/plugins/webdav-account-setup/webdav-contacts-source.c b/plugins/webdav-account-setup/webdav-contacts-source.c index c4f7ef9f58..b6d4443d4d 100644 --- a/plugins/webdav-account-setup/webdav-contacts-source.c +++ b/plugins/webdav-account-setup/webdav-contacts-source.c @@ -286,7 +286,6 @@ plugin_webdav_contacts(EPlugin *epl, EConfigHookItemFactoryData *data) gtk_misc_set_alignment(GTK_MISC(section), 0.0, 0.0); gtk_box_pack_start(GTK_BOX(vbox2), section, FALSE, FALSE, 0); - hbox = GTK_BOX(gtk_hbox_new(FALSE, 10)); gtk_box_pack_start(GTK_BOX(vbox2), GTK_WIDGET(hbox), TRUE, TRUE, 0); @@ -311,7 +310,6 @@ plugin_webdav_contacts(EPlugin *epl, EConfigHookItemFactoryData *data) uidata->username_entry = GTK_ENTRY(gtk_entry_new()); gtk_box_pack_start(hbox, GTK_WIDGET(uidata->username_entry), TRUE, TRUE, 0); - hbox = GTK_BOX(gtk_hbox_new(FALSE, 10)); gtk_box_pack_start(GTK_BOX(vbox2), GTK_WIDGET(hbox), TRUE, TRUE, 0); diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c index c11797631b..e8185fac3b 100644 --- a/shell/e-shell-importer.c +++ b/shell/e-shell-importer.c @@ -159,7 +159,6 @@ create_help (const gchar *name) if (i >= num_info) g_warning ("i > num_info\n"); - label = gtk_label_new(i < num_info ? _(info[i].text): NULL); gtk_widget_show (label); gtk_label_set_line_wrap((GtkLabel *)label, TRUE); @@ -731,7 +730,6 @@ e_shell_importer_start_import (EShellWindow *shell_window) gtk_box_pack_start (GTK_BOX (GNOME_DRUID_PAGE_STANDARD (data->intelligent)->vbox), data->importerpage->vbox, TRUE, TRUE, 0); - /* File selection and file type page */ data->filedialog = glade_xml_get_widget (data->wizard, "page2-file"); gnome_druid_page_standard_set_logo (GNOME_DRUID_PAGE_STANDARD (data->filedialog), icon); diff --git a/shell/main.c b/shell/main.c index 049ddce46a..bd77c21ea7 100644 --- a/shell/main.c +++ b/shell/main.c @@ -204,7 +204,6 @@ categories_icon_theme_hack (void) g_free (dirname); } - #ifdef DEVELOPMENT /* Warning dialog to scare people off a little bit. */ @@ -456,7 +455,7 @@ set_paths (void) components_folder_utf8, g_getenv ("PATH"), NULL); if (!g_setenv ("PATH", path, TRUE)) g_warning ("Could not set PATH for Evolution " - "and its child processes"); + "and its child processes"); g_free (path); g_free (exe_folder_utf8); @@ -524,26 +523,22 @@ gint main (gint argc, gchar **argv) { #ifdef G_OS_WIN32 - if (fileno (stdout) != -1 && - _get_osfhandle (fileno (stdout)) != -1) - { - /* stdout is fine, presumably redirected to a file or pipe */ - } - else - { - typedef BOOL (* WINAPI AttachConsole_t) (DWORD); + if (fileno (stdout) != -1 && _get_osfhandle (fileno (stdout)) != -1) { + /* stdout is fine, presumably redirected to a file or pipe */ + } else { + typedef BOOL (* WINAPI AttachConsole_t) (DWORD); - AttachConsole_t p_AttachConsole = - (AttachConsole_t) GetProcAddress (GetModuleHandle ("kernel32.dll"), "AttachConsole"); + AttachConsole_t p_AttachConsole = + (AttachConsole_t) GetProcAddress ( + GetModuleHandle ("kernel32.dll"), "AttachConsole"); - if (p_AttachConsole != NULL && p_AttachConsole (ATTACH_PARENT_PROCESS)) + if (p_AttachConsole != NULL && p_AttachConsole (ATTACH_PARENT_PROCESS)) { - freopen ("CONOUT$", "w", stdout); - dup2 (fileno (stdout), 1); - freopen ("CONOUT$", "w", stderr); - dup2 (fileno (stderr), 2); - - } + freopen ("CONOUT$", "w", stdout); + dup2 (fileno (stdout), 1); + freopen ("CONOUT$", "w", stderr); + dup2 (fileno (stderr), 2); + } } extern void link_shutdown (void); diff --git a/smclient/eggdesktopfile.c b/smclient/eggdesktopfile.c index 6f6b94684d..9f18be1dc6 100644 --- a/smclient/eggdesktopfile.c +++ b/smclient/eggdesktopfile.c @@ -36,11 +36,11 @@ struct EggDesktopFile { GKeyFile *key_file; - char *source; + gchar *source; - char *name, *icon; + gchar *name, *icon; EggDesktopFileType type; - char document_code; + gchar document_code; }; /** @@ -53,7 +53,7 @@ struct EggDesktopFile { * Return value: the new #EggDesktopFile, or %NULL on error. **/ EggDesktopFile * -egg_desktop_file_new (const char *desktop_file_path, GError **error) +egg_desktop_file_new (const gchar *desktop_file_path, GError **error) { GKeyFile *key_file; @@ -80,12 +80,12 @@ egg_desktop_file_new (const char *desktop_file_path, GError **error) * Return value: the new #EggDesktopFile, or %NULL on error. **/ EggDesktopFile * -egg_desktop_file_new_from_data_dirs (const char *desktop_file_path, +egg_desktop_file_new_from_data_dirs (const gchar *desktop_file_path, GError **error) { EggDesktopFile *desktop_file; GKeyFile *key_file; - char *full_path; + gchar *full_path; key_file = g_key_file_new (); if (!g_key_file_load_from_data_dirs (key_file, desktop_file_path, @@ -115,13 +115,13 @@ egg_desktop_file_new_from_data_dirs (const char *desktop_file_path, * Return value: the new #EggDesktopFile, or %NULL on error. **/ EggDesktopFile * -egg_desktop_file_new_from_dirs (const char *desktop_file_path, - const char **search_dirs, +egg_desktop_file_new_from_dirs (const gchar *desktop_file_path, + const gchar **search_dirs, GError **error) { EggDesktopFile *desktop_file; GKeyFile *key_file; - char *full_path; + gchar *full_path; key_file = g_key_file_new (); if (!g_key_file_load_from_dirs (key_file, desktop_file_path, search_dirs, @@ -152,11 +152,11 @@ egg_desktop_file_new_from_dirs (const char *desktop_file_path, **/ EggDesktopFile * egg_desktop_file_new_from_key_file (GKeyFile *key_file, - const char *source, + const gchar *source, GError **error) { EggDesktopFile *desktop_file; - char *version, *type; + gchar *version, *type; if (!g_key_file_has_group (key_file, EGG_DESKTOP_FILE_GROUP)) { @@ -173,7 +173,7 @@ egg_desktop_file_new_from_key_file (GKeyFile *key_file, if (version) { double version_num; - char *end; + gchar *end; version_num = g_ascii_strtod (version, &end); if (*end) @@ -219,7 +219,7 @@ egg_desktop_file_new_from_key_file (GKeyFile *key_file, if (!strcmp (type, "Application")) { - char *exec, *p; + gchar *exec, *p; desktop_file->type = EGG_DESKTOP_FILE_TYPE_APPLICATION; @@ -252,7 +252,7 @@ egg_desktop_file_new_from_key_file (GKeyFile *key_file, } else if (!strcmp (type, "Link")) { - char *url; + gchar *url; desktop_file->type = EGG_DESKTOP_FILE_TYPE_LINK; @@ -282,7 +282,7 @@ egg_desktop_file_new_from_key_file (GKeyFile *key_file, NULL); if (desktop_file->icon && !g_path_is_absolute (desktop_file->icon)) { - char *ext; + gchar *ext; /* Lots of .desktop files still get this wrong */ ext = strrchr (desktop_file->icon, '.'); @@ -325,7 +325,7 @@ egg_desktop_file_free (EggDesktopFile *desktop_file) * * Return value: @desktop_file's source URI **/ -const char * +const gchar * egg_desktop_file_get_source (EggDesktopFile *desktop_file) { return desktop_file->source; @@ -353,7 +353,7 @@ egg_desktop_file_get_desktop_file_type (EggDesktopFile *desktop_file) * * Return value: the application/link name **/ -const char * +const gchar * egg_desktop_file_get_name (EggDesktopFile *desktop_file) { return desktop_file->name; @@ -374,7 +374,7 @@ egg_desktop_file_get_name (EggDesktopFile *desktop_file) * * Return value: the icon path or name **/ -const char * +const gchar * egg_desktop_file_get_icon (EggDesktopFile *desktop_file) { return desktop_file->icon; @@ -382,7 +382,7 @@ egg_desktop_file_get_icon (EggDesktopFile *desktop_file) gboolean egg_desktop_file_has_key (EggDesktopFile *desktop_file, - const char *key, + const gchar *key, GError **error) { return g_key_file_has_key (desktop_file->key_file, @@ -390,9 +390,9 @@ egg_desktop_file_has_key (EggDesktopFile *desktop_file, error); } -char * +gchar * egg_desktop_file_get_string (EggDesktopFile *desktop_file, - const char *key, + const gchar *key, GError **error) { return g_key_file_get_string (desktop_file->key_file, @@ -400,10 +400,10 @@ egg_desktop_file_get_string (EggDesktopFile *desktop_file, error); } -char * +gchar * egg_desktop_file_get_locale_string (EggDesktopFile *desktop_file, - const char *key, - const char *locale, + const gchar *key, + const gchar *locale, GError **error) { return g_key_file_get_locale_string (desktop_file->key_file, @@ -413,7 +413,7 @@ egg_desktop_file_get_locale_string (EggDesktopFile *desktop_file, gboolean egg_desktop_file_get_boolean (EggDesktopFile *desktop_file, - const char *key, + const gchar *key, GError **error) { return g_key_file_get_boolean (desktop_file->key_file, @@ -421,9 +421,9 @@ egg_desktop_file_get_boolean (EggDesktopFile *desktop_file, error); } -double +gdouble egg_desktop_file_get_numeric (EggDesktopFile *desktop_file, - const char *key, + const gchar *key, GError **error) { return g_key_file_get_double (desktop_file->key_file, @@ -431,9 +431,9 @@ egg_desktop_file_get_numeric (EggDesktopFile *desktop_file, error); } -char ** +gchar ** egg_desktop_file_get_string_list (EggDesktopFile *desktop_file, - const char *key, + const gchar *key, gsize *length, GError **error) { @@ -442,10 +442,10 @@ egg_desktop_file_get_string_list (EggDesktopFile *desktop_file, error); } -char ** +gchar ** egg_desktop_file_get_locale_string_list (EggDesktopFile *desktop_file, - const char *key, - const char *locale, + const gchar *key, + const gchar *locale, gsize *length, GError **error) { @@ -477,12 +477,12 @@ egg_desktop_file_get_locale_string_list (EggDesktopFile *desktop_file, **/ gboolean egg_desktop_file_can_launch (EggDesktopFile *desktop_file, - const char *desktop_environment) + const gchar *desktop_environment) { - char *try_exec, *found_program; - char **only_show_in, **not_show_in; + gchar *try_exec, *found_program; + gchar **only_show_in, **not_show_in; gboolean found; - int i; + gint i; if (desktop_file->type != EGG_DESKTOP_FILE_TYPE_APPLICATION && desktop_file->type != EGG_DESKTOP_FILE_TYPE_LINK) @@ -600,11 +600,11 @@ egg_desktop_file_accepts_uris (EggDesktopFile *desktop_file) static void append_quoted_word (GString *str, - const char *s, + const gchar *s, gboolean in_single_quotes, gboolean in_double_quotes) { - const char *p; + const gchar *p; if (!in_single_quotes && !in_double_quotes) g_string_append_c (str, '\''); @@ -632,14 +632,14 @@ append_quoted_word (GString *str, static void do_percent_subst (EggDesktopFile *desktop_file, - char code, + gchar code, GString *str, GSList **documents, gboolean in_single_quotes, gboolean in_double_quotes) { GSList *d; - char *doc; + gchar *doc; switch (code) { @@ -709,12 +709,12 @@ do_percent_subst (EggDesktopFile *desktop_file, } } -static char * +static gchar * parse_exec (EggDesktopFile *desktop_file, GSList **documents, GError **error) { - char *exec, *p, *command; + gchar *exec, *p, *command; gboolean escape, single_quot, double_quot; GString *gs; @@ -810,9 +810,9 @@ translate_document_list (EggDesktopFile *desktop_file, GSList *documents) for (d = documents, ret = NULL; d; d = d->next) { - const char *document = d->data; + const gchar *document = d->data; gboolean is_uri = !g_path_is_absolute (document); - char *translated; + gchar *translated; if (accepts_uris) { @@ -862,13 +862,13 @@ free_document_list (GSList *documents) * * Return value: the parsed Exec string **/ -char * +gchar * egg_desktop_file_parse_exec (EggDesktopFile *desktop_file, GSList *documents, GError **error) { GSList *translated, *docs; - char *command; + gchar *command; docs = translated = translate_document_list (desktop_file, documents); command = parse_exec (desktop_file, &docs, error); @@ -883,7 +883,7 @@ parse_link (EggDesktopFile *desktop_file, GSList **documents, GError **error) { - char *url; + gchar *url; GKeyFile *key_file; url = g_key_file_get_string (desktop_file->key_file, @@ -910,18 +910,18 @@ parse_link (EggDesktopFile *desktop_file, } #if GTK_CHECK_VERSION (2, 12, 0) -static char * +static gchar * start_startup_notification (GdkDisplay *display, EggDesktopFile *desktop_file, - const char *argv0, - int screen, - int workspace, + const gchar *argv0, + gint screen, + gint workspace, guint32 launch_time) { - static int sequence = 0; - char *startup_id; - char *description, *wmclass; - char *screen_str, *workspace_str; + static gint sequence = 0; + gchar *startup_id; + gchar *description, *wmclass; + gchar *screen_str, *workspace_str; if (g_key_file_has_key (desktop_file->key_file, EGG_DESKTOP_FILE_GROUP, @@ -980,7 +980,7 @@ start_startup_notification (GdkDisplay *display, static void end_startup_notification (GdkDisplay *display, - const char *startup_id) + const gchar *startup_id) { gdk_x11_display_broadcast_startup_message (display, "remove", "ID", startup_id, @@ -991,7 +991,7 @@ end_startup_notification (GdkDisplay *display, typedef struct { GdkDisplay *display; - char *startup_id; + gchar *startup_id; } StartupNotificationData; static gboolean @@ -1009,7 +1009,7 @@ startup_notification_timeout (gpointer data) static void set_startup_notification_timeout (GdkDisplay *display, - const char *startup_id) + const gchar *startup_id) { StartupNotificationData *sn_data; @@ -1023,20 +1023,20 @@ set_startup_notification_timeout (GdkDisplay *display, #endif /* GTK 2.12 */ static GPtrArray * -array_putenv (GPtrArray *env, char *variable) +array_putenv (GPtrArray *env, gchar *variable) { guint i, keylen; if (!env) { - char **envp; + gchar **envp; env = g_ptr_array_new (); envp = g_listenv (); for (i = 0; envp[i]; i++) { - const char *value; + const gchar *value; value = g_getenv (envp[i]); g_ptr_array_add (env, g_strdup_printf ("%s=%s", envp[i], @@ -1050,7 +1050,7 @@ array_putenv (GPtrArray *env, char *variable) /* Remove old value of key */ for (i = 0; i < env->len; i++) { - char *envvar = env->pdata[i]; + gchar *envvar = env->pdata[i]; if (!strncmp (envvar, variable, keylen) && envvar[keylen] == '=') { @@ -1073,25 +1073,25 @@ egg_desktop_file_launchv (EggDesktopFile *desktop_file, { EggDesktopFileLaunchOption option; GSList *translated_documents = NULL, *docs = NULL; - char *command, **argv; - int argc, i, screen_num; + gchar *command, **argv; + gint argc, i, screen_num; gboolean success, current_success; GdkDisplay *display; - char *startup_id; + gchar *startup_id; GPtrArray *env = NULL; - char **variables = NULL; + gchar **variables = NULL; GdkScreen *screen = NULL; - int workspace = -1; - const char *directory = NULL; + gint workspace = -1; + const gchar *directory = NULL; guint32 launch_time = (guint32)-1; GSpawnFlags flags = G_SPAWN_SEARCH_PATH; GSpawnChildSetupFunc setup_func = NULL; gpointer setup_data = NULL; GPid *ret_pid = NULL; - int *ret_stdin = NULL, *ret_stdout = NULL, *ret_stderr = NULL; - char **ret_startup_id = NULL; + gint *ret_stdin = NULL, *ret_stdout = NULL, *ret_stderr = NULL; + gchar **ret_startup_id = NULL; if (documents && desktop_file->document_code == 0) { @@ -1105,7 +1105,7 @@ egg_desktop_file_launchv (EggDesktopFile *desktop_file, * NULL-terminate the list of options (rather than 0-terminating * it), but NULL-terminating lets us use G_GNUC_NULL_TERMINATED, * it's more consistent with other glib/gtk methods, and it will - * work as long as sizeof (int) <= sizeof (NULL), and NULL is + * work as long as sizeof (gint) <= sizeof (NULL), and NULL is * represented as 0. (Which is true everywhere we care about.) */ while ((option = va_arg (args, EggDesktopFileLaunchOption))) @@ -1118,7 +1118,7 @@ egg_desktop_file_launchv (EggDesktopFile *desktop_file, env = g_ptr_array_new (); break; case EGG_DESKTOP_FILE_LAUNCH_PUTENV: - variables = va_arg (args, char **); + variables = va_arg (args, gchar **); for (i = 0; variables[i]; i++) env = array_putenv (env, variables[i]); break; @@ -1127,11 +1127,11 @@ egg_desktop_file_launchv (EggDesktopFile *desktop_file, screen = va_arg (args, GdkScreen *); break; case EGG_DESKTOP_FILE_LAUNCH_WORKSPACE: - workspace = va_arg (args, int); + workspace = va_arg (args, gint); break; case EGG_DESKTOP_FILE_LAUNCH_DIRECTORY: - directory = va_arg (args, const char *); + directory = va_arg (args, const gchar *); break; case EGG_DESKTOP_FILE_LAUNCH_TIME: launch_time = va_arg (args, guint32); @@ -1150,16 +1150,16 @@ egg_desktop_file_launchv (EggDesktopFile *desktop_file, ret_pid = va_arg (args, GPid *); break; case EGG_DESKTOP_FILE_LAUNCH_RETURN_STDIN_PIPE: - ret_stdin = va_arg (args, int *); + ret_stdin = va_arg (args, gint *); break; case EGG_DESKTOP_FILE_LAUNCH_RETURN_STDOUT_PIPE: - ret_stdout = va_arg (args, int *); + ret_stdout = va_arg (args, gint *); break; case EGG_DESKTOP_FILE_LAUNCH_RETURN_STDERR_PIPE: - ret_stderr = va_arg (args, int *); + ret_stderr = va_arg (args, gint *); break; case EGG_DESKTOP_FILE_LAUNCH_RETURN_STARTUP_ID: - ret_startup_id = va_arg (args, char **); + ret_startup_id = va_arg (args, gchar **); break; default: @@ -1174,8 +1174,8 @@ egg_desktop_file_launchv (EggDesktopFile *desktop_file, if (screen) { - char *display_name = gdk_screen_make_display_name (screen); - char *display_env = g_strdup_printf ("DISPLAY=%s", display_name); + gchar *display_name = gdk_screen_make_display_name (screen); + gchar *display_env = g_strdup_printf ("DISPLAY=%s", display_name); env = array_putenv (env, display_env); g_free (display_name); g_free (display_env); @@ -1213,7 +1213,7 @@ egg_desktop_file_launchv (EggDesktopFile *desktop_file, workspace, launch_time); if (startup_id) { - char *startup_id_env = g_strdup_printf ("DESKTOP_STARTUP_ID=%s", + gchar *startup_id_env = g_strdup_printf ("DESKTOP_STARTUP_ID=%s", startup_id); env = array_putenv (env, startup_id_env); g_free (startup_id_env); @@ -1228,7 +1228,7 @@ egg_desktop_file_launchv (EggDesktopFile *desktop_file, current_success = g_spawn_async_with_pipes (directory, argv, - env ? (char **)(env->pdata) : NULL, + env ? (gchar **)(env->pdata) : NULL, flags, setup_func, setup_data, ret_pid, @@ -1294,14 +1294,14 @@ egg_desktop_file_launchv (EggDesktopFile *desktop_file, * * %EGG_DESKTOP_FILE_LAUNCH_CLEARENV: (no arguments) * clears the environment in the child process - * %EGG_DESKTOP_FILE_LAUNCH_PUTENV: (char **variables) + * %EGG_DESKTOP_FILE_LAUNCH_PUTENV: (gchar **variables) * adds the NAME=VALUE strings in the given %NULL-terminated * array to the child process's environment * %EGG_DESKTOP_FILE_LAUNCH_SCREEN: (GdkScreen *screen) * causes the application to be launched on the given screen - * %EGG_DESKTOP_FILE_LAUNCH_WORKSPACE: (int workspace) + * %EGG_DESKTOP_FILE_LAUNCH_WORKSPACE: (gint workspace) * causes the application to be launched on the given workspace - * %EGG_DESKTOP_FILE_LAUNCH_DIRECTORY: (char *dir) + * %EGG_DESKTOP_FILE_LAUNCH_DIRECTORY: (gchar *dir) * causes the application to be launched in the given directory * %EGG_DESKTOP_FILE_LAUNCH_TIME: (guint32 launch_time) * sets the "launch time" for the application. If the user @@ -1320,16 +1320,16 @@ egg_desktop_file_launchv (EggDesktopFile *desktop_file, * %EGG_DESKTOP_FILE_LAUNCH_RETURN_PID (GPid **pid) * On a successful launch, sets *@pid to the PID of the launched * application. - * %EGG_DESKTOP_FILE_LAUNCH_RETURN_STARTUP_ID (char **startup_id) + * %EGG_DESKTOP_FILE_LAUNCH_RETURN_STARTUP_ID (gchar **startup_id) * On a successful launch, sets *@startup_id to the Startup * Notification "startup id" of the launched application. - * %EGG_DESKTOP_FILE_LAUNCH_RETURN_STDIN_PIPE (int *fd) + * %EGG_DESKTOP_FILE_LAUNCH_RETURN_STDIN_PIPE (gint *fd) * On a successful launch, sets *@fd to the file descriptor of * a pipe connected to the application's stdin. - * %EGG_DESKTOP_FILE_LAUNCH_RETURN_STDOUT_PIPE (int *fd) + * %EGG_DESKTOP_FILE_LAUNCH_RETURN_STDOUT_PIPE (gint *fd) * On a successful launch, sets *@fd to the file descriptor of * a pipe connected to the application's stdout. - * %EGG_DESKTOP_FILE_LAUNCH_RETURN_STDERR_PIPE (int *fd) + * %EGG_DESKTOP_FILE_LAUNCH_RETURN_STDERR_PIPE (gint *fd) * On a successful launch, sets *@fd to the file descriptor of * a pipe connected to the application's stderr. * @@ -1372,7 +1372,7 @@ egg_desktop_file_launch (EggDesktopFile *desktop_file, EGG_DESKTOP_FILE_ERROR_NOT_LAUNCHABLE, _("Can't pass document URIs to a 'Type=Link' desktop entry")); return FALSE; - } + } if (!parse_link (desktop_file, &app_desktop_file, &documents, error)) return FALSE; @@ -1399,19 +1399,17 @@ egg_desktop_file_launch (EggDesktopFile *desktop_file, return success; } - GQuark egg_desktop_file_error_quark (void) { return g_quark_from_static_string ("egg-desktop_file-error-quark"); } - G_LOCK_DEFINE_STATIC (egg_desktop_file); static EggDesktopFile *egg_desktop_file; static void -egg_set_desktop_file_internal (const char *desktop_file_path, +egg_set_desktop_file_internal (const gchar *desktop_file_path, gboolean set_defaults) { GError *error = NULL; @@ -1464,7 +1462,7 @@ egg_set_desktop_file_internal (const char *desktop_file_path, * egg_set_desktop_file_without_defaults(). **/ void -egg_set_desktop_file (const char *desktop_file_path) +egg_set_desktop_file (const gchar *desktop_file_path) { egg_set_desktop_file_internal (desktop_file_path, TRUE); } @@ -1484,17 +1482,17 @@ egg_set_desktop_file (const char *desktop_file_path) * egg_set_desktop_file(). **/ void -egg_set_desktop_file_without_defaults (const char *desktop_file_path) +egg_set_desktop_file_without_defaults (const gchar *desktop_file_path) { egg_set_desktop_file_internal (desktop_file_path, FALSE); } /** * egg_get_desktop_file: - * + * * Gets the application's #EggDesktopFile, as set by * egg_set_desktop_file(). - * + * * Return value: the #EggDesktopFile, or %NULL if it hasn't been set. **/ EggDesktopFile * diff --git a/smclient/eggdesktopfile.h b/smclient/eggdesktopfile.h index 18fe4631a1..2c99705d87 100644 --- a/smclient/eggdesktopfile.h +++ b/smclient/eggdesktopfile.h @@ -34,35 +34,35 @@ typedef enum { EGG_DESKTOP_FILE_TYPE_DIRECTORY } EggDesktopFileType; -EggDesktopFile *egg_desktop_file_new (const char *desktop_file_path, +EggDesktopFile *egg_desktop_file_new (const gchar *desktop_file_path, GError **error); -EggDesktopFile *egg_desktop_file_new_from_data_dirs (const char *desktop_file_path, +EggDesktopFile *egg_desktop_file_new_from_data_dirs (const gchar *desktop_file_path, GError **error); -EggDesktopFile *egg_desktop_file_new_from_dirs (const char *desktop_file_path, - const char **search_dirs, +EggDesktopFile *egg_desktop_file_new_from_dirs (const gchar *desktop_file_path, + const gchar **search_dirs, GError **error); EggDesktopFile *egg_desktop_file_new_from_key_file (GKeyFile *key_file, - const char *source, + const gchar *source, GError **error); void egg_desktop_file_free (EggDesktopFile *desktop_file); -const char *egg_desktop_file_get_source (EggDesktopFile *desktop_file); +const gchar *egg_desktop_file_get_source (EggDesktopFile *desktop_file); EggDesktopFileType egg_desktop_file_get_desktop_file_type (EggDesktopFile *desktop_file); -const char *egg_desktop_file_get_name (EggDesktopFile *desktop_file); -const char *egg_desktop_file_get_icon (EggDesktopFile *desktop_file); +const gchar *egg_desktop_file_get_name (EggDesktopFile *desktop_file); +const gchar *egg_desktop_file_get_icon (EggDesktopFile *desktop_file); gboolean egg_desktop_file_can_launch (EggDesktopFile *desktop_file, - const char *desktop_environment); + const gchar *desktop_environment); gboolean egg_desktop_file_accepts_documents (EggDesktopFile *desktop_file); gboolean egg_desktop_file_accepts_multiple (EggDesktopFile *desktop_file); gboolean egg_desktop_file_accepts_uris (EggDesktopFile *desktop_file); -char *egg_desktop_file_parse_exec (EggDesktopFile *desktop_file, +gchar *egg_desktop_file_parse_exec (EggDesktopFile *desktop_file, GSList *documents, GError **error); @@ -112,32 +112,31 @@ typedef enum { /* Accessors */ gboolean egg_desktop_file_has_key (EggDesktopFile *desktop_file, - const char *key, + const gchar *key, GError **error); -char *egg_desktop_file_get_string (EggDesktopFile *desktop_file, - const char *key, +gchar *egg_desktop_file_get_string (EggDesktopFile *desktop_file, + const gchar *key, GError **error) G_GNUC_MALLOC; -char *egg_desktop_file_get_locale_string (EggDesktopFile *desktop_file, - const char *key, - const char *locale, +gchar *egg_desktop_file_get_locale_string (EggDesktopFile *desktop_file, + const gchar *key, + const gchar *locale, GError **error) G_GNUC_MALLOC; gboolean egg_desktop_file_get_boolean (EggDesktopFile *desktop_file, - const char *key, + const gchar *key, GError **error); -double egg_desktop_file_get_numeric (EggDesktopFile *desktop_file, - const char *key, +gdouble egg_desktop_file_get_numeric (EggDesktopFile *desktop_file, + const gchar *key, GError **error); -char **egg_desktop_file_get_string_list (EggDesktopFile *desktop_file, - const char *key, +gchar **egg_desktop_file_get_string_list (EggDesktopFile *desktop_file, + const gchar *key, gsize *length, GError **error) G_GNUC_MALLOC; -char **egg_desktop_file_get_locale_string_list (EggDesktopFile *desktop_file, - const char *key, - const char *locale, +gchar **egg_desktop_file_get_locale_string_list (EggDesktopFile *desktop_file, + const gchar *key, + const gchar *locale, gsize *length, GError **error) G_GNUC_MALLOC; - /* Errors */ #define EGG_DESKTOP_FILE_ERROR egg_desktop_file_error_quark() @@ -150,11 +149,10 @@ typedef enum { } EggDesktopFileError; /* Global application desktop file */ -void egg_set_desktop_file (const char *desktop_file_path); -void egg_set_desktop_file_without_defaults (const char *desktop_file_path); +void egg_set_desktop_file (const gchar *desktop_file_path); +void egg_set_desktop_file_without_defaults (const gchar *desktop_file_path); EggDesktopFile *egg_get_desktop_file (void); - G_END_DECLS #endif /* __EGG_DESKTOP_FILE_H__ */ diff --git a/smclient/eggsmclient-private.h b/smclient/eggsmclient-private.h index ccb10bfc32..47fda7f2eb 100644 --- a/smclient/eggsmclient-private.h +++ b/smclient/eggsmclient-private.h @@ -49,5 +49,4 @@ EggSMClient *egg_sm_client_osx_new (void); G_END_DECLS - #endif /* __EGG_SM_CLIENT_PRIVATE_H__ */ diff --git a/smclient/eggsmclient-xsmp.c b/smclient/eggsmclient-xsmp.c index 8bebfba060..e709f6dd6d 100644 --- a/smclient/eggsmclient-xsmp.c +++ b/smclient/eggsmclient-xsmp.c @@ -65,7 +65,7 @@ typedef enum XSMP_STATE_CONNECTION_CLOSED } EggSMClientXSMPState; -static const char *state_names[] = { +static const gchar *state_names[] = { "idle", "save-yourself", "interact-request", @@ -82,12 +82,12 @@ struct _EggSMClientXSMP EggSMClient parent; SmcConn connection; - char *client_id; + gchar *client_id; EggSMClientXSMPState state; - char **restart_command; + gchar **restart_command; gboolean set_restart_command; - int restart_style; + gint restart_style; guint idle; @@ -113,10 +113,10 @@ struct _EggSMClientXSMPClass }; static void sm_client_xsmp_startup (EggSMClient *client, - const char *client_id); + const gchar *client_id); static void sm_client_xsmp_set_restart_command (EggSMClient *client, - int argc, - const char **argv); + gint argc, + const gchar **argv); static void sm_client_xsmp_will_quit (EggSMClient *client, gboolean will_quit); static gboolean sm_client_xsmp_end_session (EggSMClient *client, @@ -125,9 +125,9 @@ static gboolean sm_client_xsmp_end_session (EggSMClient *client, static void xsmp_save_yourself (SmcConn smc_conn, SmPointer client_data, - int save_style, + gint save_style, Bool shutdown, - int interact_style, + gint interact_style, Bool fast); static void xsmp_die (SmcConn smc_conn, SmPointer client_data); @@ -138,21 +138,21 @@ static void xsmp_shutdown_cancelled (SmcConn smc_conn, static void xsmp_interact (SmcConn smc_conn, SmPointer client_data); -static SmProp *array_prop (const char *name, +static SmProp *array_prop (const gchar *name, ...); -static SmProp *ptrarray_prop (const char *name, +static SmProp *ptrarray_prop (const gchar *name, GPtrArray *values); -static SmProp *string_prop (const char *name, - const char *value); -static SmProp *card8_prop (const char *name, - unsigned char value); +static SmProp *string_prop (const gchar *name, + const gchar *value); +static SmProp *card8_prop (const gchar *name, + guchar value); static void set_properties (EggSMClientXSMP *xsmp, ...); static void delete_properties (EggSMClientXSMP *xsmp, ...); -static GPtrArray *generate_command (char **restart_command, - const char *client_id, - const char *state_file); +static GPtrArray *generate_command (gchar **restart_command, + const gchar *client_id, + const gchar *state_file); static void save_state (EggSMClientXSMP *xsmp); static void do_save_yourself (EggSMClientXSMP *xsmp); @@ -162,10 +162,10 @@ static void ice_init (void); static gboolean process_ice_messages (IceConn ice_conn); static void smc_error_handler (SmcConn smc_conn, Bool swap, - int offending_minor_opcode, + gint offending_minor_opcode, unsigned long offending_sequence, - int error_class, - int severity, + gint error_class, + gint severity, SmPointer values); G_DEFINE_TYPE (EggSMClientXSMP, egg_sm_client_xsmp, EGG_TYPE_SM_CLIENT) @@ -204,7 +204,7 @@ sm_client_xsmp_set_initial_properties (gpointer user_data) EggSMClientXSMP *xsmp = user_data; EggDesktopFile *desktop_file; GPtrArray *clone, *restart; - char pid_str[64]; + gchar pid_str[64]; if (xsmp->idle) { @@ -221,12 +221,12 @@ sm_client_xsmp_set_initial_properties (gpointer user_data) if (desktop_file) { GError *err = NULL; - char *cmdline, **argv; - int argc; + gchar *cmdline, **argv; + gint argc; if (xsmp->restart_style == SmRestartIfRunning) { - if (egg_desktop_file_get_boolean (desktop_file, + if (egg_desktop_file_get_boolean (desktop_file, "X-GNOME-AutoRestart", NULL)) xsmp->restart_style = SmRestartImmediately; } @@ -237,7 +237,7 @@ sm_client_xsmp_set_initial_properties (gpointer user_data) if (cmdline && g_shell_parse_argv (cmdline, &argc, &argv, &err)) { egg_sm_client_set_restart_command (EGG_SM_CLIENT (xsmp), - argc, (const char **)argv); + argc, (const gchar **)argv); g_strfreev (argv); } else @@ -310,12 +310,12 @@ sm_client_xsmp_disconnect (EggSMClientXSMP *xsmp) static void sm_client_xsmp_startup (EggSMClient *client, - const char *client_id) + const gchar *client_id) { EggSMClientXSMP *xsmp = (EggSMClientXSMP *)client; SmcCallbacks callbacks; - char *ret_client_id; - char error_string_ret[256]; + gchar *ret_client_id; + gchar error_string_ret[256]; xsmp->client_id = g_strdup (client_id); @@ -387,15 +387,15 @@ sm_client_xsmp_startup (EggSMClient *client, static void sm_client_xsmp_set_restart_command (EggSMClient *client, - int argc, - const char **argv) + gint argc, + const gchar **argv) { EggSMClientXSMP *xsmp = (EggSMClientXSMP *)client; - int i; + gint i; g_strfreev (xsmp->restart_command); - xsmp->restart_command = g_new (char *, argc + 1); + xsmp->restart_command = g_new (gchar *, argc + 1); for (i = 0; i < argc; i++) xsmp->restart_command[i] = g_strdup (argv[i]); xsmp->restart_command[i] = NULL; @@ -447,7 +447,7 @@ sm_client_xsmp_end_session (EggSMClient *client, gboolean request_confirmation) { EggSMClientXSMP *xsmp = (EggSMClientXSMP *)client; - int save_type; + gint save_type; /* To end the session via XSMP, we have to send a * SaveYourselfRequest. We aren't allowed to do that if anything @@ -587,7 +587,7 @@ update_pending_events (EggSMClientXSMP *xsmp) } static void -fix_broken_state (EggSMClientXSMP *xsmp, const char *message, +fix_broken_state (EggSMClientXSMP *xsmp, const gchar *message, gboolean send_interact_done, gboolean send_save_yourself_done) { @@ -611,9 +611,9 @@ fix_broken_state (EggSMClientXSMP *xsmp, const char *message, static void xsmp_save_yourself (SmcConn smc_conn, SmPointer client_data, - int save_type, + gint save_type, Bool shutdown, - int interact_style, + gint interact_style, Bool fast) { EggSMClientXSMP *xsmp = client_data; @@ -666,13 +666,13 @@ xsmp_save_yourself (SmcConn smc_conn, * different combinations of save_type, shutdown and interact_style. * We interpret them as follows: * - * Type Shutdown Interact Interpretation - * G F A/E/N do nothing (1) - * G T N do nothing (1)* - * G T A/E quit_requested (2) - * L/B F A/E/N save_state (3) - * L/B T N save_state (3)* - * L/B T A/E quit_requested, then save_state (4) + * Type Shutdown Interact Interpretation + * G F A/E/N do nothing (1) + * G T N do nothing (1)* + * G T A/E quit_requested (2) + * L/B F A/E/N save_state (3) + * L/B T N save_state (3)* + * L/B T A/E quit_requested, then save_state (4) * * 1. Do nothing, because the SM asked us to do something * uninteresting (save open files, but then don't quit @@ -769,10 +769,10 @@ static void save_state (EggSMClientXSMP *xsmp) { GKeyFile *state_file; - char *state_file_path, *data; + gchar *state_file_path, *data; EggDesktopFile *desktop_file; GPtrArray *restart; - int offset, fd; + gint offset, fd; /* We set xsmp->state before emitting save_state, but our caller is * responsible for setting it back afterward. @@ -795,7 +795,7 @@ save_state (EggSMClientXSMP *xsmp) if (desktop_file) { GKeyFile *merged_file; - char *desktop_file_path; + gchar *desktop_file_path; merged_file = g_key_file_new (); desktop_file_path = @@ -807,7 +807,7 @@ save_state (EggSMClientXSMP *xsmp) G_KEY_FILE_KEEP_TRANSLATIONS, NULL)) { guint g, k, i; - char **groups, **keys, *value, *exec; + gchar **groups, **keys, *value, *exec; groups = g_key_file_get_groups (state_file, NULL); for (g = 0; groups[g]; g++) @@ -837,8 +837,8 @@ save_state (EggSMClientXSMP *xsmp) for (i = 0; i < restart->len; i++) restart->pdata[i] = g_shell_quote (restart->pdata[i]); g_ptr_array_add (restart, NULL); - exec = g_strjoinv (" ", (char **)restart->pdata); - g_strfreev ((char **)restart->pdata); + exec = g_strjoinv (" ", (gchar **)restart->pdata); + g_strfreev ((gchar **)restart->pdata); g_ptr_array_free (restart, FALSE); g_key_file_set_string (state_file, EGG_DESKTOP_FILE_GROUP, @@ -881,7 +881,7 @@ save_state (EggSMClientXSMP *xsmp) } else if (errno == ENOTDIR || errno == ENOENT) { - char *sep = strrchr (state_file_path, G_DIR_SEPARATOR); + gchar *sep = strrchr (state_file_path, G_DIR_SEPARATOR); *sep = '\0'; if (g_mkdir_with_parents (state_file_path, 0755) != 0) @@ -1041,25 +1041,25 @@ xsmp_shutdown_cancelled (SmcConn smc_conn, * then free the array, but not its contents. */ static GPtrArray * -generate_command (char **restart_command, const char *client_id, - const char *state_file) +generate_command (gchar **restart_command, const gchar *client_id, + const gchar *state_file) { GPtrArray *cmd; - int i; + gint i; cmd = g_ptr_array_new (); g_ptr_array_add (cmd, restart_command[0]); if (client_id) { - g_ptr_array_add (cmd, (char *)"--sm-client-id"); - g_ptr_array_add (cmd, (char *)client_id); + g_ptr_array_add (cmd, (gchar *)"--sm-client-id"); + g_ptr_array_add (cmd, (gchar *)client_id); } if (state_file) { - g_ptr_array_add (cmd, (char *)"--sm-client-state-file"); - g_ptr_array_add (cmd, (char *)state_file); + g_ptr_array_add (cmd, (gchar *)"--sm-client-state-file"); + g_ptr_array_add (cmd, (gchar *)state_file); } for (i = 1; restart_command[i]; i++) @@ -1107,7 +1107,7 @@ static void delete_properties (EggSMClientXSMP *xsmp, ...) { GPtrArray *props; - char *prop; + gchar *prop; va_list ap; if (!xsmp->connection) @@ -1116,12 +1116,12 @@ delete_properties (EggSMClientXSMP *xsmp, ...) props = g_ptr_array_new (); va_start (ap, xsmp); - while ((prop = va_arg (ap, char *))) + while ((prop = va_arg (ap, gchar *))) g_ptr_array_add (props, prop); va_end (ap); SmcDeleteProperties (xsmp->connection, props->len, - (char **)props->pdata); + (gchar **)props->pdata); g_ptr_array_free (props, TRUE); } @@ -1131,22 +1131,22 @@ delete_properties (EggSMClientXSMP *xsmp, ...) * until you're done with the SmProp. */ static SmProp * -array_prop (const char *name, ...) +array_prop (const gchar *name, ...) { SmProp *prop; SmPropValue pv; GArray *vals; - char *value; + gchar *value; va_list ap; prop = g_new (SmProp, 1); - prop->name = (char *)name; - prop->type = (char *)SmLISTofARRAY8; + prop->name = (gchar *)name; + prop->type = (gchar *)SmLISTofARRAY8; vals = g_array_new (FALSE, FALSE, sizeof (SmPropValue)); va_start (ap, name); - while ((value = va_arg (ap, char *))) + while ((value = va_arg (ap, gchar *))) { pv.length = strlen (value); pv.value = value; @@ -1166,7 +1166,7 @@ array_prop (const char *name, ...) * remain valid until you're done with the SmProp. */ static SmProp * -ptrarray_prop (const char *name, GPtrArray *values) +ptrarray_prop (const gchar *name, GPtrArray *values) { SmProp *prop; SmPropValue pv; @@ -1174,8 +1174,8 @@ ptrarray_prop (const char *name, GPtrArray *values) guint i; prop = g_new (SmProp, 1); - prop->name = (char *)name; - prop->type = (char *)SmLISTofARRAY8; + prop->name = (gchar *)name; + prop->type = (gchar *)SmLISTofARRAY8; vals = g_array_new (FALSE, FALSE, sizeof (SmPropValue)); @@ -1199,29 +1199,29 @@ ptrarray_prop (const char *name, GPtrArray *values) * done with the SmProp. */ static SmProp * -string_prop (const char *name, const char *value) +string_prop (const gchar *name, const gchar *value) { SmProp *prop; prop = g_new (SmProp, 1); - prop->name = (char *)name; - prop->type = (char *)SmARRAY8; + prop->name = (gchar *)name; + prop->type = (gchar *)SmARRAY8; prop->num_vals = 1; prop->vals = g_new (SmPropValue, 1); prop->vals[0].length = strlen (value); - prop->vals[0].value = (char *)value; + prop->vals[0].value = (gchar *)value; return prop; } -/* Takes a char and creates a CARD8 property. */ +/* Takes a gchar and creates a CARD8 property. */ static SmProp * -card8_prop (const char *name, unsigned char value) +card8_prop (const gchar *name, guchar value) { SmProp *prop; - char *card8val; + gchar *card8val; /* To avoid having to allocate and free prop->vals[0], we cheat and * make vals a 2-element-long array and then use the second element @@ -1229,12 +1229,12 @@ card8_prop (const char *name, unsigned char value) */ prop = g_new (SmProp, 1); - prop->name = (char *)name; - prop->type = (char *)SmCARD8; + prop->name = (gchar *)name; + prop->type = (gchar *)SmCARD8; prop->num_vals = 1; prop->vals = g_new (SmPropValue, 2); - card8val = (char *)(&prop->vals[1]); + card8val = (gchar *)(&prop->vals[1]); card8val[0] = value; prop->vals[0].length = 1; @@ -1258,10 +1258,10 @@ card8_prop (const char *name, unsigned char value) static void ice_error_handler (IceConn ice_conn, Bool swap, - int offending_minor_opcode, + gint offending_minor_opcode, unsigned long offending_sequence, - int error_class, - int severity, + gint error_class, + gint severity, IcePointer values); static void ice_io_error_handler (IceConn ice_conn); static void ice_connection_watch (IceConn ice_conn, @@ -1322,7 +1322,7 @@ ice_connection_watch (IceConn ice_conn, if (opening) { GIOChannel *channel; - int fd = IceConnectionNumber (ice_conn); + gint fd = IceConnectionNumber (ice_conn); fcntl (fd, F_SETFD, fcntl (fd, F_GETFD, 0) | FD_CLOEXEC); channel = g_io_channel_unix_new (fd); @@ -1342,28 +1342,28 @@ ice_connection_watch (IceConn ice_conn, static void ice_error_handler (IceConn ice_conn, Bool swap, - int offending_minor_opcode, + gint offending_minor_opcode, unsigned long offending_sequence, - int error_class, - int severity, + gint error_class, + gint severity, IcePointer values) { /* Do nothing */ -} +} static void ice_io_error_handler (IceConn ice_conn) { /* Do nothing */ -} +} static void smc_error_handler (SmcConn smc_conn, Bool swap, - int offending_minor_opcode, + gint offending_minor_opcode, unsigned long offending_sequence, - int error_class, - int severity, + gint error_class, + gint severity, SmPointer values) { /* Do nothing */ diff --git a/smclient/eggsmclient.c b/smclient/eggsmclient.c index efa901d532..e17d98c3a9 100644 --- a/smclient/eggsmclient.c +++ b/smclient/eggsmclient.c @@ -25,9 +25,9 @@ #include "eggsmclient.h" #include "eggsmclient-private.h" -static void egg_sm_client_debug_handler (const char *log_domain, +static void egg_sm_client_debug_handler (const gchar *log_domain, GLogLevelFlags log_level, - const char *message, + const gchar *message, gpointer user_data); enum { @@ -116,7 +116,7 @@ egg_sm_client_class_init (EggSMClientClass *klass) * handling this signal; if the user has requested that the session * be saved when logging out, then ::save_state will be emitted * separately. - * + * * If the application agrees to quit, it should then wait for either * the ::quit_cancelled or ::quit signals to be emitted. **/ @@ -176,9 +176,9 @@ egg_sm_client_class_init (EggSMClientClass *klass) } static gboolean sm_client_disable = FALSE; -static char *sm_client_state_file = NULL; -static char *sm_client_id = NULL; -static char *sm_config_prefix = NULL; +static gchar *sm_client_state_file = NULL; +static gchar *sm_client_id = NULL; +static gchar *sm_config_prefix = NULL; static gboolean sm_client_post_parse_func (GOptionContext *context, @@ -391,7 +391,7 @@ GKeyFile * egg_sm_client_get_state_file (EggSMClient *client) { EggSMClientPrivate *priv = EGG_SM_CLIENT_GET_PRIVATE (client); - char *state_file_path; + gchar *state_file_path; GError *err = NULL; g_return_val_if_fail (client == global_client, NULL); @@ -435,8 +435,8 @@ egg_sm_client_get_state_file (EggSMClient *client) **/ void egg_sm_client_set_restart_command (EggSMClient *client, - int argc, - const char **argv) + gint argc, + const gchar **argv) { g_return_if_fail (EGG_IS_SM_CLIENT (client)); @@ -511,7 +511,7 @@ GKeyFile * egg_sm_client_save_state (EggSMClient *client) { GKeyFile *state_file; - char *group; + gchar *group; g_return_val_if_fail (client == global_client, NULL); @@ -574,12 +574,12 @@ egg_sm_client_quit (EggSMClient *client) } static void -egg_sm_client_debug_handler (const char *log_domain, +egg_sm_client_debug_handler (const gchar *log_domain, GLogLevelFlags log_level, - const char *message, + const gchar *message, gpointer user_data) { - static int debug = -1; + static gint debug = -1; if (debug < 0) debug = (g_getenv ("EGG_SM_CLIENT_DEBUG") != NULL); diff --git a/smclient/eggsmclient.h b/smclient/eggsmclient.h index e620b754a3..5efc486df0 100644 --- a/smclient/eggsmclient.h +++ b/smclient/eggsmclient.h @@ -68,10 +68,10 @@ struct _EggSMClientClass /* virtual methods */ void (*startup) (EggSMClient *client, - const char *client_id); + const gchar *client_id); void (*set_restart_command) (EggSMClient *client, - int argc, - const char **argv); + gint argc, + const gchar **argv); void (*will_quit) (EggSMClient *client, gboolean will_quit); gboolean (*end_session) (EggSMClient *client, @@ -100,8 +100,8 @@ GKeyFile *egg_sm_client_get_state_file (EggSMClient *client); /* Alternate means of saving state */ void egg_sm_client_set_restart_command (EggSMClient *client, - int argc, - const char **argv); + gint argc, + const gchar **argv); /* Handling "quit_requested" signal */ void egg_sm_client_will_quit (EggSMClient *client, @@ -113,5 +113,4 @@ gboolean egg_sm_client_end_session (EggSMClientEndStyle style, G_END_DECLS - #endif /* __EGG_SM_CLIENT_H__ */ diff --git a/smime/gui/cert-trust-dialog.c b/smime/gui/cert-trust-dialog.c index b32a7c58c7..c22c7e6a4a 100644 --- a/smime/gui/cert-trust-dialog.c +++ b/smime/gui/cert-trust-dialog.c @@ -144,7 +144,6 @@ cert_trust_dialog_show (ECert *cert) else gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (ctd_data->notrust_button), TRUE); - icert = e_cert_get_internal_cert(ctd_data->cacert); if (e_cert_trust_has_trusted_ca(icert->trust, FALSE, TRUE, FALSE)) gtk_label_set_text((GtkLabel *)ctd_data->label, diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c index 6e09b504fd..030946e3cb 100644 --- a/smime/gui/certificate-manager.c +++ b/smime/gui/certificate-manager.c @@ -846,7 +846,6 @@ add_ca_cert (CertificateManagerData *cfm, ECert *cert) } } - gtk_tree_store_append (GTK_TREE_STORE (model), &iter, parent_iter); if (e_cert_get_cn (cert)) @@ -942,7 +941,6 @@ unload_certs (CertificateManagerData *cfm, cfm->authoritycerts_root_hash = g_hash_table_new_full (g_str_hash, g_str_equal, destroy_key, destroy_value); - break; case E_CERT_UNKNOWN: /* nothing to do here */ diff --git a/smime/lib/e-asn1-object.c b/smime/lib/e-asn1-object.c index e0d644344b..e8c51b6a24 100644 --- a/smime/lib/e-asn1-object.c +++ b/smime/lib/e-asn1-object.c @@ -306,7 +306,6 @@ e_asn1_object_new (void) return E_ASN1_OBJECT (g_object_new (E_TYPE_ASN1_OBJECT, NULL)); } - void e_asn1_object_set_valid_container (EASN1Object *obj, gboolean flag) { diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c index d0528f7d2f..e0434754a8 100644 --- a/smime/lib/e-cert-db.c +++ b/smime/lib/e-cert-db.c @@ -407,7 +407,6 @@ e_cert_db_find_cert_by_nickname (ECertDB *certdb, cert = CERT_FindCertByNickname(CERT_GetDefaultCertDB(), (gchar *)nickname); } - if (cert) { /* PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("got it\n"));*/ ECert *ecert = e_cert_new (cert); diff --git a/smime/lib/e-cert-db.h b/smime/lib/e-cert-db.h index 30d20448cb..0e19e002c5 100644 --- a/smime/lib/e-cert-db.h +++ b/smime/lib/e-cert-db.h @@ -81,7 +81,6 @@ GList* e_cert_db_get_cert_nicknames (ECertDB *certdb, ECertType cert_type, GError **error); - ECert* e_cert_db_find_email_encryption_cert (ECertDB *certdb, const gchar *nickname, GError **error); diff --git a/smime/lib/e-cert.c b/smime/lib/e-cert.c index 8367b7b8fd..0cea3c50fc 100644 --- a/smime/lib/e-cert.c +++ b/smime/lib/e-cert.c @@ -278,7 +278,6 @@ e_cert_new_from_der (gchar *data, guint32 len) return e_cert_new (cert); } - CERTCertificate* @@ -676,7 +675,6 @@ get_oid_text (SECItem *oid, gchar **text) return TRUE; } - static gboolean process_raw_bytes (SECItem *data, gchar **text) { @@ -1069,7 +1067,6 @@ create_tbs_certificate_asn1_struct (ECert *cert, EASN1Object **seq) e_asn1_object_append_child (sequence, subitem); g_object_unref (subitem); - if (!process_sec_algorithm_id (&cert->priv->cert->signature, &subitem)) return FALSE; e_asn1_object_set_display_name (subitem, _("Certificate Signature Algorithm")); diff --git a/smime/lib/e-pkcs12.h b/smime/lib/e-pkcs12.h index 444afcaadd..6e98fdb0cb 100644 --- a/smime/lib/e-pkcs12.h +++ b/smime/lib/e-pkcs12.h @@ -55,7 +55,6 @@ GType e_pkcs12_get_type (void); EPKCS12* e_pkcs12_new (void); - #if 0 /* XXX we're not going to support additional slots in the initial ssl stuff, so we just always default to the internal token (and thus 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); |