Updating branch refs/heads/jeromeg/webkit-thumbnailer-rebased
to f13862e36abebd924f557a690ecd603e54aa09e3 (commit)
from 50ebf15879fc4bfc405fb047d15eae02ee5a2a86 (commit)
commit f13862e36abebd924f557a690ecd603e54aa09e3
Author: Jannis Pohlmann <jan...@xfce.org>
Date: Thu May 26 16:04:11 2011 +0200
Minor coding style adjustments.
.../webkit-thumbnailer-provider.c | 3 ---
.../webkit-thumbnailer-provider.h | 4 ++--
plugins/webkit-thumbnailer/webkit-thumbnailer.c | 11 ++++++-----
plugins/webkit-thumbnailer/webkit-thumbnailer.h | 4 ++--
4 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/plugins/webkit-thumbnailer/webkit-thumbnailer-provider.c
b/plugins/webkit-thumbnailer/webkit-thumbnailer-provider.c
index 08501c3..ef45234 100644
--- a/plugins/webkit-thumbnailer/webkit-thumbnailer-provider.c
+++ b/plugins/webkit-thumbnailer/webkit-thumbnailer-provider.c
@@ -72,9 +72,6 @@ webkit_thumbnailer_provider_register (TumblerProviderPlugin
*plugin)
static void
webkit_thumbnailer_provider_class_init (WebkitThumbnailerProviderClass *klass)
{
- GObjectClass *gobject_class;
-
- gobject_class = G_OBJECT_CLASS (klass);
}
diff --git a/plugins/webkit-thumbnailer/webkit-thumbnailer-provider.h
b/plugins/webkit-thumbnailer/webkit-thumbnailer-provider.h
index 4ee34d6..bb0f349 100644
--- a/plugins/webkit-thumbnailer/webkit-thumbnailer-provider.h
+++ b/plugins/webkit-thumbnailer/webkit-thumbnailer-provider.h
@@ -24,7 +24,7 @@
#include <glib-object.h>
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
#define TYPE_WEBKIT_THUMBNAILER_PROVIDER
(webkit_thumbnailer_provider_get_type ())
#define WEBKIT_THUMBNAILER_PROVIDER(obj)
(G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_WEBKIT_THUMBNAILER_PROVIDER,
WebkitThumbnailerProvider))
@@ -39,6 +39,6 @@ typedef struct _WebkitThumbnailerProvider
WebkitThumbnailerProvider;
GType webkit_thumbnailer_provider_get_type (void) G_GNUC_CONST;
void webkit_thumbnailer_provider_register (TumblerProviderPlugin *plugin);
-G_END_DECLS;
+G_END_DECLS
#endif /* !__WEBKIT_THUMBNAILER_PROVIDER_H__ */
diff --git a/plugins/webkit-thumbnailer/webkit-thumbnailer.c
b/plugins/webkit-thumbnailer/webkit-thumbnailer.c
index 65bc474..085ad88 100644
--- a/plugins/webkit-thumbnailer/webkit-thumbnailer.c
+++ b/plugins/webkit-thumbnailer/webkit-thumbnailer.c
@@ -34,9 +34,12 @@
#include <webkit-thumbnailer/webkit-thumbnailer.h>
+
+
#define LOAD_TIMEOUT 1000
+
static void webkit_thumbnailer_finalize (GObject *object);
static void webkit_thumbnailer_create (TumblerAbstractThumbnailer
*thumbnailer,
GCancellable
*cancellable,
@@ -148,7 +151,7 @@ webkit_thumbnailer_init (WebkitThumbnailer *thumbnailer)
gtk_container_add (GTK_CONTAINER (thumbnailer->offscreen),
thumbnailer->view);
- gtk_widget_set_size_request (thumbnailer->offscreen, 1024, 600);
+ gtk_widget_set_size_request (thumbnailer->offscreen, 1024, 1024);
gtk_widget_show_all (thumbnailer->offscreen);
}
@@ -249,12 +252,10 @@ webkit_thumbnailer_create (TumblerAbstractThumbnailer
*thumbnailer,
uri = tumbler_file_info_get_uri (info);
/* schedule a timeout to avoid waiting forever */
- timeout_id =
- g_timeout_add_seconds (LOAD_TIMEOUT, cb_load_timeout, NULL);
+ timeout_id = g_timeout_add_seconds (LOAD_TIMEOUT, cb_load_timeout, NULL);
/* load the page in the web view */
- webkit_web_view_load_uri (WEBKIT_WEB_VIEW (webkit_thumbnailer->view),
- uri);
+ webkit_web_view_load_uri (WEBKIT_WEB_VIEW (webkit_thumbnailer->view), uri);
/* wait until the page is loaded */
gtk_main ();
diff --git a/plugins/webkit-thumbnailer/webkit-thumbnailer.h
b/plugins/webkit-thumbnailer/webkit-thumbnailer.h
index e3389f9..040f81c 100644
--- a/plugins/webkit-thumbnailer/webkit-thumbnailer.h
+++ b/plugins/webkit-thumbnailer/webkit-thumbnailer.h
@@ -24,7 +24,7 @@
#include <glib-object.h>
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
#define TYPE_WEBKIT_THUMBNAILER (webkit_thumbnailer_get_type ())
#define WEBKIT_THUMBNAILER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
TYPE_WEBKIT_THUMBNAILER, WebkitThumbnailer))
@@ -39,6 +39,6 @@ typedef struct _WebkitThumbnailer WebkitThumbnailer;
GType webkit_thumbnailer_get_type (void) G_GNUC_CONST;
void webkit_thumbnailer_register (TumblerProviderPlugin *plugin);
-G_END_DECLS;
+G_END_DECLS
#endif /* !__WEBKIT_THUMBNAILER_H__ */
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
