diff options
author | Owen Taylor <otaylor@redhat.com> | 2000-02-01 19:05:18 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2000-02-01 19:05:18 +0000 |
commit | cacec65e9e410527f32b89a97a29c23d213724b2 (patch) | |
tree | a4277821d7480a3d466cd3e72971b867b9e0a416 | |
parent | 50ab749f4bc6378767f2c252b30e128b577c66f8 (diff) | |
download | gdk-pixbuf-cacec65e9e410527f32b89a97a29c23d213724b2.tar.gz |
Add some sanity checks if the widget passed to gtk_drag_get_data() was not
Wed Feb 2 11:58:05 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkdnd.c (gtk_drag_selection_received): Add some sanity
checks if the widget passed to gtk_drag_get_data() was not the
dest widget.
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ChangeLog.pre-2-0 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-2-10 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-2-2 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-2-4 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-2-6 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-2-8 | 6 | ||||
-rw-r--r-- | gtk/gtkdnd.c | 4 | ||||
-rw-r--r-- | gtk/gtkfontsel.c | 9 |
9 files changed, 44 insertions, 11 deletions
@@ -1,3 +1,9 @@ +Wed Feb 2 11:58:05 2000 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkdnd.c (gtk_drag_selection_received): Add some sanity + checks if the widget passed to gtk_drag_get_data() was not the + dest widget. + 2000-01-31 Yuan-Chung Cheng <platin@linux.org.tw> * configure.in: Added "zh_CN.GB2312" to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 317ed087b..9700b9a70 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Wed Feb 2 11:58:05 2000 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkdnd.c (gtk_drag_selection_received): Add some sanity + checks if the widget passed to gtk_drag_get_data() was not the + dest widget. + 2000-01-31 Yuan-Chung Cheng <platin@linux.org.tw> * configure.in: Added "zh_CN.GB2312" to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 317ed087b..9700b9a70 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Wed Feb 2 11:58:05 2000 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkdnd.c (gtk_drag_selection_received): Add some sanity + checks if the widget passed to gtk_drag_get_data() was not the + dest widget. + 2000-01-31 Yuan-Chung Cheng <platin@linux.org.tw> * configure.in: Added "zh_CN.GB2312" to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 317ed087b..9700b9a70 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Wed Feb 2 11:58:05 2000 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkdnd.c (gtk_drag_selection_received): Add some sanity + checks if the widget passed to gtk_drag_get_data() was not the + dest widget. + 2000-01-31 Yuan-Chung Cheng <platin@linux.org.tw> * configure.in: Added "zh_CN.GB2312" to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 317ed087b..9700b9a70 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Wed Feb 2 11:58:05 2000 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkdnd.c (gtk_drag_selection_received): Add some sanity + checks if the widget passed to gtk_drag_get_data() was not the + dest widget. + 2000-01-31 Yuan-Chung Cheng <platin@linux.org.tw> * configure.in: Added "zh_CN.GB2312" to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 317ed087b..9700b9a70 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Wed Feb 2 11:58:05 2000 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkdnd.c (gtk_drag_selection_received): Add some sanity + checks if the widget passed to gtk_drag_get_data() was not the + dest widget. + 2000-01-31 Yuan-Chung Cheng <platin@linux.org.tw> * configure.in: Added "zh_CN.GB2312" to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 317ed087b..9700b9a70 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Wed Feb 2 11:58:05 2000 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkdnd.c (gtk_drag_selection_received): Add some sanity + checks if the widget passed to gtk_drag_get_data() was not the + dest widget. + 2000-01-31 Yuan-Chung Cheng <platin@linux.org.tw> * configure.in: Added "zh_CN.GB2312" to ALL_LINGUAS. diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c index 635834e22..a6fd6e95d 100644 --- a/gtk/gtkdnd.c +++ b/gtk/gtkdnd.c @@ -1141,7 +1141,7 @@ gtk_drag_selection_received (GtkWidget *widget, site = gtk_object_get_data (GTK_OBJECT (drop_widget), "gtk-drag-dest"); - if (site->target_list) + if (site && site->target_list) { guint target_info; @@ -1166,7 +1166,7 @@ gtk_drag_selection_received (GtkWidget *widget, selection_data, 0, time); } - if (site->flags & GTK_DEST_DEFAULT_DROP) + if (site && site->flags & GTK_DEST_DEFAULT_DROP) { gtk_drag_finish (context, diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c index 6e650a5bd..8790c65b7 100644 --- a/gtk/gtkfontsel.c +++ b/gtk/gtkfontsel.c @@ -2922,17 +2922,8 @@ gtk_font_selection_get_fonts (void) fontsel_info->nfonts = 0; for (i = 0; i < num_fonts; i++) { -#ifdef FONTSEL_DEBUG - g_message("%s\n", xfontnames[i]); -#endif if (gtk_font_selection_is_xlfd_font_name (xfontnames[i])) gtk_font_selection_insert_font (fontnames, &fontsel_info->nfonts, xfontnames[i]); - else - { -#ifdef FONTSEL_DEBUG - g_warning("Skipping invalid font: %s", xfontnames[i]); -#endif - } } |