devhelp r1173 - in trunk: . src

[herzi svn gnome org]

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

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

	Use the DhAssistantView's DhLink

	* src/dh-assistant.c: use the link 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:43:00 2008
@@ -35,7 +35,6 @@
         GtkWidget *web_view;
 
         gchar     *current_search;
-        DhLink    *current_link;
 } DhAssistantPriv;
 
 static void dh_assistant_class_init (DhAssistantClass *klass);
@@ -66,10 +65,6 @@
 
         g_free (priv->current_search);
 
-        if (priv->current_link) {
-                dh_link_unref (priv->current_link);
-        }
-
         G_OBJECT_CLASS (dh_assistant_parent_class)->finalize (object);
 }
 
@@ -173,17 +168,12 @@
         const gchar     *start;
         const gchar     *end;
 
-        if (priv->current_link == link) {
+        if (dh_assistant_view_get_link (DH_ASSISTANT_VIEW (priv->web_view)) == link) {
                 return;
         }
 
-        if (link) {
-                dh_link_ref (link);
-        }
-        if (priv->current_link) {
-                dh_link_unref (priv->current_link);
-        }
-        priv->current_link = link;
+        dh_assistant_view_set_link (DH_ASSISTANT_VIEW (priv->web_view),
+                                    link);
 
         if (!link) {
                 webkit_web_view_open (WEBKIT_WEB_VIEW (priv->web_view),