aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--embed/mozilla/mozilla-download.cpp3
-rw-r--r--embed/mozilla/mozilla-download.h19
3 files changed, 16 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index f6f548ac0..7c57d6096 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2005-04-08 Christian Persch <chpe@cvs.gnome.org>
+ * embed/mozilla/mozilla-download.h:
+
+ Don't use G_BEGIN/END_DECLS here, and don't include MozDownload.h.
+
+2005-04-08 Christian Persch <chpe@cvs.gnome.org>
+
* embed/mozilla/MozDownload.cpp:
InitForEmbed isn't a NS_IMETHOD, so don't use NS_IMETHODIMP here.
diff --git a/embed/mozilla/mozilla-download.cpp b/embed/mozilla/mozilla-download.cpp
index 73a26a40c..bf69e5e43 100644
--- a/embed/mozilla/mozilla-download.cpp
+++ b/embed/mozilla/mozilla-download.cpp
@@ -23,6 +23,7 @@
#include "config.h"
#include "mozilla-download.h"
+#include "MozDownload.h"
#include "ephy-debug.h"
@@ -41,7 +42,7 @@ enum
PROP_MOZDOWNLOAD
};
-struct MozillaDownloadPrivate
+struct _MozillaDownloadPrivate
{
MozDownload *moz_download;
};
diff --git a/embed/mozilla/mozilla-download.h b/embed/mozilla/mozilla-download.h
index d188f8966..a50736f87 100644
--- a/embed/mozilla/mozilla-download.h
+++ b/embed/mozilla/mozilla-download.h
@@ -21,12 +21,9 @@
#ifndef MOZILLA_DOWNLOAD_H
#define MOZILLA_DOWNLOAD_H
-#include "MozDownload.h"
-
#include <glib-object.h>
#include <glib.h>
-
-G_BEGIN_DECLS
+#include "ephy-download.h"
#define MOZILLA_TYPE_DOWNLOAD (mozilla_download_get_type ())
#define MOZILLA_DOWNLOAD(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), MOZILLA_TYPE_DOWNLOAD, MozillaDownload))
@@ -35,17 +32,19 @@ G_BEGIN_DECLS
#define MOZILLA_IS_DOWNLOAD_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), MOZILLA_TYPE_DOWNLOAD))
#define MOZILLA_DOWNLOAD_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), MOZILLA_TYPE_DOWNLOAD, MozillaDownloadClass))
-typedef struct MozillaDownloadClass MozillaDownloadClass;
-typedef struct MozillaDownload MozillaDownload;
-typedef struct MozillaDownloadPrivate MozillaDownloadPrivate;
+typedef struct _MozillaDownloadClass MozillaDownloadClass;
+typedef struct _MozillaDownload MozillaDownload;
+typedef struct _MozillaDownloadPrivate MozillaDownloadPrivate;
-struct MozillaDownload
+class MozDownload;
+
+struct _MozillaDownload
{
EphyDownload parent;
MozillaDownloadPrivate *priv;
};
-struct MozillaDownloadClass
+struct _MozillaDownloadClass
{
EphyDownloadClass parent_class;
};
@@ -54,6 +53,4 @@ GType mozilla_download_get_type (void);
EphyDownload *mozilla_download_new (MozDownload *download);
-G_END_DECLS
-
#endif