From f52461471f1ef86adda1f9a311483f57e4d51dbd Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Wed, 19 Nov 2003 19:19:59 +0000 Subject: Complete docs base implementation. Should work more or less. 2003-11-19 Marco Pesenti Gritti * doc/reference/.cvsignore: * doc/reference/Makefile.am: * doc/reference/epiphany-docs.sgml: * doc/reference/epiphany.types: * doc/reference/tmpl/config.sgml: * doc/reference/tmpl/ephy-session.sgml: * doc/reference/tmpl/ephy-shell.sgml: Complete docs base implementation. Should work more or less. * embed/Makefile.am: * lib/Makefile.am: * src/Makefile.am: Cleanup a bit libs build and use a static lib also for the src/ code so that we can use it for documents. * src/ephy-nautilus-view.c: Bad chpe forgot to modify func signature. 2003-11-19 Christian Persch * embed/downloader-view.h: * embed/ephy-download.h: * embed/ephy-embed-dialog.h: * embed/ephy-embed-event.h: * embed/ephy-embed-persist.h: * embed/ephy-embed-popup-control.h: * embed/ephy-embed-shell.h: * embed/ephy-embed-single.h: * embed/ephy-encodings.h: * embed/ephy-favicon-cache.h: * embed/ephy-history.h: * embed/find-dialog.h: * embed/mozilla/EphyBrowser.h: * embed/mozilla/GtkNSSKeyPairDialogs.cpp: * embed/mozilla/mozilla-download.h: * embed/mozilla/mozilla-embed-persist.h: * embed/mozilla/mozilla-embed-single.h: * embed/print-dialog.h: * lib/egg/egg-editable-toolbar.h: * lib/egg/egg-toolbar-editor.h: * lib/egg/egg-toolbars-model.h: * lib/ephy-debug.h: * lib/ephy-dialog.h: * lib/ephy-dnd.h: * lib/ephy-file-chooser.h: * lib/ephy-node-db.h: * lib/ephy-node-filter.h: * lib/ephy-node.h: * lib/ephy-prefs.h: * lib/ephy-state.h: * lib/ephy-string.h: * lib/ephy-zoom.h: * lib/widgets/ephy-arrow-toolbutton.h: * lib/widgets/ephy-cell-renderer-progress.h: * lib/widgets/ephy-ellipsizing-label.h: * lib/widgets/ephy-location-entry.h: * lib/widgets/ephy-node-view.h: * lib/widgets/ephy-search-entry.h: * lib/widgets/ephy-spinner.h: * lib/widgets/ephy-tree-model-node.h: * lib/widgets/ephy-tree-model-sort.h: * lib/widgets/ephy-zoom-action.h: * lib/widgets/ephy-zoom-control.h: * src/bookmarks/ephy-bookmark-action.h: * src/bookmarks/ephy-bookmark-properties.h: * src/bookmarks/ephy-bookmarks-editor.h: * src/bookmarks/ephy-bookmarks-menu.h: * src/bookmarks/ephy-bookmarks.h: * src/bookmarks/ephy-new-bookmark.h: * src/bookmarks/ephy-topic-action.h: * src/bookmarks/ephy-topics-selector.h: * src/ephy-automation.h: * src/ephy-completion-model.h: * src/ephy-encoding-dialog.h: --- embed/downloader-view.h | 2 ++ embed/ephy-download.h | 6 +++++- embed/ephy-embed-dialog.h | 4 ++++ embed/ephy-embed-event.h | 2 ++ embed/ephy-embed-persist.h | 2 ++ embed/ephy-embed-popup-control.h | 6 +++++- embed/ephy-embed-shell.h | 8 ++++++-- embed/ephy-embed-single.h | 21 ++------------------- embed/ephy-encodings.h | 2 ++ embed/ephy-favicon-cache.h | 3 +++ embed/ephy-history.h | 10 +++++++--- embed/find-dialog.h | 10 +++++++--- embed/mozilla/EphyBrowser.h | 4 ++-- embed/mozilla/GtkNSSKeyPairDialogs.cpp | 2 +- embed/mozilla/mozilla-download.h | 10 ++++++---- embed/mozilla/mozilla-embed-persist.h | 18 +++++++++++------- embed/mozilla/mozilla-embed-single.h | 6 +++++- embed/print-dialog.h | 15 ++++++++++----- 18 files changed, 82 insertions(+), 49 deletions(-) (limited to 'embed') diff --git a/embed/downloader-view.h b/embed/downloader-view.h index 433523b30..65d78ec40 100644 --- a/embed/downloader-view.h +++ b/embed/downloader-view.h @@ -41,6 +41,8 @@ typedef struct DownloaderViewPrivate DownloaderViewPrivate; struct DownloaderView { EphyDialog parent; + + /*< private >*/ DownloaderViewPrivate *priv; }; diff --git a/embed/ephy-download.h b/embed/ephy-download.h index c36c0de5c..fcdf00815 100644 --- a/embed/ephy-download.h +++ b/embed/ephy-download.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000, 2001, 2002 Marco Pesenti Gritti + * Copyright (C) 2000-2003 Marco Pesenti Gritti * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,8 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * $Id$ */ #ifndef EPHY_DOWNLOAD_H @@ -46,6 +48,8 @@ typedef enum struct EphyDownload { GObject parent; + + /*< private >*/ EphyDownloadPrivate *priv; }; diff --git a/embed/ephy-embed-dialog.h b/embed/ephy-embed-dialog.h index 743f0b7c2..4dc1e7c28 100644 --- a/embed/ephy-embed-dialog.h +++ b/embed/ephy-embed-dialog.h @@ -14,6 +14,8 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * $Id$ */ #ifndef EPHY_EMBED_DIALOG_H @@ -42,6 +44,8 @@ typedef struct EphyEmbedDialogPrivate EphyEmbedDialogPrivate; struct EphyEmbedDialog { EphyDialog parent; + + /*< private >*/ EphyEmbedDialogPrivate *priv; }; diff --git a/embed/ephy-embed-event.h b/embed/ephy-embed-event.h index bf87560f5..a056082f1 100644 --- a/embed/ephy-embed-event.h +++ b/embed/ephy-embed-event.h @@ -58,6 +58,8 @@ typedef enum struct EphyEmbedEvent { GObject parent; + + /*< private >*/ EphyEmbedEventPrivate *priv; /* Public to the embed implementations */ diff --git a/embed/ephy-embed-persist.h b/embed/ephy-embed-persist.h index 8e5980128..1eadb5940 100644 --- a/embed/ephy-embed-persist.h +++ b/embed/ephy-embed-persist.h @@ -53,6 +53,8 @@ typedef enum struct EphyEmbedPersist { GObject parent; + + /*< private >*/ EphyEmbedPersistPrivate *priv; }; diff --git a/embed/ephy-embed-popup-control.h b/embed/ephy-embed-popup-control.h index 686368672..bc1fc710e 100644 --- a/embed/ephy-embed-popup-control.h +++ b/embed/ephy-embed-popup-control.h @@ -14,6 +14,8 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * $Id$ */ #ifndef EPHY_EMBED_POPUP_CONTROL_H @@ -40,7 +42,9 @@ typedef struct EphyEmbedPopupControlPrivate EphyEmbedPopupControlPrivate; struct EphyEmbedPopupControl { GObject parent; - EphyEmbedPopupControlPrivate *priv; + + /*< private >*/ + EphyEmbedPopupControlPrivate *priv; }; struct EphyEmbedPopupControlClass diff --git a/embed/ephy-embed-shell.h b/embed/ephy-embed-shell.h index 6cafdc63c..faac44746 100644 --- a/embed/ephy-embed-shell.h +++ b/embed/ephy-embed-shell.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000, 2001, 2002 Marco Pesenti Gritti + * Copyright (C) 2000-2003 Marco Pesenti Gritti * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,8 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * $Id$ */ #ifndef EPHY_EMBED_SHELL_H @@ -52,7 +54,9 @@ typedef enum struct EphyEmbedShell { GObject parent; - EphyEmbedShellPrivate *priv; + + /*< private >*/ + EphyEmbedShellPrivate *priv; }; struct EphyEmbedShellClass diff --git a/embed/ephy-embed-single.h b/embed/ephy-embed-single.h index 8dc55c1ee..0228032af 100644 --- a/embed/ephy-embed-single.h +++ b/embed/ephy-embed-single.h @@ -41,25 +41,6 @@ typedef struct EphyEmbedSingleClass EphyEmbedSingleClass; typedef struct EphyEmbedSingle EphyEmbedSingle; typedef struct EphyEmbedSinglePrivate EphyEmbedSinglePrivate; -/** - * FilePickerMode: What mode FilePicker should run in - */ - -typedef enum -{ - modeOpen = 0, - modeSave = 1, - modeGetFolder =2 -} FilePickerMode; - -typedef struct -{ - /* description of the file format */ - gchar *description; - /* tipical sufixes, NULL terminated */ - gchar **extensions; -} FileFormat; - /** * Cookie: the type of cookies */ @@ -100,6 +81,8 @@ typedef enum struct EphyEmbedSingle { GObject parent; + + /*< private >*/ EphyEmbedSinglePrivate *priv; }; diff --git a/embed/ephy-encodings.h b/embed/ephy-encodings.h index bae868529..b7b15f828 100644 --- a/embed/ephy-encodings.h +++ b/embed/ephy-encodings.h @@ -115,6 +115,8 @@ enum typedef struct { GObject parent; + + /*< private >*/ EphyEncodingsPrivate *priv; } EphyEncodings; diff --git a/embed/ephy-favicon-cache.h b/embed/ephy-favicon-cache.h index c9174ae28..6c6958228 100644 --- a/embed/ephy-favicon-cache.h +++ b/embed/ephy-favicon-cache.h @@ -14,6 +14,8 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * $Id$ */ #include @@ -44,6 +46,7 @@ typedef struct { GObject parent; + /*< private >*/ EphyFaviconCachePrivate *priv; } EphyFaviconCache; diff --git a/embed/ephy-history.h b/embed/ephy-history.h index 52948b65c..e3184156f 100644 --- a/embed/ephy-history.h +++ b/embed/ephy-history.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000, 2001, 2002 Marco Pesenti Gritti + * Copyright (C) 2000-2003 Marco Pesenti Gritti * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,8 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * $Id$ */ #ifndef EPHY_HISTORY_H @@ -51,8 +53,10 @@ enum struct EphyHistory { - GObject parent; - EphyHistoryPrivate *priv; + GObject parent; + + /*< private >*/ + EphyHistoryPrivate *priv; }; struct EphyHistoryClass diff --git a/embed/find-dialog.h b/embed/find-dialog.h index 27a59a97e..a2a952d1d 100644 --- a/embed/find-dialog.h +++ b/embed/find-dialog.h @@ -14,6 +14,8 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * $Id$ */ #ifndef FIND_DIALOG_H @@ -36,13 +38,15 @@ typedef struct FindDialogPrivate FindDialogPrivate; struct FindDialog { - EphyEmbedDialog parent; - FindDialogPrivate *priv; + EphyEmbedDialog parent; + + /*< private >*/ + FindDialogPrivate *priv; }; struct FindDialogClass { - EphyEmbedDialogClass parent_class; + EphyEmbedDialogClass parent_class; }; GType find_dialog_get_type (void); diff --git a/embed/mozilla/EphyBrowser.h b/embed/mozilla/EphyBrowser.h index a57736092..b2de36ff2 100644 --- a/embed/mozilla/EphyBrowser.h +++ b/embed/mozilla/EphyBrowser.h @@ -18,8 +18,8 @@ * $Id$ */ -#ifndef EPHY_WRAPPER_H -#define EPHY_WRAPPER_H +#ifndef EPHY_BROWSER_H +#define EPHY_BROWSER_H #include "ephy-encodings.h" diff --git a/embed/mozilla/GtkNSSKeyPairDialogs.cpp b/embed/mozilla/GtkNSSKeyPairDialogs.cpp index 941bcebe3..f43f8aacd 100644 --- a/embed/mozilla/GtkNSSKeyPairDialogs.cpp +++ b/embed/mozilla/GtkNSSKeyPairDialogs.cpp @@ -583,7 +583,7 @@ NS_IMETHODIMP KeyPairHelperWindow::UpdateCommands(const nsAString & action) MOZ_NOT_IMPLEMENTED } -#if MOZILLA_SNAPSHOT <= 12 +#if MOZILLA_SNAPSHOT <= 13 /* DOMString escape (in DOMString str); */ NS_IMETHODIMP KeyPairHelperWindow::Escape(const nsAString & str, nsAString & _retval) { diff --git a/embed/mozilla/mozilla-download.h b/embed/mozilla/mozilla-download.h index 3d92cc24d..fd92d204b 100644 --- a/embed/mozilla/mozilla-download.h +++ b/embed/mozilla/mozilla-download.h @@ -14,6 +14,8 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * $Id$ */ #ifndef MOZILLA_DOWNLOAD_H @@ -39,18 +41,18 @@ typedef struct MozillaDownloadPrivate MozillaDownloadPrivate; struct MozillaDownload { - EphyDownload parent; + EphyDownload parent; MozDownload *moz_download; }; struct MozillaDownloadClass { - EphyDownloadClass parent_class; + EphyDownloadClass parent_class; }; -GType mozilla_download_get_type (void); +GType mozilla_download_get_type (void); -EphyDownload *mozilla_download_new (void); +EphyDownload *mozilla_download_new (void); G_END_DECLS diff --git a/embed/mozilla/mozilla-embed-persist.h b/embed/mozilla/mozilla-embed-persist.h index 7eab5de9a..1832b8d19 100644 --- a/embed/mozilla/mozilla-embed-persist.h +++ b/embed/mozilla/mozilla-embed-persist.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000, 2001, 2002 Marco Pesenti Gritti + * Copyright (C) 2000-2003 Marco Pesenti Gritti * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,8 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * $Id$ */ #ifndef MOZILLA_EMBED_PERSIST_H @@ -39,20 +41,22 @@ typedef struct MozillaEmbedPersistPrivate MozillaEmbedPersistPrivate; struct MozillaEmbedPersist { - EphyEmbedPersist parent; - MozillaEmbedPersistPrivate *priv; + EphyEmbedPersist parent; + + /*< private >*/ + MozillaEmbedPersistPrivate *priv; }; struct MozillaEmbedPersistClass { - EphyEmbedPersistClass parent_class; + EphyEmbedPersistClass parent_class; }; -GType mozilla_embed_persist_get_type (void); +GType mozilla_embed_persist_get_type (void); -void mozilla_embed_persist_completed (MozillaEmbedPersist *persist); +void mozilla_embed_persist_completed (MozillaEmbedPersist *persist); -void mozilla_embed_persist_cancelled (MozillaEmbedPersist *persist); +void mozilla_embed_persist_cancelled (MozillaEmbedPersist *persist); G_END_DECLS diff --git a/embed/mozilla/mozilla-embed-single.h b/embed/mozilla/mozilla-embed-single.h index dfefd0a5a..63ce78267 100644 --- a/embed/mozilla/mozilla-embed-single.h +++ b/embed/mozilla/mozilla-embed-single.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000, 2001, 2002 Marco Pesenti Gritti + * Copyright (C) 2000-2003 Marco Pesenti Gritti * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,6 +14,8 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * $Id$ */ #ifndef MOZILLA_EMBED_SINGLE_H @@ -38,6 +40,8 @@ typedef struct MozillaEmbedSinglePrivate MozillaEmbedSinglePrivate; struct MozillaEmbedSingle { EphyEmbedSingle parent; + + /*< private >*/ MozillaEmbedSinglePrivate *priv; }; diff --git a/embed/print-dialog.h b/embed/print-dialog.h index c7b9a5b2e..3ca150172 100644 --- a/embed/print-dialog.h +++ b/embed/print-dialog.h @@ -14,6 +14,8 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * $Id$ */ #ifndef PRINT_DIALOG_H @@ -40,11 +42,14 @@ typedef struct PrintDialogPrivate PrintDialogPrivate; struct PrintDialog { - EphyEmbedDialog parent; - PrintDialogPrivate *priv; - //FIXME: These should be gobject properties - gboolean only_collect_info; - EmbedPrintInfo **ret_info; + EphyEmbedDialog parent; + + /*< private >*/ + PrintDialogPrivate *priv; + + //FIXME: These should be gobject properties + gboolean only_collect_info; + EmbedPrintInfo **ret_info; }; struct PrintDialogClass -- cgit v1.2.3