Index: settings-dialog.c
===================================================================
--- settings-dialog.c	(revision 6811)
+++ settings-dialog.c	(working copy)
@@ -215,7 +215,7 @@
                  gpointer data)
 {
   gint id;
-  gint width, height;
+  gint width = 0, height = 0;
 
   id = gtk_combo_box_get_active (combobox);
 
@@ -288,9 +288,9 @@
 cb_background_changed (GtkComboBox *combobox,
                        gpointer data)
 {
-  GtkWidget *dialog;
+  GtkWidget *dialog = NULL;
   GdkColor gdkcolor;
-  gchar *color;
+  gchar *color = NULL;
   gint id;
 
   id = gtk_combo_box_get_active (combobox);
Index: notes.c
===================================================================
--- notes.c	(revision 6811)
+++ notes.c	(working copy)
@@ -176,7 +176,7 @@
   DBG ("New window: %s", window_name);
 
   NotesWindow          *notes_window;
-  GtkWidget            *label, *arrow_menu;
+  GtkWidget            *label;
   GtkRcStyle           *style;
   gchar                *window_name_tmp;
   gchar                *accel_name;
@@ -1129,6 +1129,7 @@
                           GdkEventCrossing *event)
 {
   gdk_window_set_cursor (notes_window->window->window, NULL);
+  return TRUE;
 }
 
 static gboolean