yelp r3043 - in trunk: . src

[davyd svn gnome org]

Author: davyd
Date: Fri Jan 18 06:04:34 2008
New Revision: 3043
URL: http://svn.gnome.org/viewvc/yelp?rev=3043&view=rev

Log:
2008-01-18  Davyd Madeley  <davyd madeley id au>

        * src/yelp-window.c:
        - fix Ctrl-R reload
        - plug leak of priv->uri
        * src/yelp-document.c:
        - fix YelpDocument->dispose


Modified:
   trunk/ChangeLog
   trunk/src/yelp-document.c
   trunk/src/yelp-window.c

Modified: trunk/src/yelp-document.c
==============================================================================
--- trunk/src/yelp-document.c	(original)
+++ trunk/src/yelp-document.c	Fri Jan 18 06:04:34 2008
@@ -723,7 +723,7 @@
 {
     debug_print (DB_FUNCTION, "entering\n");
     g_free (request->page_id);
-    g_free (request);
+    g_slice_free (Request, request);
 }
 
 /******************************************************************************/

Modified: trunk/src/yelp-window.c
==============================================================================
--- trunk/src/yelp-window.c	(original)
+++ trunk/src/yelp-window.c	Fri Jan 18 06:04:34 2008
@@ -942,7 +942,8 @@
     window_set_loading (window);
 
     priv->current_type = type;
-    priv->uri = loading_uri;
+    g_free (priv->uri);
+    priv->uri = g_strdup (loading_uri);
     priv->current_frag = g_strdup (frag);
     priv->req_uri = g_strdup (req_uri);
     
@@ -1793,6 +1794,7 @@
 			       FALSE);
 
     }
+    g_free (window->priv->uri);
     window->priv->uri = g_strdup (uri);
     gtk_menu_popup (GTK_MENU (window->priv->popup),
 		    NULL, NULL, NULL, NULL, 3, gtk_get_current_event_time());
@@ -2208,7 +2210,9 @@
 	if (window->priv->current_request > -1) {
 	    yelp_document_cancel_page (window->priv->current_document, window->priv->current_request);
 	}
-	/*g_object_unref (window->priv->current_document);*/
+	g_free (window->priv->uri);
+	window->priv->uri = NULL;
+	g_object_unref (window->priv->current_document);
 	window->priv->current_document = NULL;
 	yelp_window_load (window, window->priv->req_uri);
     }