From a87aa71821beadb0c094ad3a013ffa080b969bf6 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sat, 16 Aug 2008 09:25:35 +0000
Subject: Merge commit 'v0.4.3' into upstream

Conflicts:

	components/.gitignore (dropped - confuses git-buildpackage)
---
(limited to 'src')

diff --git a/src/HulahopDirectoryProvider.cpp b/src/HulahopDirectoryProvider.cpp
index fb21d69..6fc438c 100644
--- a/src/HulahopDirectoryProvider.cpp
+++ b/src/HulahopDirectoryProvider.cpp
@@ -51,7 +51,8 @@ HulahopDirectoryProvider::GetFile(const char *aKey,
 {
     nsresult rv;
 
-    if (!strcmp(aKey, NS_APP_USER_PROFILE_50_DIR) && mProfilePath) {
+    if ((!strcmp(aKey, NS_APP_USER_PROFILE_50_DIR) ||
+         !strcmp(aKey, NS_APP_USER_PROFILE_LOCAL_50_DIR)) && mProfilePath) {
         NS_ADDREF(*aResult = mProfilePath);
         return NS_OK;
     }
@@ -67,7 +68,19 @@ HulahopDirectoryProvider::GetFile(const char *aKey,
         NS_ADDREF(*aResult = file);
         return NS_OK;
     }
-    
+
+    if (!strcmp(aKey, NS_XPCOM_XPTI_REGISTRY_FILE) && mProfilePath) {
+        nsCOMPtr<nsIFile> file;
+        rv = mProfilePath->Clone(getter_AddRefs(file));
+        NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE);
+        
+        rv = file->AppendNative(nsCString("xpti.dat"));
+        NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE);
+
+        NS_ADDREF(*aResult = file);
+        return NS_OK;
+    }
+
     if (!strcmp(aKey, NS_APP_PREF_DEFAULTS_50_DIR)) {
         nsCOMPtr<nsILocalFile> dataDir;
         NS_NewNativeLocalFile(nsCString(DATA_DIR),
diff --git a/src/hulahop-web-view.cpp b/src/hulahop-web-view.cpp
index 00705b9..eee333d 100644
--- a/src/hulahop-web-view.cpp
+++ b/src/hulahop-web-view.cpp
@@ -186,6 +186,8 @@ hulahop_web_view_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
 {
     HulahopWebView *web_view = HULAHOP_WEB_VIEW(widget);
 
+    widget->allocation = *allocation;
+
     if (GTK_WIDGET_REALIZED(widget)) {
         gdk_window_move_resize(widget->window,
                                allocation->x, allocation->y,
diff --git a/src/hulahop.cpp b/src/hulahop.cpp
index 8d90c6f..3e3b963 100644
--- a/src/hulahop.cpp
+++ b/src/hulahop.cpp
@@ -56,7 +56,7 @@ hulahop_startup()
     NS_ENSURE_SUCCESS(rv, FALSE);
 
     nsCOMPtr<nsILocalFile> binDir;
-    rv = NS_NewNativeLocalFile(nsCString(LIBXUL_DIR"/components"), PR_TRUE,
+    rv = NS_NewNativeLocalFile(nsCString(LIBXUL_DIR), PR_TRUE,
                                getter_AddRefs(binDir));
     NS_ENSURE_SUCCESS(rv, FALSE);
 
--
cgit v0.9.1