[totem] browser-plugin: Turn into a GtkApplication
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem] browser-plugin: Turn into a GtkApplication
- Date: Wed, 28 Mar 2012 15:20:47 +0000 (UTC)
commit 5ee79dfe8ece045cfad19ea3f41a70a800ad5e12
Author: Bastien Nocera <hadess hadess net>
Date: Wed Mar 28 17:03:21 2012 +0200
browser-plugin: Turn into a GtkApplication
browser-plugin/totem-plugin-viewer.c | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/browser-plugin/totem-plugin-viewer.c b/browser-plugin/totem-plugin-viewer.c
index 424e882..93f4e35 100644
--- a/browser-plugin/totem-plugin-viewer.c
+++ b/browser-plugin/totem-plugin-viewer.c
@@ -89,8 +89,6 @@ typedef enum {
#define TOTEM_IS_EMBEDDED_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TOTEM_TYPE_EMBEDDED))
#define TOTEM_EMBEDDED_GET_CLASS(o)(G_TYPE_INSTANCE_GET_CLASS ((o), TOTEM_TYPE_EMBEDDED, TotemEmbeddedClass))
-typedef GObjectClass TotemEmbeddedClass;
-
typedef struct {
char *uri;
char *subtitle;
@@ -99,8 +97,12 @@ typedef struct {
int starttime;
} TotemPlItem;
+typedef struct {
+ GtkApplicationClass parent;
+} TotemEmbeddedClass;
+
typedef struct _TotemEmbedded {
- GObject parent;
+ GtkApplication parent;
DBusGConnection *conn;
GtkWidget *window;
@@ -176,7 +178,7 @@ enum
TOTEM_EMBEDDED_UNKNOWN_COMMAND
};
-G_DEFINE_TYPE (TotemEmbedded, totem_embedded, G_TYPE_OBJECT);
+G_DEFINE_TYPE (TotemEmbedded, totem_embedded, GTK_TYPE_APPLICATION);
static void totem_embedded_init (TotemEmbedded *emb) { }
static gboolean totem_embedded_do_command (TotemEmbedded *emb, const char *command, GError **err);
@@ -2352,7 +2354,10 @@ int main (int argc, char **argv)
gtk_settings = gtk_settings_get_default ();
g_object_set (G_OBJECT (gtk_settings), "gtk-application-prefer-dark-theme", TRUE, NULL);
- emb = g_object_new (TOTEM_TYPE_EMBEDDED, NULL);
+ emb = g_object_new (TOTEM_TYPE_EMBEDDED,
+ "application-id", svcname,
+ "flags", G_APPLICATION_FLAGS_NONE,
+ NULL);
emb->state = TOTEM_STATE_INVALID;
emb->width = -1;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]