aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
authorXan Lopez <xan@igalia.com>2012-08-10 02:07:23 +0800
committerXan Lopez <xan@igalia.com>2012-08-10 02:19:00 +0800
commitd83176ba808aa06b3ef52fa6f500c74d8b3449e0 (patch)
treedaa0e88b23d036bb1434d882f8fc151dd85d0e31 /embed
parent7aaaacd15ca1934ccbcf9d9f343f25460ed00b5d (diff)
downloadgsoc2013-epiphany-d83176ba808aa06b3ef52fa6f500c74d8b3449e0.tar
gsoc2013-epiphany-d83176ba808aa06b3ef52fa6f500c74d8b3449e0.tar.gz
gsoc2013-epiphany-d83176ba808aa06b3ef52fa6f500c74d8b3449e0.tar.bz2
gsoc2013-epiphany-d83176ba808aa06b3ef52fa6f500c74d8b3449e0.tar.lz
gsoc2013-epiphany-d83176ba808aa06b3ef52fa6f500c74d8b3449e0.tar.xz
gsoc2013-epiphany-d83176ba808aa06b3ef52fa6f500c74d8b3449e0.tar.zst
gsoc2013-epiphany-d83176ba808aa06b3ef52fa6f500c74d8b3449e0.zip
ephy-embed-single: style cleanups
Diffstat (limited to 'embed')
-rw-r--r--embed/ephy-embed-single.c34
1 files changed, 16 insertions, 18 deletions
diff --git a/embed/ephy-embed-single.c b/embed/ephy-embed-single.c
index 515f05a72..bd5c55428 100644
--- a/embed/ephy-embed-single.c
+++ b/embed/ephy-embed-single.c
@@ -19,38 +19,39 @@
*/
#include "config.h"
+#include "ephy-embed-single.h"
#define LIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY
#define LIBSOUP_USE_UNSTABLE_REQUEST_API
-#define NSPLUGINWRAPPER_SETUP "/usr/bin/mozilla-plugin-config"
-#include "ephy-embed-single.h"
-#include "ephy-embed-shell.h"
+#include "ephy-about-handler.h"
+#include "ephy-debug.h"
#include "ephy-embed-prefs.h"
+#include "ephy-embed-shell.h"
#include "ephy-embed-type-builtins.h"
-#include "ephy-debug.h"
#include "ephy-file-helpers.h"
-#include "ephy-signal-accumulator.h"
#include "ephy-permission-manager.h"
-#include "ephy-profile-utils.h"
#include "ephy-prefs.h"
-#include "ephy-settings.h"
+#include "ephy-profile-utils.h"
#include "ephy-request-about.h"
-#include "ephy-about-handler.h"
+#include "ephy-settings.h"
+#include "ephy-signal-accumulator.h"
+#include <glib/gi18n.h>
+#include <gnome-keyring.h>
+#include <libsoup/soup-cache.h>
+#include <libsoup/soup-gnome.h>
+#include <libsoup/soup-requester.h>
#ifdef HAVE_WEBKIT2
#include <webkit2/webkit2.h>
#else
#include <webkit/webkit.h>
#endif
-#include <glib/gi18n.h>
-#include <libsoup/soup-gnome.h>
-#include <libsoup/soup-cache.h>
-#include <libsoup/soup-requester.h>
-#include <gnome-keyring.h>
#define EPHY_EMBED_SINGLE_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_EMBED_SINGLE, EphyEmbedSinglePrivate))
+#define NSPLUGINWRAPPER_SETUP "/usr/bin/mozilla-plugin-config"
+
struct _EphyEmbedSinglePrivate {
GHashTable *form_auth_data;
#ifndef HAVE_WEBKIT2
@@ -58,8 +59,6 @@ struct _EphyEmbedSinglePrivate {
#endif
};
-static void ephy_embed_single_init (EphyEmbedSingle *single);
-static void ephy_embed_single_class_init (EphyEmbedSingleClass *klass);
static void ephy_permission_manager_iface_init (EphyPermissionManagerIface *iface);
G_DEFINE_TYPE_WITH_CODE (EphyEmbedSingle, ephy_embed_single, G_TYPE_OBJECT,
@@ -109,11 +108,10 @@ get_attr_cb (GnomeKeyringResult result,
break;
if (attribute[i].type == GNOME_KEYRING_ATTRIBUTE_TYPE_STRING) {
- if (g_str_equal (attribute[i].name, "server")) {
+ if (g_str_equal (attribute[i].name, "server"))
server = g_strdup (attribute[i].value.string);
- } else if (g_str_equal (attribute[i].name, "user")) {
+ else if (g_str_equal (attribute[i].name, "user"))
username = g_strdup (attribute[i].value.string);
- }
}
}