From: mderezynski <mderezynski@users.sourceforge.net>
Date: Mon, 22 May 2006 08:57:39 +0000 (+0000)
Subject: * Make sure we don't read on NULL pointer instead of gobject instance in text-edit... 
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4207beea18a70182d1edd44dac8d3baf8c88eae2;p=inkscape.git

* Make sure we don't read on NULL pointer instead of gobject instance in text-edit.cpp:*_set_insensitive()
---

diff --git a/src/dialogs/text-edit.cpp b/src/dialogs/text-edit.cpp
index 97f872891..30e7f7a0e 100644
--- a/src/dialogs/text-edit.cpp
+++ b/src/dialogs/text-edit.cpp
@@ -804,6 +804,7 @@ sp_text_edit_dialog_text_changed (GtkTextBuffer *tb, GtkWidget *dlg)
 void
 sp_text_edit_dialog_default_set_insensitive ()
 {
+    if (!dlg) return;
     gpointer data = g_object_get_data (G_OBJECT (dlg), "default");
     if (!data) return;
     gtk_widget_set_sensitive (GTK_WIDGET (data), FALSE);
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 98ea859a8..f8f2f611d 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -2967,6 +2967,9 @@ namespace {
         GtkTreeIter   iter;
         char         *family;
 
+        gdk_pointer_ungrab (GDK_CURRENT_TIME);
+        gdk_keyboard_ungrab (GDK_CURRENT_TIME);
+
         gtk_tree_selection_get_selected (selection, &model, &iter);
         gtk_tree_model_get (model, &iter, 0, &family, -1);
 
@@ -3209,6 +3212,7 @@ namespace {
             gtk_window_move (GTK_WINDOW (popdown), x, y + widget->allocation.height + 2); //2px of grace space 
             gtk_widget_show_all (popdown);
 
+#if 0
             gdk_pointer_grab (widget->window, TRUE,
                          GdkEventMask (GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
                          GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
@@ -3216,6 +3220,7 @@ namespace {
                          NULL, NULL, GDK_CURRENT_TIME);
 
             gdk_keyboard_grab (widget->window, TRUE, GDK_CURRENT_TIME);
+#endif
 
             visible = true;
         }