r7130 - in dumbhippo/trunk/client/common: firefox/src hippo

[commits mugshot org]

Author: walters
Date: 2008-01-04 14:11:46 -0600 (Fri, 04 Jan 2008)
New Revision: 7130

Modified:
   dumbhippo/trunk/client/common/firefox/src/hippoControl.cpp
   dumbhippo/trunk/client/common/hippo/hippo-basics.h
   dumbhippo/trunk/client/common/hippo/hippo-canvas-filter-area.c
   dumbhippo/trunk/client/common/hippo/hippo-connection.c
   dumbhippo/trunk/client/common/hippo/hippo-stack-manager.c
Log:
Add missed commit for maemo changes.



Modified: dumbhippo/trunk/client/common/firefox/src/hippoControl.cpp
===================================================================
--- dumbhippo/trunk/client/common/firefox/src/hippoControl.cpp	2008-01-03 23:02:33 UTC (rev 7129)
+++ dumbhippo/trunk/client/common/firefox/src/hippoControl.cpp	2008-01-04 20:11:46 UTC (rev 7130)
@@ -1,5 +1,7 @@
 /* -*- mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 
+#include <config.h>
+
 #ifdef HIPPO_OS_LINUX
 #include <glib.h>
 #include <gtk/gtk.h>
@@ -135,6 +137,8 @@
 {
     window_ = do_GetWeakReference(window);
 
+#ifndef WITH_MAEMO
+
 #ifdef HIPPO_OS_LINUX
     HippoWindowId windowId = 0;
     
@@ -167,8 +171,10 @@
     
     if (controller_ && endpoint_ && windowId)
         controller_->setWindowId(endpoint_, windowId);
-#endif
+#endif /* HIPPO_OS_LINUX */
 
+#endif /* WITH_MAEMO */
+
     return NS_OK;
 }
 

Modified: dumbhippo/trunk/client/common/hippo/hippo-basics.h
===================================================================
--- dumbhippo/trunk/client/common/hippo/hippo-basics.h	2008-01-03 23:02:33 UTC (rev 7129)
+++ dumbhippo/trunk/client/common/hippo/hippo-basics.h	2008-01-04 20:11:46 UTC (rev 7130)
@@ -2,6 +2,7 @@
 #ifndef __HIPPO_BASICS_H__
 #define __HIPPO_BASICS_H__
 
+#include <config.h>
 #include <glib-object.h>
 
 G_BEGIN_DECLS
@@ -69,7 +70,8 @@
     HIPPO_BROWSER_IE,
     HIPPO_BROWSER_FIREFOX,
     HIPPO_BROWSER_EPIPHANY,
-    HIPPO_BROWSER_GALEON
+    HIPPO_BROWSER_GALEON,
+    HIPPO_BROWSER_MAEMO
 } HippoBrowserKind;
 
 typedef enum {

Modified: dumbhippo/trunk/client/common/hippo/hippo-canvas-filter-area.c
===================================================================
--- dumbhippo/trunk/client/common/hippo/hippo-canvas-filter-area.c	2008-01-03 23:02:33 UTC (rev 7129)
+++ dumbhippo/trunk/client/common/hippo/hippo-canvas-filter-area.c	2008-01-04 20:11:46 UTC (rev 7130)
@@ -202,6 +202,9 @@
     
     item = g_object_new(HIPPO_TYPE_CANVAS_TEXT,
                         "text", "Hide feeds: ",
+#ifdef WITH_MAEMO
+                        "font", "14px",
+#endif
                         "padding-left", 4,
                         "xalign", HIPPO_ALIGNMENT_START,
                         NULL);
@@ -219,6 +222,9 @@
     
     item = g_object_new(HIPPO_TYPE_CANVAS_TEXT,
                         "text", "Hide my items: ",
+#ifdef WITH_MAEMO
+                        "font", "14px",
+#endif
                         "padding-left", 40,
                         "xalign", HIPPO_ALIGNMENT_START,
                         NULL);

Modified: dumbhippo/trunk/client/common/hippo/hippo-connection.c
===================================================================
--- dumbhippo/trunk/client/common/hippo/hippo-connection.c	2008-01-03 23:02:33 UTC (rev 7129)
+++ dumbhippo/trunk/client/common/hippo/hippo-connection.c	2008-01-04 20:11:46 UTC (rev 7130)
@@ -1,4 +1,5 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+#include <config.h>
 #include "hippo-common-internal.h"
 #include "hippo-connection.h"
 #include "hippo-data-cache-internal.h"
@@ -316,8 +317,14 @@
 #ifdef G_OS_WIN32
     connection->login_browser = HIPPO_BROWSER_IE;
 #else
+
+#ifdef WITH_MAEMO
+    connection->login_browser = HIPPO_BROWSER_MAEMO;
+#else
     connection->login_browser = HIPPO_BROWSER_FIREFOX;
-#endif
+#endif /* WITH_MAEMO */
+
+#endif /* G_OS_WIN32 */
 }
 
 static void

Modified: dumbhippo/trunk/client/common/hippo/hippo-stack-manager.c
===================================================================
--- dumbhippo/trunk/client/common/hippo/hippo-stack-manager.c	2008-01-03 23:02:33 UTC (rev 7129)
+++ dumbhippo/trunk/client/common/hippo/hippo-stack-manager.c	2008-01-04 20:11:46 UTC (rev 7130)
@@ -896,6 +896,10 @@
 
     manager->browser_window = hippo_platform_create_window(platform);
 
+#ifdef WITH_MAEMO
+    g_object_set(manager->browser_window, "role", HIPPO_WINDOW_ROLE_NOTIFICATION, NULL);
+#endif
+
     g_signal_connect(manager->browser_window, "minimize",
                      G_CALLBACK(on_browser_minimize), manager);