aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Escalante Urrelo <diegoe@gnome.org>2007-07-30 14:58:32 +0800
committerDiego Escalante Urrelo <diegoe@src.gnome.org>2007-07-30 14:58:32 +0800
commit50cc83d5972863c9c7b079b6ad8c51049fc5aaa4 (patch)
treecfe1749601b1d065e035d4ebbb19c467dbd16755
parent9b81da4a70431e104dbcf7b40c8f14d61faa5a6c (diff)
downloadgsoc2013-epiphany-50cc83d5972863c9c7b079b6ad8c51049fc5aaa4.tar
gsoc2013-epiphany-50cc83d5972863c9c7b079b6ad8c51049fc5aaa4.tar.gz
gsoc2013-epiphany-50cc83d5972863c9c7b079b6ad8c51049fc5aaa4.tar.bz2
gsoc2013-epiphany-50cc83d5972863c9c7b079b6ad8c51049fc5aaa4.tar.lz
gsoc2013-epiphany-50cc83d5972863c9c7b079b6ad8c51049fc5aaa4.tar.xz
gsoc2013-epiphany-50cc83d5972863c9c7b079b6ad8c51049fc5aaa4.tar.zst
gsoc2013-epiphany-50cc83d5972863c9c7b079b6ad8c51049fc5aaa4.zip
Rename Webkit to WebKit. Used sed -i 's/Webkit/WebKit/'. Fixes bug
2007-07-30 Diego Escalante Urrelo <diegoe@gnome.org> * embed/webkit/webkit-embed-single.cpp: * embed/webkit/webkit-embed.cpp: * embed/webkit/webkit-embed-find.h: * embed/webkit/webkit-embed-single.h: * embed/webkit/webkit-embed.h: * embed/webkit/webkit-embed-persist.cpp: * embed/webkit/webkit-embed-persist.h: * embed/webkit/webkit-embed-find.cpp: Rename Webkit to WebKit. Used sed -i 's/Webkit/WebKit/'. Fixes bug #461689. svn path=/trunk/; revision=7214
-rw-r--r--ChangeLog14
-rw-r--r--embed/webkit/webkit-embed-find.cpp12
-rw-r--r--embed/webkit/webkit-embed-find.h18
-rw-r--r--embed/webkit/webkit-embed-persist.cpp18
-rw-r--r--embed/webkit/webkit-embed-persist.h20
-rw-r--r--embed/webkit/webkit-embed-single.cpp16
-rw-r--r--embed/webkit/webkit-embed-single.h18
-rw-r--r--embed/webkit/webkit-embed.cpp40
-rw-r--r--embed/webkit/webkit-embed.h18
9 files changed, 94 insertions, 80 deletions
diff --git a/ChangeLog b/ChangeLog
index bf30d7b8b..967bc46d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
2007-07-30 Diego Escalante Urrelo <diegoe@gnome.org>
+ * embed/webkit/webkit-embed-single.cpp:
+ * embed/webkit/webkit-embed.cpp:
+ * embed/webkit/webkit-embed-find.h:
+ * embed/webkit/webkit-embed-single.h:
+ * embed/webkit/webkit-embed.h:
+ * embed/webkit/webkit-embed-persist.cpp:
+ * embed/webkit/webkit-embed-persist.h:
+ * embed/webkit/webkit-embed-find.cpp:
+
+ Rename Webkit to WebKit. Used sed -i 's/Webkit/WebKit/'.
+ Fixes bug #461689.
+
+2007-07-30 Diego Escalante Urrelo <diegoe@gnome.org>
+
* lib/ephy-password-dialog.c:
Fix some strict aliasing warnings. Patch by Cosimo Cecchi.
diff --git a/embed/webkit/webkit-embed-find.cpp b/embed/webkit/webkit-embed-find.cpp
index f38b0125e..4a9744d64 100644
--- a/embed/webkit/webkit-embed-find.cpp
+++ b/embed/webkit/webkit-embed-find.cpp
@@ -27,9 +27,9 @@
#include "webkit-embed-find.h"
-#define WEBKIT_EMBED_FIND_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), WEBKIT_TYPE_EMBED_FIND, WebkitEmbedFindPrivate))
+#define WEBKIT_EMBED_FIND_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), WEBKIT_TYPE_EMBED_FIND, WebKitEmbedFindPrivate))
-struct _WebkitEmbedFindPrivate
+struct _WebKitEmbedFindPrivate
{
};
@@ -88,18 +88,18 @@ ephy_find_iface_init (EphyEmbedFindIface *iface)
}
static void
-webkit_embed_find_init (WebkitEmbedFind *find)
+webkit_embed_find_init (WebKitEmbedFind *find)
{
}
static void
-webkit_embed_find_class_init (WebkitEmbedFindClass *klass)
+webkit_embed_find_class_init (WebKitEmbedFindClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- g_type_class_add_private (object_class, sizeof (WebkitEmbedFindPrivate));
+ g_type_class_add_private (object_class, sizeof (WebKitEmbedFindPrivate));
}
-G_DEFINE_TYPE_WITH_CODE (WebkitEmbedFind, webkit_embed_find, G_TYPE_OBJECT,
+G_DEFINE_TYPE_WITH_CODE (WebKitEmbedFind, webkit_embed_find, G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (EPHY_TYPE_EMBED_FIND,
ephy_find_iface_init))
diff --git a/embed/webkit/webkit-embed-find.h b/embed/webkit/webkit-embed-find.h
index 2999890dd..aab646efc 100644
--- a/embed/webkit/webkit-embed-find.h
+++ b/embed/webkit/webkit-embed-find.h
@@ -27,25 +27,25 @@
G_BEGIN_DECLS
#define WEBKIT_TYPE_EMBED_FIND (webkit_embed_find_get_type ())
-#define WEBKIT_EMBED_FIND(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), WEBKIT_TYPE_EMBED_FIND, WebkitEmbedFind))
-#define WEBKIT_EMBED_FIND_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), WEBKIT_TYPE_EMBED_FIND, WebkitEmbedFindClass))
+#define WEBKIT_EMBED_FIND(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), WEBKIT_TYPE_EMBED_FIND, WebKitEmbedFind))
+#define WEBKIT_EMBED_FIND_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), WEBKIT_TYPE_EMBED_FIND, WebKitEmbedFindClass))
#define WEBKIT_IS_EMBED_FIND(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), WEBKIT_TYPE_EMBED_FIND))
#define WEBKIT_IS_EMBED_FIND_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), WEBKIT_TYPE_EMBED_FIND))
-#define WEBKIT_EMBED_FIND_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), WEBKIT_TYPE_EMBED_FIND, WebkitEmbedFindClass))
+#define WEBKIT_EMBED_FIND_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), WEBKIT_TYPE_EMBED_FIND, WebKitEmbedFindClass))
-typedef struct _WebkitEmbedFindClass WebkitEmbedFindClass;
-typedef struct _WebkitEmbedFind WebkitEmbedFind;
-typedef struct _WebkitEmbedFindPrivate WebkitEmbedFindPrivate;
+typedef struct _WebKitEmbedFindClass WebKitEmbedFindClass;
+typedef struct _WebKitEmbedFind WebKitEmbedFind;
+typedef struct _WebKitEmbedFindPrivate WebKitEmbedFindPrivate;
-struct _WebkitEmbedFind
+struct _WebKitEmbedFind
{
GObject parent_instance;
/*< private >*/
- WebkitEmbedFindPrivate *priv;
+ WebKitEmbedFindPrivate *priv;
};
-struct _WebkitEmbedFindClass
+struct _WebKitEmbedFindClass
{
GObjectClass parent_class;
};
diff --git a/embed/webkit/webkit-embed-persist.cpp b/embed/webkit/webkit-embed-persist.cpp
index 98093f5a0..1e05ee1f6 100644
--- a/embed/webkit/webkit-embed-persist.cpp
+++ b/embed/webkit/webkit-embed-persist.cpp
@@ -21,18 +21,18 @@
#include "webkit-embed-persist.h"
static void
-webkit_embed_persist_class_init (WebkitEmbedPersistClass *klass);
+webkit_embed_persist_class_init (WebKitEmbedPersistClass *klass);
static void
-webkit_embed_persist_init (WebkitEmbedPersist *ges);
+webkit_embed_persist_init (WebKitEmbedPersist *ges);
static void
webkit_embed_persist_finalize (GObject *object);
-#define WEBKIT_EMBED_PERSIST_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), WEBKIT_TYPE_EMBED_PERSIST, WebkitEmbedPersistPrivate))
+#define WEBKIT_EMBED_PERSIST_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), WEBKIT_TYPE_EMBED_PERSIST, WebKitEmbedPersistPrivate))
-G_DEFINE_TYPE (WebkitEmbedPersist, webkit_embed_persist, EPHY_TYPE_EMBED_PERSIST)
+G_DEFINE_TYPE (WebKitEmbedPersist, webkit_embed_persist, EPHY_TYPE_EMBED_PERSIST)
static void
-webkit_embed_persist_init (WebkitEmbedPersist *persist)
+webkit_embed_persist_init (WebKitEmbedPersist *persist)
{
}
@@ -43,14 +43,14 @@ webkit_embed_persist_finalize (GObject *object)
}
void
-webkit_embed_persist_completed (WebkitEmbedPersist *persist)
+webkit_embed_persist_completed (WebKitEmbedPersist *persist)
{
g_signal_emit_by_name (persist, "completed");
g_object_unref (persist);
}
void
-webkit_embed_persist_cancelled (WebkitEmbedPersist *persist)
+webkit_embed_persist_cancelled (WebKitEmbedPersist *persist)
{
g_signal_emit_by_name (persist, "cancelled");
g_object_unref (persist);
@@ -74,7 +74,7 @@ impl_to_string (EphyEmbedPersist *persist)
}
static void
-webkit_embed_persist_class_init (WebkitEmbedPersistClass *klass)
+webkit_embed_persist_class_init (WebKitEmbedPersistClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
EphyEmbedPersistClass *persist_class = EPHY_EMBED_PERSIST_CLASS (klass);
@@ -85,5 +85,5 @@ webkit_embed_persist_class_init (WebkitEmbedPersistClass *klass)
persist_class->cancel = impl_cancel;
persist_class->to_string = impl_to_string;
- // g_type_class_add_private (object_class, sizeof(WebkitEmbedPersistPrivate));
+ // g_type_class_add_private (object_class, sizeof(WebKitEmbedPersistPrivate));
}
diff --git a/embed/webkit/webkit-embed-persist.h b/embed/webkit/webkit-embed-persist.h
index b1728fb1d..e4843874a 100644
--- a/embed/webkit/webkit-embed-persist.h
+++ b/embed/webkit/webkit-embed-persist.h
@@ -29,31 +29,31 @@
G_BEGIN_DECLS
#define WEBKIT_TYPE_EMBED_PERSIST (webkit_embed_persist_get_type ())
-#define WEBKIT_EMBED_PERSIST(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), WEBKIT_TYPE_EMBED_PERSIST, WebkitEmbedPersist))
-#define WEBKIT_EMBED_PERSIST_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), WEBKIT_TYPE_EMBED_PERSIST, WebkitEmbedPersistClass))
+#define WEBKIT_EMBED_PERSIST(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), WEBKIT_TYPE_EMBED_PERSIST, WebKitEmbedPersist))
+#define WEBKIT_EMBED_PERSIST_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), WEBKIT_TYPE_EMBED_PERSIST, WebKitEmbedPersistClass))
#define WEBKIT_IS_EMBED_PERSIST(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), WEBKIT_TYPE_EMBED_PERSIST))
#define WEBKIT_IS_EMBED_PERSIST_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), WEBKIT_TYPE_EMBED_PERSIST))
-#define WEBKIT_EMBED_PERSIST_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), WEBKIT_TYPE_EMBED_PERSIST, WebkitEmbedPersistClass))
+#define WEBKIT_EMBED_PERSIST_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), WEBKIT_TYPE_EMBED_PERSIST, WebKitEmbedPersistClass))
-typedef struct WebkitEmbedPersistClass WebkitEmbedPersistClass;
-typedef struct WebkitEmbedPersist WebkitEmbedPersist;
-typedef struct WebkitEmbedPersistPrivate WebkitEmbedPersistPrivate;
+typedef struct WebKitEmbedPersistClass WebKitEmbedPersistClass;
+typedef struct WebKitEmbedPersist WebKitEmbedPersist;
+typedef struct WebKitEmbedPersistPrivate WebKitEmbedPersistPrivate;
-struct WebkitEmbedPersist
+struct WebKitEmbedPersist
{
EphyEmbedPersist parent;
};
-struct WebkitEmbedPersistClass
+struct WebKitEmbedPersistClass
{
EphyEmbedPersistClass parent_class;
};
GType webkit_embed_persist_get_type (void);
-void webkit_embed_persist_completed (WebkitEmbedPersist *persist);
+void webkit_embed_persist_completed (WebKitEmbedPersist *persist);
-void webkit_embed_persist_cancelled (WebkitEmbedPersist *persist);
+void webkit_embed_persist_cancelled (WebKitEmbedPersist *persist);
G_END_DECLS
diff --git a/embed/webkit/webkit-embed-single.cpp b/embed/webkit/webkit-embed-single.cpp
index 12491776a..476aecc11 100644
--- a/embed/webkit/webkit-embed-single.cpp
+++ b/embed/webkit/webkit-embed-single.cpp
@@ -32,9 +32,9 @@
#include "ephy-certificate-manager.h"
#endif
-#define WEBKIT_EMBED_SINGLE_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), WEBKIT_TYPE_EMBED_SINGLE, WebkitEmbedSinglePrivate))
+#define WEBKIT_EMBED_SINGLE_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), WEBKIT_TYPE_EMBED_SINGLE, WebKitEmbedSinglePrivate))
-struct WebkitEmbedSinglePrivate
+struct WebKitEmbedSinglePrivate
{
guint online : 1;
};
@@ -45,8 +45,8 @@ enum
PROP_NETWORK_STATUS
};
-static void webkit_embed_single_class_init (WebkitEmbedSingleClass *klass);
-static void webkit_embed_single_init (WebkitEmbedSingle *ges);
+static void webkit_embed_single_class_init (WebKitEmbedSingleClass *klass);
+static void webkit_embed_single_init (WebKitEmbedSingle *ges);
static void ephy_embed_single_iface_init (EphyEmbedSingleIface *iface);
static void ephy_cookie_manager_iface_init (EphyCookieManagerIface *iface);
static void ephy_password_manager_iface_init (EphyPasswordManagerIface *iface);
@@ -57,7 +57,7 @@ static void ephy_certificate_manager_iface_init (EphyCertificateManagerIface *if
#endif
-G_DEFINE_TYPE_WITH_CODE (WebkitEmbedSingle, webkit_embed_single, G_TYPE_OBJECT,
+G_DEFINE_TYPE_WITH_CODE (WebKitEmbedSingle, webkit_embed_single, G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (EPHY_TYPE_EMBED_SINGLE,
ephy_embed_single_iface_init)
G_IMPLEMENT_INTERFACE (EPHY_TYPE_COOKIE_MANAGER,
@@ -73,7 +73,7 @@ G_DEFINE_TYPE_WITH_CODE (WebkitEmbedSingle, webkit_embed_single, G_TYPE_OBJECT,
static void
-webkit_embed_single_init (WebkitEmbedSingle *mes)
+webkit_embed_single_init (WebKitEmbedSingle *mes)
{
mes->priv = WEBKIT_EMBED_SINGLE_GET_PRIVATE (mes);
}
@@ -274,7 +274,7 @@ webkit_embed_single_set_property (GObject *object,
}
}
static void
-webkit_embed_single_class_init (WebkitEmbedSingleClass *klass)
+webkit_embed_single_class_init (WebKitEmbedSingleClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
@@ -287,7 +287,7 @@ webkit_embed_single_class_init (WebkitEmbedSingleClass *klass)
g_object_class_override_property (object_class, PROP_NETWORK_STATUS, "network-status");
- g_type_class_add_private (object_class, sizeof (WebkitEmbedSinglePrivate));
+ g_type_class_add_private (object_class, sizeof (WebKitEmbedSinglePrivate));
}
static void
diff --git a/embed/webkit/webkit-embed-single.h b/embed/webkit/webkit-embed-single.h
index 5dcaf2444..e015e4110 100644
--- a/embed/webkit/webkit-embed-single.h
+++ b/embed/webkit/webkit-embed-single.h
@@ -27,25 +27,25 @@
G_BEGIN_DECLS
#define WEBKIT_TYPE_EMBED_SINGLE (webkit_embed_single_get_type ())
-#define WEBKIT_EMBED_SINGLE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), WEBKIT_TYPE_EMBED_SINGLE, WebkitEmbedSingle))
-#define WEBKIT_EMBED_SINGLE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), WEBKIT_TYPE_EMBED_SINGLE, WebkitEmbedSingleClass))
+#define WEBKIT_EMBED_SINGLE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), WEBKIT_TYPE_EMBED_SINGLE, WebKitEmbedSingle))
+#define WEBKIT_EMBED_SINGLE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), WEBKIT_TYPE_EMBED_SINGLE, WebKitEmbedSingleClass))
#define WEBKIT_IS_EMBED_SINGLE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), WEBKIT_TYPE_EMBED_SINGLE))
#define WEBKIT_IS_EMBED_SINGLE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), WEBKIT_TYPE_EMBED_SINGLE))
-#define WEBKIT_EMBED_SINGLE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), WEBKIT_TYPE_EMBED_SINGLE, WebkitEmbedSingleClass))
+#define WEBKIT_EMBED_SINGLE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), WEBKIT_TYPE_EMBED_SINGLE, WebKitEmbedSingleClass))
-typedef struct WebkitEmbedSingle WebkitEmbedSingle;
-typedef struct WebkitEmbedSingleClass WebkitEmbedSingleClass;
-typedef struct WebkitEmbedSinglePrivate WebkitEmbedSinglePrivate;
+typedef struct WebKitEmbedSingle WebKitEmbedSingle;
+typedef struct WebKitEmbedSingleClass WebKitEmbedSingleClass;
+typedef struct WebKitEmbedSinglePrivate WebKitEmbedSinglePrivate;
-struct WebkitEmbedSingle
+struct WebKitEmbedSingle
{
GObject parent;
/*< private >*/
- WebkitEmbedSinglePrivate *priv;
+ WebKitEmbedSinglePrivate *priv;
};
-struct WebkitEmbedSingleClass
+struct WebKitEmbedSingleClass
{
GObjectClass parent_class;
};
diff --git a/embed/webkit/webkit-embed.cpp b/embed/webkit/webkit-embed.cpp
index 4f781f25d..6901c0a05 100644
--- a/embed/webkit/webkit-embed.cpp
+++ b/embed/webkit/webkit-embed.cpp
@@ -34,37 +34,37 @@
#include "webkit-embed.h"
#include "ephy-embed.h"
-static void webkit_embed_class_init (WebkitEmbedClass *klass);
-static void webkit_embed_init (WebkitEmbed *gs);
+static void webkit_embed_class_init (WebKitEmbedClass *klass);
+static void webkit_embed_init (WebKitEmbed *gs);
static void webkit_embed_destroy (GtkObject *object);
static void webkit_embed_finalize (GObject *object);
static void ephy_embed_iface_init (EphyEmbedIface *iface);
#if 0
static void webkit_embed_location_changed_cb (GtkMozEmbed *embed,
- WebkitEmbed *membed);
+ WebKitEmbed *membed);
static void webkit_embed_net_state_all_cb (GtkMozEmbed *embed,
const char *aURI,
gint state,
guint status,
- WebkitEmbed *membed);
+ WebKitEmbed *membed);
static gboolean webkit_embed_dom_mouse_click_cb(GtkMozEmbed *embed,
gpointer dom_event,
- WebkitEmbed *membed);
+ WebKitEmbed *membed);
static gboolean webkit_embed_dom_mouse_down_cb (GtkMozEmbed *embed,
- WebkitEmbed *membed);
+ WebKitEmbed *membed);
static gboolean webkit_embed_dom_key_press_cb (GtkMozEmbed *embed,
gpointer dom_event,
- WebkitEmbed *membed);
+ WebKitEmbed *membed);
static void webkit_embed_new_window_cb (GtkMozEmbed *embed,
GtkMozEmbed **newEmbed,
guint chrome_mask,
- WebkitEmbed *membed);
+ WebKitEmbed *membed);
#endif
-#define WEBKIT_EMBED_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), WEBKIT_TYPE_EMBED, WebkitEmbedPrivate))
+#define WEBKIT_EMBED_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), WEBKIT_TYPE_EMBED, WebKitEmbedPrivate))
typedef enum
{
@@ -72,12 +72,12 @@ typedef enum
WEBKIT_EMBED_LOAD_REDIRECTING,
WEBKIT_EMBED_LOAD_LOADING,
WEBKIT_EMBED_LOAD_STOPPED
- } WebkitEmbedLoadState;
+ } WebKitEmbedLoadState;
-struct WebkitEmbedPrivate
+struct WebKitEmbedPrivate
{
WebKitGtkPage *page;
- WebkitEmbedLoadState load_state;
+ WebKitEmbedLoadState load_state;
};
static void
@@ -99,7 +99,7 @@ ephy_command_manager_iface_init (EphyCommandManagerIface *iface)
iface->can_do_command = impl_manager_can_do_command;
}
-G_DEFINE_TYPE_WITH_CODE (WebkitEmbed, webkit_embed, GTK_TYPE_SCROLLED_WINDOW,
+G_DEFINE_TYPE_WITH_CODE (WebKitEmbed, webkit_embed, GTK_TYPE_SCROLLED_WINDOW,
G_IMPLEMENT_INTERFACE (EPHY_TYPE_EMBED,
ephy_embed_iface_init)
G_IMPLEMENT_INTERFACE (EPHY_TYPE_COMMAND_MANAGER,
@@ -116,7 +116,7 @@ impl_close (EphyEmbed *embed)
}
static void
-webkit_embed_class_init (WebkitEmbedClass *klass)
+webkit_embed_class_init (WebKitEmbedClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtkObjectClass *gtk_object_class = GTK_OBJECT_CLASS (klass);
@@ -130,11 +130,11 @@ webkit_embed_class_init (WebkitEmbedClass *klass)
widget_class->grab_focus = webkit_embed_grab_focus;
- g_type_class_add_private (object_class, sizeof(WebkitEmbedPrivate));
+ g_type_class_add_private (object_class, sizeof(WebKitEmbedPrivate));
}
static void
-webkit_embed_init (WebkitEmbed *embed)
+webkit_embed_init (WebKitEmbed *embed)
{
WebKitGtkPage *page;
@@ -175,7 +175,7 @@ static void
impl_load_url (EphyEmbed *embed,
const char *url)
{
- WebkitEmbed *wembed = WEBKIT_EMBED (embed);
+ WebKitEmbed *wembed = WEBKIT_EMBED (embed);
g_debug ("a url %s", url);
@@ -190,7 +190,7 @@ impl_load (EphyEmbed *embed,
EphyEmbedLoadFlags flags,
EphyEmbed *preview_embed)
{
- WebkitEmbed *wembed = WEBKIT_EMBED (embed);
+ WebKitEmbed *wembed = WEBKIT_EMBED (embed);
g_debug ("url %s", url);
webkit_gtk_page_open (wembed->priv->page, url);
@@ -225,7 +225,7 @@ impl_get_go_up_list (EphyEmbed *embed)
static void
impl_go_back (EphyEmbed *embed)
{
- WebkitEmbed *wembed = WEBKIT_EMBED (embed);
+ WebKitEmbed *wembed = WEBKIT_EMBED (embed);
webkit_gtk_page_go_backward (wembed->priv->page);
}
@@ -233,7 +233,7 @@ impl_go_back (EphyEmbed *embed)
static void
impl_go_forward (EphyEmbed *embed)
{
- WebkitEmbed *wembed = WEBKIT_EMBED (embed);
+ WebKitEmbed *wembed = WEBKIT_EMBED (embed);
webkit_gtk_page_go_forward (wembed->priv->page);
}
diff --git a/embed/webkit/webkit-embed.h b/embed/webkit/webkit-embed.h
index ee25bf444..c6f70687b 100644
--- a/embed/webkit/webkit-embed.h
+++ b/embed/webkit/webkit-embed.h
@@ -29,25 +29,25 @@
G_BEGIN_DECLS
#define WEBKIT_TYPE_EMBED (webkit_embed_get_type ())
-#define WEBKIT_EMBED(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), WEBKIT_TYPE_EMBED, WebkitEmbed))
-#define WEBKIT_EMBED_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), WEBKIT_TYPE_EMBED, WebkitEmbedClass))
+#define WEBKIT_EMBED(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), WEBKIT_TYPE_EMBED, WebKitEmbed))
+#define WEBKIT_EMBED_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), WEBKIT_TYPE_EMBED, WebKitEmbedClass))
#define WEBKIT_IS_EMBED(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), WEBKIT_TYPE_EMBED))
#define WEBKIT_IS_EMBED_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), WEBKIT_TYPE_EMBED))
-#define WEBKIT_EMBED_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), WEBKIT_TYPE_EMBED, WebkitEmbedClass))
+#define WEBKIT_EMBED_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), WEBKIT_TYPE_EMBED, WebKitEmbedClass))
-typedef struct WebkitEmbedClass WebkitEmbedClass;
-typedef struct WebkitEmbed WebkitEmbed;
-typedef struct WebkitEmbedPrivate WebkitEmbedPrivate;
+typedef struct WebKitEmbedClass WebKitEmbedClass;
+typedef struct WebKitEmbed WebKitEmbed;
+typedef struct WebKitEmbedPrivate WebKitEmbedPrivate;
-struct WebkitEmbed
+struct WebKitEmbed
{
GtkScrolledWindow parent;
/*< private >*/
- WebkitEmbedPrivate *priv;
+ WebKitEmbedPrivate *priv;
};
-struct WebkitEmbedClass
+struct WebKitEmbedClass
{
GtkScrolledWindowClass parent_class;
};