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>)

diff --git a/ChangeLog b/ChangeLog
index 6261220e9ca90be131ec8faf7864b7b31d83140c..b03cfb13d96395fbda77e7816d2c5d2c17f7fa84 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 6261220e9ca90be131ec8faf7864b7b31d83140c..b03cfb13d96395fbda77e7816d2c5d2c17f7fa84 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -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 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6261220e9ca90be131ec8faf7864b7b31d83140c..b03cfb13d96395fbda77e7816d2c5d2c17f7fa84 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -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 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 6261220e9ca90be131ec8faf7864b7b31d83140c..b03cfb13d96395fbda77e7816d2c5d2c17f7fa84 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -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 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 6261220e9ca90be131ec8faf7864b7b31d83140c..b03cfb13d96395fbda77e7816d2c5d2c17f7fa84 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -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 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 6261220e9ca90be131ec8faf7864b7b31d83140c..b03cfb13d96395fbda77e7816d2c5d2c17f7fa84 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -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 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6261220e9ca90be131ec8faf7864b7b31d83140c..b03cfb13d96395fbda77e7816d2c5d2c17f7fa84 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -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 

diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 877322c668c5449eaaf2c41a301b13a71190d7e7..8c9a55c1dc922a630a9ce3c70aacaf1f23ec7821 100644 (file)
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -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);
        }
     }

diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c
index 8379118f6eb7fbaa0e54cef430b7d45bba323b1c..0386dbbc4737757947ddd2815479e10f5c034d05 100644 (file)
--- a/gtk/gtkfilesel.c
+++ b/gtk/gtkfilesel.c
@@ -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);

diff --git a/gtk/gtkhpaned.c b/gtk/gtkhpaned.c
index be20306518b5d8aedfdbe516e4c01a0cfaabca78..6aabc424ed271ba2dba3bac828236886cdb5e3e8 100644 (file)
--- a/gtk/gtkhpaned.c
+++ b/gtk/gtkhpaned.c
@@ -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 */
 

diff --git a/gtk/gtkvpaned.c b/gtk/gtkvpaned.c
index ed52a76bc3405f86d51920d392f41afd28a19b9f..ecbe7ca34613b727e4e390f111cad6c0a660ad8f 100644 (file)
--- a/gtk/gtkvpaned.c
+++ b/gtk/gtkvpaned.c
@@ -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 */