Merge remote-tracking branch 'origin/master' into svenw/cocoa

8 files changed, 11 insertions, 10 deletions

diff --git a/frontends/gtk/bitmap.c b/frontends/gtk/bitmap.c
index b42814295..36b614cf9 100644
--- a/frontends/gtk/bitmap.c
+++ b/frontends/gtk/bitmap.c
@@ -18,9 +18,9 @@
 
 /**
  * \file
- * Generic bitmap handling (GDK / GTK+ implementation).
+ * GTK bitmap handling.
  *
- * This implements the interface given by desktop/bitmap.h using GdkPixbufs.
+ * This implements the bitmap interface using cairo image surfaces
  */
 
 #include <assert.h>
diff --git a/frontends/gtk/cookies.c b/frontends/gtk/cookies.c
index dc77e1c4e..500cd07f6 100644
--- a/frontends/gtk/cookies.c
+++ b/frontends/gtk/cookies.c
@@ -246,7 +246,7 @@ static nserror nsgtk_cookies_init(void)
 		return NSERROR_OK;
 	}
 
-	ncwin = malloc(sizeof(struct nsgtk_cookie_window));
+	ncwin = calloc(1, sizeof(*ncwin));
 	if (ncwin == NULL) {
 		return NSERROR_NOMEM;
 	}
diff --git a/frontends/gtk/corewindow.c b/frontends/gtk/corewindow.c
index 9ad644d7f..ddc61c717 100644
--- a/frontends/gtk/corewindow.c
+++ b/frontends/gtk/corewindow.c
@@ -662,7 +662,7 @@ static void
 nsgtk_cw_drag_status(struct core_window *cw, core_window_drag_status ds)
 {
 	struct nsgtk_corewindow *nsgtk_cw = (struct nsgtk_corewindow *)cw;
-	nsgtk_cw->drag_staus = ds;
+	nsgtk_cw->drag_status = ds;
 }
 
 
@@ -682,6 +682,7 @@ static struct core_window_callback_table nsgtk_cw_cb_table = {
 nserror nsgtk_corewindow_init(struct nsgtk_corewindow *nsgtk_cw)
 {
 	nsgtk_cw->cb_table = &nsgtk_cw_cb_table;
+	nsgtk_cw->drag_status = CORE_WINDOW_DRAG_NONE;
 
 	/* input method setup */
 	nsgtk_cw->input_method = gtk_im_multicontext_new();
diff --git a/frontends/gtk/corewindow.h b/frontends/gtk/corewindow.h
index 90bfd6193..6100e67ae 100644
--- a/frontends/gtk/corewindow.h
+++ b/frontends/gtk/corewindow.h
@@ -51,7 +51,7 @@ struct nsgtk_corewindow {
 	/** mouse state */
 	struct nsgtk_corewindow_mouse mouse_state;
 	/** drag status set by core */
-	core_window_drag_status drag_staus;
+	core_window_drag_status drag_status;
 
 	/**
 	 * callback to draw on drawable area of nsgtk core window
diff --git a/frontends/gtk/global_history.c b/frontends/gtk/global_history.c
index 66ba1a666..360eb4e1a 100644
--- a/frontends/gtk/global_history.c
+++ b/frontends/gtk/global_history.c
@@ -299,7 +299,7 @@ static nserror nsgtk_global_history_init(void)
 		return NSERROR_OK;
 	}
 
-	ncwin = malloc(sizeof(struct nsgtk_global_history_window));
+	ncwin = calloc(1, sizeof(*ncwin));
 	if (ncwin == NULL) {
 		return NSERROR_NOMEM;
 	}
diff --git a/frontends/gtk/hotlist.c b/frontends/gtk/hotlist.c
index 34a13772d..936573a0b 100644
--- a/frontends/gtk/hotlist.c
+++ b/frontends/gtk/hotlist.c
@@ -319,7 +319,7 @@ static nserror nsgtk_hotlist_init(void)
 		return NSERROR_OK;
 	}
 
-	ncwin = malloc(sizeof(struct nsgtk_hotlist_window));
+	ncwin = calloc(1, sizeof(*ncwin));
 	if (ncwin == NULL) {
 		return NSERROR_NOMEM;
 	}
diff --git a/frontends/gtk/local_history.c b/frontends/gtk/local_history.c
index 650cb4fb6..cc9580130 100644
--- a/frontends/gtk/local_history.c
+++ b/frontends/gtk/local_history.c
@@ -116,7 +116,7 @@ nsgtk_local_history_draw(struct nsgtk_corewindow *nsgtk_cw, struct rect *r)
 	lhw = (struct nsgtk_local_history_window *)nsgtk_cw;
 
 	ctx.plot->clip(&ctx, r);
-	local_history_redraw(lhw->session, r->x0, r->y0, r, &ctx);
+	local_history_redraw(lhw->session, 0, 0, r, &ctx);
 
 	return NSERROR_OK;
 }
@@ -141,7 +141,7 @@ nsgtk_local_history_init(struct browser_window *bw,
 		return res;
 	}
 
-	ncwin = malloc(sizeof(struct nsgtk_local_history_window));
+	ncwin = calloc(1, sizeof(*ncwin));
 	if (ncwin == NULL) {
 		return NSERROR_NOMEM;
 	}
diff --git a/frontends/gtk/window.c b/frontends/gtk/window.c
index 78a6f6274..de5311e2e 100644
--- a/frontends/gtk/window.c
+++ b/frontends/gtk/window.c
@@ -1048,7 +1048,7 @@ static void gui_window_set_status(struct gui_window *g, const char *text)
  *   content is shown. The GTK implementation scrolls the contents so
  *   the specified point in the content is at the top of the viewport.
  *
- * \param gw gui window to scroll
+ * \param g gui window to scroll
  * \param rect The rectangle to ensure is shown.
  * \return NSERROR_OK on success or apropriate error code.
  */