From 8eade402ccbd4b4d705678aad82fc18e110a472d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 8 Jun 2004 03:14:58 +0000 Subject: [PATCH] =?UTF-8?q?Handle=20priv->model=20being=20NULL.=20(#143856?= =?UTF-8?q?,=20Mariano=20Su=C3=A1rez-Alvarez)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Mon Jun 7 23:07:40 2004 Matthias Clasen * gtk/gtkcombobox.c (gtk_combo_box_remeasure): Handle priv->model being NULL. (#143856, Mariano Suárez-Alvarez) --- ChangeLog | 34 ++++++++++++++++++++-------------- ChangeLog.pre-2-10 | 34 ++++++++++++++++++++-------------- ChangeLog.pre-2-6 | 34 ++++++++++++++++++++-------------- ChangeLog.pre-2-8 | 34 ++++++++++++++++++++-------------- gtk/gtkcombobox.c | 3 ++- 5 files changed, 82 insertions(+), 57 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2135adb8bc..7d24a16a81 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Jun 7 23:07:40 2004 Matthias Clasen + + * gtk/gtkcombobox.c (gtk_combo_box_remeasure): Handle + priv->model being NULL. (#143856, Mariano Suárez-Alvarez) + 2004-06-07 Federico Mena Quintero * gtk/gtktreeview.c (gtk_tree_view_button_press): Revert the patch @@ -7,21 +12,22 @@ Sun Jun 6 23:57:21 2004 Matthias Clasen - Make the entry context menu work in editable text cells. The changes are - based on a patch by Kristian Rietveld, which implemented an approach outlined - by Owen Taylor. (#50075) + Make the entry context menu work in editable text cells. The changes + are based on a patch by Kristian Rietveld, which implemented an + approach outlined by Owen Taylor. (#50075) - * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_focus_out_event): Ignore - focus out if the entry menu is posted. - (gtk_cell_renderer_text_populate_popup): Mark the entry menu as posted, and - set up a signal handler to clear the flag if the menu is unmapped. - (gtk_cell_renderer_text_popup_unmap): Clear the in_entry_menu flag, set up - a timeout to stop editing if the focus is lost. - (popdown_timeout): Stop editing if the entry doesn't have focus any more. - (gtk_cell_renderer_text_start_editing): Connect to the populate_popup signal - on the entry and keep a pointer to the entry. - (gtk_cell_renderer_text_editing_done): Disconnect from popuplate_popup, clear - the pointer to the entry. + * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_focus_out_event): + Ignore focus out if the entry menu is posted. + (gtk_cell_renderer_text_populate_popup): Mark the entry menu as + posted, and set up a signal handler to clear the flag if the menu + is unmapped. + (gtk_cell_renderer_text_popup_unmap): Clear the in_entry_menu flag, + set up a timeout to stop editing if the focus is lost. + (popdown_timeout): Stop editing if the entry doesn't have focus anymore. + (gtk_cell_renderer_text_start_editing): Connect to the populate_popup + signal on the entry and keep a pointer to the entry. + (gtk_cell_renderer_text_editing_done): Disconnect from popuplate_popup, + clear the pointer to the entry. Sun Jun 6 23:24:43 2004 Matthias Clasen diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2135adb8bc..7d24a16a81 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Mon Jun 7 23:07:40 2004 Matthias Clasen + + * gtk/gtkcombobox.c (gtk_combo_box_remeasure): Handle + priv->model being NULL. (#143856, Mariano Suárez-Alvarez) + 2004-06-07 Federico Mena Quintero * gtk/gtktreeview.c (gtk_tree_view_button_press): Revert the patch @@ -7,21 +12,22 @@ Sun Jun 6 23:57:21 2004 Matthias Clasen - Make the entry context menu work in editable text cells. The changes are - based on a patch by Kristian Rietveld, which implemented an approach outlined - by Owen Taylor. (#50075) + Make the entry context menu work in editable text cells. The changes + are based on a patch by Kristian Rietveld, which implemented an + approach outlined by Owen Taylor. (#50075) - * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_focus_out_event): Ignore - focus out if the entry menu is posted. - (gtk_cell_renderer_text_populate_popup): Mark the entry menu as posted, and - set up a signal handler to clear the flag if the menu is unmapped. - (gtk_cell_renderer_text_popup_unmap): Clear the in_entry_menu flag, set up - a timeout to stop editing if the focus is lost. - (popdown_timeout): Stop editing if the entry doesn't have focus any more. - (gtk_cell_renderer_text_start_editing): Connect to the populate_popup signal - on the entry and keep a pointer to the entry. - (gtk_cell_renderer_text_editing_done): Disconnect from popuplate_popup, clear - the pointer to the entry. + * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_focus_out_event): + Ignore focus out if the entry menu is posted. + (gtk_cell_renderer_text_populate_popup): Mark the entry menu as + posted, and set up a signal handler to clear the flag if the menu + is unmapped. + (gtk_cell_renderer_text_popup_unmap): Clear the in_entry_menu flag, + set up a timeout to stop editing if the focus is lost. + (popdown_timeout): Stop editing if the entry doesn't have focus anymore. + (gtk_cell_renderer_text_start_editing): Connect to the populate_popup + signal on the entry and keep a pointer to the entry. + (gtk_cell_renderer_text_editing_done): Disconnect from popuplate_popup, + clear the pointer to the entry. Sun Jun 6 23:24:43 2004 Matthias Clasen diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 2135adb8bc..7d24a16a81 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Mon Jun 7 23:07:40 2004 Matthias Clasen + + * gtk/gtkcombobox.c (gtk_combo_box_remeasure): Handle + priv->model being NULL. (#143856, Mariano Suárez-Alvarez) + 2004-06-07 Federico Mena Quintero * gtk/gtktreeview.c (gtk_tree_view_button_press): Revert the patch @@ -7,21 +12,22 @@ Sun Jun 6 23:57:21 2004 Matthias Clasen - Make the entry context menu work in editable text cells. The changes are - based on a patch by Kristian Rietveld, which implemented an approach outlined - by Owen Taylor. (#50075) + Make the entry context menu work in editable text cells. The changes + are based on a patch by Kristian Rietveld, which implemented an + approach outlined by Owen Taylor. (#50075) - * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_focus_out_event): Ignore - focus out if the entry menu is posted. - (gtk_cell_renderer_text_populate_popup): Mark the entry menu as posted, and - set up a signal handler to clear the flag if the menu is unmapped. - (gtk_cell_renderer_text_popup_unmap): Clear the in_entry_menu flag, set up - a timeout to stop editing if the focus is lost. - (popdown_timeout): Stop editing if the entry doesn't have focus any more. - (gtk_cell_renderer_text_start_editing): Connect to the populate_popup signal - on the entry and keep a pointer to the entry. - (gtk_cell_renderer_text_editing_done): Disconnect from popuplate_popup, clear - the pointer to the entry. + * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_focus_out_event): + Ignore focus out if the entry menu is posted. + (gtk_cell_renderer_text_populate_popup): Mark the entry menu as + posted, and set up a signal handler to clear the flag if the menu + is unmapped. + (gtk_cell_renderer_text_popup_unmap): Clear the in_entry_menu flag, + set up a timeout to stop editing if the focus is lost. + (popdown_timeout): Stop editing if the entry doesn't have focus anymore. + (gtk_cell_renderer_text_start_editing): Connect to the populate_popup + signal on the entry and keep a pointer to the entry. + (gtk_cell_renderer_text_editing_done): Disconnect from popuplate_popup, + clear the pointer to the entry. Sun Jun 6 23:24:43 2004 Matthias Clasen diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2135adb8bc..7d24a16a81 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Mon Jun 7 23:07:40 2004 Matthias Clasen + + * gtk/gtkcombobox.c (gtk_combo_box_remeasure): Handle + priv->model being NULL. (#143856, Mariano Suárez-Alvarez) + 2004-06-07 Federico Mena Quintero * gtk/gtktreeview.c (gtk_tree_view_button_press): Revert the patch @@ -7,21 +12,22 @@ Sun Jun 6 23:57:21 2004 Matthias Clasen - Make the entry context menu work in editable text cells. The changes are - based on a patch by Kristian Rietveld, which implemented an approach outlined - by Owen Taylor. (#50075) + Make the entry context menu work in editable text cells. The changes + are based on a patch by Kristian Rietveld, which implemented an + approach outlined by Owen Taylor. (#50075) - * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_focus_out_event): Ignore - focus out if the entry menu is posted. - (gtk_cell_renderer_text_populate_popup): Mark the entry menu as posted, and - set up a signal handler to clear the flag if the menu is unmapped. - (gtk_cell_renderer_text_popup_unmap): Clear the in_entry_menu flag, set up - a timeout to stop editing if the focus is lost. - (popdown_timeout): Stop editing if the entry doesn't have focus any more. - (gtk_cell_renderer_text_start_editing): Connect to the populate_popup signal - on the entry and keep a pointer to the entry. - (gtk_cell_renderer_text_editing_done): Disconnect from popuplate_popup, clear - the pointer to the entry. + * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_focus_out_event): + Ignore focus out if the entry menu is posted. + (gtk_cell_renderer_text_populate_popup): Mark the entry menu as + posted, and set up a signal handler to clear the flag if the menu + is unmapped. + (gtk_cell_renderer_text_popup_unmap): Clear the in_entry_menu flag, + set up a timeout to stop editing if the focus is lost. + (popdown_timeout): Stop editing if the entry doesn't have focus anymore. + (gtk_cell_renderer_text_start_editing): Connect to the populate_popup + signal on the entry and keep a pointer to the entry. + (gtk_cell_renderer_text_editing_done): Disconnect from popuplate_popup, + clear the pointer to the entry. Sun Jun 6 23:24:43 2004 Matthias Clasen diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index 05cd83869c..a21688298c 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -1412,7 +1412,8 @@ gtk_combo_box_remeasure (GtkComboBox *combo_box) GtkTreePath *path; gint padding = 0; - if (!gtk_tree_model_get_iter_first (combo_box->priv->model, &iter)) + if (!combo_box->priv->model || + !gtk_tree_model_get_iter_first (combo_box->priv->model, &iter)) return; combo_box->priv->width = 0;