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.
This commit is contained in:
Owen Taylor 2000-02-01 19:05:18 +00:00 committed by Owen Taylor
parent 50ab749f4b
commit cacec65e9e
9 changed files with 44 additions and 11 deletions

View File

@ -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.

View File

@ -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.

View File

@ -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.

View File

@ -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.

View File

@ -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.

View File

@ -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.

View File

@ -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.

View File

@ -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,

View File

@ -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
}
}