[meego-commits] 8655: Changes to Trunk:Netbook/meego-panel-web

[hmin]

Hi,
I have made the following changes to meego-panel-web in project Trunk:Netbook. Please review and accept ASAP.

Thank You,
hmin

[This message was auto-generated]

---

Request #8655:

  submit:   home:hmin:branches:Trunk:Netbook/meego-panel-web(r4)(cleanup) -> Trunk:Netbook/meego-panel-web


Message:
    Fix BMC#8602 for supporting chrome

State:   new          2010-10-19T23:00:33 hmin
Comment: None



changes files:
--------------
--- meego-panel-web.changes
+++ meego-panel-web.changes
@@ -0,0 +1,3 @@
+* Wed Oct 20 2010 Hongbo Min <hongbo.min at intel.com> - 0.2.0
+- Fix BMC#8602 for supporting chrome browser 
+
@@ -1,0 +5,2 @@
+- Fix BMC#6932, BMC#6898 for displaying snapshot correctly. 
+  Need to co-works with chrome-meego-extension.
@@ -3 +8 @@
-  favorite icon in autocomplete list
+  favorite icon in autocomplete list.

new:
----
  fix-launch-chrome.patch

spec files:
-----------
--- meego-panel-web.spec
+++ meego-panel-web.spec
@@ -16,7 +16,7 @@
 Source1:    meego-panel-web
 Source100:  meego-panel-web.yaml
 Patch0: 	use_default_icon.patch
-
+Patch1:     fix-launch-chrome.patch
 Requires:   mutter-meego
 BuildRequires:  pkgconfig(clutter-x11-1.0)
 BuildRequires:  pkgconfig(gdk-x11-2.0)
@@ -36,6 +36,7 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 # >> setup
 # << setup

other changes:
--------------

++++++ fix-launch-chrome.patch (new)
--- fix-launch-chrome.patch
+++ fix-launch-chrome.patch
+diff --git a/netpanel/meego-netbook-netpanel.cc b/netpanel/meego-netbook-netpanel.cc
+index 7c0c002..d7f634d 100644
+--- a/netpanel/meego-netbook-netpanel.cc
++++ b/netpanel/meego-netbook-netpanel.cc
+@@ -582,8 +582,6 @@ meego_netbook_netpanel_launch_url (MeegoNetbookNetpanel *netpanel,
+     }
+ 
+   std::string browser_exec(priv->browser_name);
+-  if (browser_exec == "chromium")
+-    browser_exec.append("-browser");
+ 
+   exec = g_strdup_printf ("%s %s \"%s%s\"",
+                           browser_exec.c_str(),
+diff --git a/netpanel/meego-panel-web.cc b/netpanel/meego-panel-web.cc
+index 56f589a..42e2459 100644
+--- a/netpanel/meego-panel-web.cc
++++ b/netpanel/meego-panel-web.cc
+@@ -66,6 +66,8 @@ static GOptionEntry entries[] = {
+   {"standalone", 's', 0, G_OPTION_ARG_NONE, &standalone, "Do not embed into the mutter-meego panel", NULL}
+ };
+ 
++#define CHROME_EXE_PATH "/opt/google/chrome/chrome"
++#define CHROMIUM_EXE_PATH "/usr/lib/chromium-browser/chromium-browser"
+ 
+ int
+ main (int    argc,
+@@ -75,9 +77,17 @@ main (int    argc,
+   ClutterActor *stage;
+   MeegoNetbookNetpanel *netpanel;
+   GOptionContext *context;
+-  std::string browser_name = "chromium";
++  std::string browser_name = "chromium-browser";
+   GError *error = NULL;
+ 
++  if (g_file_test(CHROME_EXE_PATH, G_FILE_TEST_EXISTS) == TRUE) {
++    browser_name = "google-chrome";
++  } else if (g_file_test(CHROMIUM_EXE_PATH, G_FILE_TEST_EXISTS) == TRUE) {
++    browser_name = "chromium-browser";
++  } else {
++    g_warning("chromium-based browser is not installed\n");
++  }
++
+   setlocale (LC_ALL, "");
+   bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");