aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
Diffstat (limited to 'embed')
-rw-r--r--embed/downloader-view.h2
-rw-r--r--embed/ephy-download.h6
-rw-r--r--embed/ephy-embed-dialog.h4
-rw-r--r--embed/ephy-embed-event.h2
-rw-r--r--embed/ephy-embed-persist.h2
-rw-r--r--embed/ephy-embed-popup-control.h6
-rw-r--r--embed/ephy-embed-shell.h8
-rw-r--r--embed/ephy-embed-single.h21
-rw-r--r--embed/ephy-encodings.h2
-rw-r--r--embed/ephy-favicon-cache.h3
-rw-r--r--embed/ephy-history.h10
-rw-r--r--embed/find-dialog.h10
-rw-r--r--embed/mozilla/EphyBrowser.h4
-rw-r--r--embed/mozilla/GtkNSSKeyPairDialogs.cpp2
-rw-r--r--embed/mozilla/mozilla-download.h10
-rw-r--r--embed/mozilla/mozilla-embed-persist.h18
-rw-r--r--embed/mozilla/mozilla-embed-single.h6
-rw-r--r--embed/print-dialog.h15
18 files changed, 82 insertions, 49 deletions
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
@@ -42,25 +42,6 @@ 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
*/
typedef struct
@@ -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 <glib-object.h>
@@ -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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 13:40:09 +0800