forked from AuroraMiddleware/gtk
initialize path so we don't potentially use an undefined pointer.
Wed Aug 25 17:14:58 2004 Manish Singh <yosh@gimp.org> * gtk/gtktreeview.c (gtk_tree_view_search_activate): initialize path so we don't potentially use an undefined pointer. * gtk/gtkfilechooserdefault.c (shortcuts_list_create): add G_CALLBACK cast for tree_view_keybinding_cb. * gtk/gtkfilechooserdefault.c (location_entry_create): cast to GTK_FILE_CHOOSER_ENTRY for _gtk_file_chooser_entry_set_file_part() calls. * gtk/gtkcellrenderercombo.c (gtk_cell_renderer_combo_start_editing): cast to GTK_COMBO_BOX for gtk_combo_box_set_active_iter() call. * gtk/gtkselection.c (selection_get_text_plain): make len a gsize, since that's what g_convert_with_fallback() expects.
This commit is contained in:
parent
b73a8cc0b4
commit
95674320d9
18
ChangeLog
18
ChangeLog
@ -1,3 +1,21 @@
|
||||
Wed Aug 25 17:14:58 2004 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* gtk/gtktreeview.c (gtk_tree_view_search_activate): initialize
|
||||
path so we don't potentially use an undefined pointer.
|
||||
|
||||
* gtk/gtkfilechooserdefault.c (shortcuts_list_create): add G_CALLBACK
|
||||
cast for tree_view_keybinding_cb.
|
||||
|
||||
* gtk/gtkfilechooserdefault.c (location_entry_create): cast to
|
||||
GTK_FILE_CHOOSER_ENTRY for _gtk_file_chooser_entry_set_file_part()
|
||||
calls.
|
||||
|
||||
* gtk/gtkcellrenderercombo.c (gtk_cell_renderer_combo_start_editing):
|
||||
cast to GTK_COMBO_BOX for gtk_combo_box_set_active_iter() call.
|
||||
|
||||
* gtk/gtkselection.c (selection_get_text_plain): make len a gsize,
|
||||
since that's what g_convert_with_fallback() expects.
|
||||
|
||||
Wed Aug 25 16:14:34 2004 Jonathan Blandford <jrb@redhat.com>
|
||||
|
||||
* gtk/gtktreeview.c (gtk_tree_view_search_activate): activate the
|
||||
|
@ -1,3 +1,21 @@
|
||||
Wed Aug 25 17:14:58 2004 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* gtk/gtktreeview.c (gtk_tree_view_search_activate): initialize
|
||||
path so we don't potentially use an undefined pointer.
|
||||
|
||||
* gtk/gtkfilechooserdefault.c (shortcuts_list_create): add G_CALLBACK
|
||||
cast for tree_view_keybinding_cb.
|
||||
|
||||
* gtk/gtkfilechooserdefault.c (location_entry_create): cast to
|
||||
GTK_FILE_CHOOSER_ENTRY for _gtk_file_chooser_entry_set_file_part()
|
||||
calls.
|
||||
|
||||
* gtk/gtkcellrenderercombo.c (gtk_cell_renderer_combo_start_editing):
|
||||
cast to GTK_COMBO_BOX for gtk_combo_box_set_active_iter() call.
|
||||
|
||||
* gtk/gtkselection.c (selection_get_text_plain): make len a gsize,
|
||||
since that's what g_convert_with_fallback() expects.
|
||||
|
||||
Wed Aug 25 16:14:34 2004 Jonathan Blandford <jrb@redhat.com>
|
||||
|
||||
* gtk/gtktreeview.c (gtk_tree_view_search_activate): activate the
|
||||
|
@ -1,3 +1,21 @@
|
||||
Wed Aug 25 17:14:58 2004 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* gtk/gtktreeview.c (gtk_tree_view_search_activate): initialize
|
||||
path so we don't potentially use an undefined pointer.
|
||||
|
||||
* gtk/gtkfilechooserdefault.c (shortcuts_list_create): add G_CALLBACK
|
||||
cast for tree_view_keybinding_cb.
|
||||
|
||||
* gtk/gtkfilechooserdefault.c (location_entry_create): cast to
|
||||
GTK_FILE_CHOOSER_ENTRY for _gtk_file_chooser_entry_set_file_part()
|
||||
calls.
|
||||
|
||||
* gtk/gtkcellrenderercombo.c (gtk_cell_renderer_combo_start_editing):
|
||||
cast to GTK_COMBO_BOX for gtk_combo_box_set_active_iter() call.
|
||||
|
||||
* gtk/gtkselection.c (selection_get_text_plain): make len a gsize,
|
||||
since that's what g_convert_with_fallback() expects.
|
||||
|
||||
Wed Aug 25 16:14:34 2004 Jonathan Blandford <jrb@redhat.com>
|
||||
|
||||
* gtk/gtktreeview.c (gtk_tree_view_search_activate): activate the
|
||||
|
@ -1,3 +1,21 @@
|
||||
Wed Aug 25 17:14:58 2004 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* gtk/gtktreeview.c (gtk_tree_view_search_activate): initialize
|
||||
path so we don't potentially use an undefined pointer.
|
||||
|
||||
* gtk/gtkfilechooserdefault.c (shortcuts_list_create): add G_CALLBACK
|
||||
cast for tree_view_keybinding_cb.
|
||||
|
||||
* gtk/gtkfilechooserdefault.c (location_entry_create): cast to
|
||||
GTK_FILE_CHOOSER_ENTRY for _gtk_file_chooser_entry_set_file_part()
|
||||
calls.
|
||||
|
||||
* gtk/gtkcellrenderercombo.c (gtk_cell_renderer_combo_start_editing):
|
||||
cast to GTK_COMBO_BOX for gtk_combo_box_set_active_iter() call.
|
||||
|
||||
* gtk/gtkselection.c (selection_get_text_plain): make len a gsize,
|
||||
since that's what g_convert_with_fallback() expects.
|
||||
|
||||
Wed Aug 25 16:14:34 2004 Jonathan Blandford <jrb@redhat.com>
|
||||
|
||||
* gtk/gtktreeview.c (gtk_tree_view_search_activate): activate the
|
||||
|
@ -369,7 +369,8 @@ gtk_cell_renderer_combo_start_editing (GtkCellRenderer *cell,
|
||||
search_data.found = FALSE;
|
||||
gtk_tree_model_foreach (cell_combo->model, find_text, &search_data);
|
||||
if (search_data.found)
|
||||
gtk_combo_box_set_active_iter (combo, &(search_data.iter));
|
||||
gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo),
|
||||
&(search_data.iter));
|
||||
}
|
||||
|
||||
g_object_set (combo, "has_frame", FALSE, NULL);
|
||||
|
@ -2649,9 +2649,8 @@ shortcuts_list_create (GtkFileChooserDefault *impl)
|
||||
/* Tree */
|
||||
|
||||
impl->browse_shortcuts_tree_view = gtk_tree_view_new ();
|
||||
g_signal_connect (impl->browse_shortcuts_tree_view,
|
||||
"key-press-event", tree_view_keybinding_cb,
|
||||
impl);
|
||||
g_signal_connect (impl->browse_shortcuts_tree_view, "key-press-event",
|
||||
G_CALLBACK (tree_view_keybinding_cb), impl);
|
||||
atk_object_set_name (gtk_widget_get_accessible (impl->browse_shortcuts_tree_view), _("Shortcuts"));
|
||||
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view), FALSE);
|
||||
|
||||
@ -5504,10 +5503,10 @@ location_entry_create (GtkFileChooserDefault *impl)
|
||||
|
||||
if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN
|
||||
|| impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
|
||||
_gtk_file_chooser_entry_set_file_part (entry, "");
|
||||
_gtk_file_chooser_entry_set_file_part (GTK_FILE_CHOOSER_ENTRY (entry), "");
|
||||
else if (impl->action == GTK_FILE_CHOOSER_ACTION_SAVE
|
||||
|| impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
|
||||
_gtk_file_chooser_entry_set_file_part (entry,
|
||||
_gtk_file_chooser_entry_set_file_part (GTK_FILE_CHOOSER_ENTRY (entry),
|
||||
gtk_entry_get_text (GTK_ENTRY (impl->save_file_name_entry)));
|
||||
else
|
||||
g_assert_not_reached ();
|
||||
|
@ -1014,7 +1014,7 @@ selection_get_text_plain (GtkSelectionData *selection_data)
|
||||
{
|
||||
const gchar *charset = NULL;
|
||||
gchar *str, *result;
|
||||
gint len;
|
||||
gsize len;
|
||||
GError *error = NULL;
|
||||
|
||||
str = g_strdup (selection_data->data);
|
||||
|
@ -12280,7 +12280,7 @@ static void
|
||||
gtk_tree_view_search_activate (GtkEntry *entry,
|
||||
GtkTreeView *tree_view)
|
||||
{
|
||||
GtkTreePath *path;
|
||||
GtkTreePath *path = NULL;
|
||||
GtkRBNode *node;
|
||||
GtkRBTree *tree;
|
||||
|
||||
@ -12297,7 +12297,8 @@ gtk_tree_view_search_activate (GtkEntry *entry,
|
||||
if (node && GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED))
|
||||
gtk_tree_view_row_activated (tree_view, path, tree_view->priv->focus_column);
|
||||
|
||||
gtk_tree_path_free (path);
|
||||
if (path)
|
||||
gtk_tree_path_free (path);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
|
Loading…
Reference in New Issue
Block a user