Remove the info tag from the context so if the source unexpectedly

Thu Dec 17 18:25:52 1998  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkdnd.c (gtk_drag_drop_finished): Remove the
	info tag from the context so if the source unexpectedly
	responds in the future, we do nothing properly.

Thu Dec 17 18:24:41 1998  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate): Handle
	the case where one side of the the pane is empty.

	* gtk/gtkfilesel.c (gtk_file_selection_init): Set
	dir_title before using it. (Pointed out by
	Lavoie Philippe <lavoie@zeus.genie.uottawa.ca>)
This commit is contained in:
Owen Taylor 1998-12-17 23:35:22 +00:00 committed by Owen Taylor
parent 55ce42dad1
commit 1bde7a5599
11 changed files with 74 additions and 6 deletions

View File

@ -1,3 +1,12 @@
Thu Dec 17 18:24:41 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate): Handle
the case where one side of the the pane is empty.
* gtk/gtkfilesel.c (gtk_file_selection_init): Set
dir_title before using it. (Pointed out by
Lavoie Philippe <lavoie@zeus.genie.uottawa.ca>)
Thu Dec 17 10:53:20 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_set_text): Free

View File

@ -1,3 +1,12 @@
Thu Dec 17 18:24:41 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate): Handle
the case where one side of the the pane is empty.
* gtk/gtkfilesel.c (gtk_file_selection_init): Set
dir_title before using it. (Pointed out by
Lavoie Philippe <lavoie@zeus.genie.uottawa.ca>)
Thu Dec 17 10:53:20 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_set_text): Free

View File

@ -1,3 +1,12 @@
Thu Dec 17 18:24:41 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate): Handle
the case where one side of the the pane is empty.
* gtk/gtkfilesel.c (gtk_file_selection_init): Set
dir_title before using it. (Pointed out by
Lavoie Philippe <lavoie@zeus.genie.uottawa.ca>)
Thu Dec 17 10:53:20 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_set_text): Free

View File

@ -1,3 +1,12 @@
Thu Dec 17 18:24:41 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate): Handle
the case where one side of the the pane is empty.
* gtk/gtkfilesel.c (gtk_file_selection_init): Set
dir_title before using it. (Pointed out by
Lavoie Philippe <lavoie@zeus.genie.uottawa.ca>)
Thu Dec 17 10:53:20 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_set_text): Free

View File

@ -1,3 +1,12 @@
Thu Dec 17 18:24:41 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate): Handle
the case where one side of the the pane is empty.
* gtk/gtkfilesel.c (gtk_file_selection_init): Set
dir_title before using it. (Pointed out by
Lavoie Philippe <lavoie@zeus.genie.uottawa.ca>)
Thu Dec 17 10:53:20 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_set_text): Free

View File

@ -1,3 +1,12 @@
Thu Dec 17 18:24:41 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate): Handle
the case where one side of the the pane is empty.
* gtk/gtkfilesel.c (gtk_file_selection_init): Set
dir_title before using it. (Pointed out by
Lavoie Philippe <lavoie@zeus.genie.uottawa.ca>)
Thu Dec 17 10:53:20 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_set_text): Free

View File

@ -1,3 +1,12 @@
Thu Dec 17 18:24:41 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtk[hv]paned.c (gtk_[hv]paned_size_allocate): Handle
the case where one side of the the pane is empty.
* gtk/gtkfilesel.c (gtk_file_selection_init): Set
dir_title before using it. (Pointed out by
Lavoie Philippe <lavoie@zeus.genie.uottawa.ca>)
Thu Dec 17 10:53:20 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_set_text): Free

View File

@ -2028,6 +2028,10 @@ gtk_drag_drop_finished (GtkDragSourceInfo *info,
gdk_window_raise (info->icon_window->window);
}
/* Mark the context as dead, so if the destination decides
* to respond really late, we still are OK.
*/
g_dataset_set_data (info->context, "gtk-info", NULL);
gtk_timeout_add (ANIM_STEP_TIME, gtk_drag_anim_timeout, anim);
}
}

View File

@ -408,6 +408,9 @@ gtk_file_selection_init (GtkFileSelection *filesel)
gtk_widget_show (list_hbox);
/* The directories clist */
dir_title[0] = _("Directories");
dir_title[1] = NULL;
filesel->dir_list = gtk_clist_new_with_titles (1, (gchar**) dir_title);
gtk_widget_set_usize (filesel->dir_list, DIR_LIST_WIDTH, DIR_LIST_HEIGHT);
gtk_signal_connect (GTK_OBJECT (filesel->dir_list), "select_row",
@ -416,8 +419,6 @@ gtk_file_selection_init (GtkFileSelection *filesel)
gtk_clist_column_titles_passive (GTK_CLIST (filesel->dir_list));
scrolled_win = gtk_scrolled_window_new (NULL, NULL);
dir_title[0] = _("Directories");
dir_title[1] = NULL;
gtk_container_add (GTK_CONTAINER (scrolled_win), filesel->dir_list);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);

View File

@ -148,8 +148,8 @@ gtk_hpaned_size_allocate (GtkWidget *widget,
widget->allocation.width
- paned->gutter_size
- 2 * border_width,
paned->child1->requisition.width,
paned->child2->requisition.width);
paned->child1 ? paned->child1->requisition.width : 0,
paned->child2 ? paned->child2->requisition.width : 0);
/* Move the handle before the children so we don't get extra expose events */

View File

@ -148,8 +148,8 @@ gtk_vpaned_size_allocate (GtkWidget *widget,
widget->allocation.height
- paned->gutter_size
- 2 * border_width,
paned->child1->requisition.height,
paned->child2->requisition.height);
paned->child1 ? paned->child1->requisition.height : 0,
paned->child2 ? paned->child2->requisition.height : 0);
/* Move the handle before the children so we don't get extra expose events */