devhelp r1168 - in trunk: . src

[herzi svn gnome org]

Author: herzi
Date: Thu Oct  9 17:42:47 2008
New Revision: 1168
URL: http://svn.gnome.org/viewvc/devhelp?rev=1168&view=rev

Log:
2008-10-07  Sven Herzberg  <sven imendio com>

	Use the DhAssistantView's DhBase

	* src/dh-assistant.c: drop the own DhBase reference; use the one from
	the DhAssistantView


Modified:
   trunk/ChangeLog
   trunk/src/dh-assistant.c

Modified: trunk/src/dh-assistant.c
==============================================================================
--- trunk/src/dh-assistant.c	(original)
+++ trunk/src/dh-assistant.c	Thu Oct  9 17:42:47 2008
@@ -31,8 +31,6 @@
 #include "dh-assistant-view.h"
 
 typedef struct {
-        DhBase    *base;
-
         GtkWidget *main_box;
         GtkWidget *web_view;
 
@@ -68,7 +66,7 @@
         if (g_str_has_prefix (uri, "file://")) {
                 GtkWidget *window;
 
-                window = dh_base_get_window (priv->base);
+                window = dh_base_get_window (dh_assistant_view_get_base (DH_ASSISTANT_VIEW (priv->web_view)));
                 _dh_window_display_uri (DH_WINDOW (window), uri);
         }
 
@@ -106,8 +104,6 @@
 {
         DhAssistantPriv *priv = GET_PRIVATE (object);
 
-        g_object_unref (priv->base);
-
         g_free (priv->current_search);
 
         if (priv->current_link) {
@@ -178,7 +174,6 @@
 
         priv = GET_PRIVATE (assistant);
 
-        priv->base = g_object_ref (base);
         dh_assistant_view_set_base (DH_ASSISTANT_VIEW (priv->web_view),
                                     base);
 
@@ -417,7 +412,7 @@
         g_free (priv->current_search);
         priv->current_search = g_strdup (str);
 
-        keywords = dh_base_get_keywords (priv->base);
+        keywords = dh_base_get_keywords (dh_assistant_view_get_base (DH_ASSISTANT_VIEW (priv->web_view)));
 
         prefix_link = NULL;
         exact_link = NULL;