[meego-commits] 8919: 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 #8919:

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


Message:
    Fix BMC#8602 and sync with netbook 1.1

State:   new          2010-10-27T01:52:31 hmin
Comment: None



changes files:
--------------
--- meego-panel-web.changes
+++ meego-panel-web.changes
@@ -0,0 +1,12 @@
+* Wed Oct 20 2010 Hongbo Min <hongbo.min at intel.com> - 0.2.0
+- Previous changlog for fixing BMC#6932 is wrong, please ignore it.
+  It acutally fixed BMC#8679.
+- BMC#6932 is a known issue caused by the limitation of chromium 
+  extension API.
+
+* Tue Oct 19 2010 Ningxin Hu <ningxin.hu at intel.com> - 0.2.0
+- Fix BMC#8602 cannot support google-chrome
+
+* Mon Oct 18 2010 Hongbo Min <hongbo.min at intel.com> - 0.2.0
+- Fix BMC#6932 for blank snapshot in favorite pages
+
@@ -1,0 +14,2 @@
+- Fix BMC#6932, BMC#6868 for displaying snapshot correctly. 
+  Need to co-works with chrome-meego-extension.
@@ -3 +17 @@
-  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,6 +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)
@@ -36,6 +37,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");

++++++ meego-panel-web-0.2.0.tar.gz
--- netpanel/meego-netbook-netpanel.cc
+++ netpanel/meego-netbook-netpanel.cc
@@ -1313,13 +1313,29 @@
     {
       do
         {
-          if (priv->n_favs < NR_FAVORITE)
-              favs_received (self,
-                      (gchar*) sqlite3_column_text (fav_stmt, 0),  // url
-                      (gchar*) sqlite3_column_text (fav_stmt, 1),  // title
-                      priority++); 
-        }
-      while (sqlite3_step (fav_stmt) == SQLITE_ROW);
+			if (priv->n_favs < NR_FAVORITE)
+			{
+				/*XXX: Duplicated computing */
+				gchar* url = (gchar*)sqlite3_column_text(fav_stmt, 0);
+				gchar *csum = g_compute_checksum_for_string (G_CHECKSUM_MD5, url, -1);  
+				gchar *thumbnail_filename = g_strconcat (csum, ".png", NULL);
+				gchar *path = g_build_filename (g_get_home_dir (),  
+						NETPANEL_DIR,
+						"thumbnails",  
+						thumbnail_filename,  
+						NULL);  
+				
+				if(g_file_test(path, G_FILE_TEST_EXISTS))
+					favs_received (self,
+							(gchar*) sqlite3_column_text (fav_stmt, 0),  // url
+							(gchar*) sqlite3_column_text (fav_stmt, 1),  // title
+							priority++); 
+				g_free(csum);
+				g_free(thumbnail_filename);
+				g_free(path);
+			}
+		}
+	  while (sqlite3_step (fav_stmt) == SQLITE_ROW);
     }
   else
     {