callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

filechooserentry: Remove _gtk_file_chooser_entry_set_file_part()

Browse Source 
gtk_entry_set_text() is fine.
This commit is contained in:
Benjamin Otte 2011-11-07 03:33:18 +01:00 committed by Federico Mena Quintero
parent ef5088f879
commit 33fffa727a
3 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtk/gtkfilechooserdefault.c
View File

@ -6944,7 +6944,7 @@ update_chooser_entry (GtkFileChooserDefault *impl)
if (change_entry)
{
_gtk_file_chooser_entry_set_file_part (GTK_FILE_CHOOSER_ENTRY (impl->location_entry), impl->browse_files_last_selected_name);
gtk_entry_set_text (GTK_ENTRY (impl->location_entry), impl->browse_files_last_selected_name);
if (impl->action == GTK_FILE_CHOOSER_ACTION_SAVE)
_gtk_file_chooser_entry_select_filename (GTK_FILE_CHOOSER_ENTRY (impl->location_entry));
@ -6976,7 +6976,7 @@ update_chooser_entry (GtkFileChooserDefault *impl)
g_free (impl->browse_files_last_selected_name);
impl->browse_files_last_selected_name = NULL;
_gtk_file_chooser_entry_set_file_part (GTK_FILE_CHOOSER_ENTRY (impl->location_entry), "");
gtk_entry_set_text (GTK_ENTRY (impl->location_entry), "");
return;
}
@ -7011,7 +7011,7 @@ update_chooser_entry (GtkFileChooserDefault *impl)
clear_entry = FALSE;
if (clear_entry)
_gtk_file_chooser_entry_set_file_part (GTK_FILE_CHOOSER_ENTRY (impl->location_entry), "");
gtk_entry_set_text (GTK_ENTRY (impl->location_entry), "");
}
}
@ -7208,7 +7208,7 @@ update_current_folder_get_info_cb (GCancellable *cancellable,
impl->current_folder);
if (data->clear_entry)
_gtk_file_chooser_entry_set_file_part (GTK_FILE_CHOOSER_ENTRY (impl->location_entry), "");
gtk_entry_set_text (GTK_ENTRY (impl->location_entry), "");
}
/* Create a new list model. This is slightly evil; we store the result value
@ -7313,7 +7313,7 @@ gtk_file_chooser_default_set_current_name (GtkFileChooser *chooser,
impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER);
pending_select_files_free (impl);
_gtk_file_chooser_entry_set_file_part (GTK_FILE_CHOOSER_ENTRY (impl->location_entry), name);
gtk_entry_set_text (GTK_ENTRY (impl->location_entry), name);
}
static gboolean
@ -9779,7 +9779,7 @@ shortcuts_activate_iter (GtkFileChooserDefault *impl,
if (impl->location_entry
&& !(impl->action == GTK_FILE_CHOOSER_ACTION_SAVE
|| impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER))
_gtk_file_chooser_entry_set_file_part (GTK_FILE_CHOOSER_ENTRY (impl->location_entry), "");
gtk_entry_set_text (GTK_ENTRY (impl->location_entry), "");
gtk_tree_model_get (GTK_TREE_MODEL (impl->shortcuts_model), iter,
SHORTCUTS_COL_DATA, &col_data,
@ -10096,7 +10096,7 @@ static void
location_set_user_text (GtkFileChooserDefault *impl,
const gchar *path)
{
_gtk_file_chooser_entry_set_file_part (GTK_FILE_CHOOSER_ENTRY (impl->location_entry), path);
gtk_entry_set_text (GTK_ENTRY (impl->location_entry), path);
gtk_editable_set_position (GTK_EDITABLE (impl->location_entry), -1);
}

20
gtk/gtkfilechooserentry.c
View File

@ -1012,26 +1012,6 @@ _gtk_file_chooser_entry_get_file_part (GtkFileChooserEntry *chooser_entry)
return text;
}
/**
* _gtk_file_chooser_entry_set_file_part:
* @chooser_entry: a #GtkFileChooserEntry
* @file_part: text to display in the entry, in UTF-8
*
* Sets the current text shown in the file chooser entry.
**/
void
_gtk_file_chooser_entry_set_file_part (GtkFileChooserEntry *chooser_entry,
const gchar *file_part)
{
g_return_if_fail (GTK_IS_FILE_CHOOSER_ENTRY (chooser_entry));
chooser_entry->in_change = TRUE;
clear_completions (chooser_entry);
gtk_entry_set_text (GTK_ENTRY (chooser_entry), file_part);
chooser_entry->in_change = FALSE;
}
/**
* _gtk_file_chooser_entry_set_action:
* @chooser_entry: a #GtkFileChooserEntry

2
gtk/gtkfilechooserentry.h
View File

@ -39,8 +39,6 @@ void _gtk_file_chooser_entry_set_action (GtkFileChooserEnt
GtkFileChooserAction _gtk_file_chooser_entry_get_action (GtkFileChooserEntry *chooser_entry);
void _gtk_file_chooser_entry_set_base_folder (GtkFileChooserEntry *chooser_entry,
GFile *folder);
void _gtk_file_chooser_entry_set_file_part (GtkFileChooserEntry *chooser_entry,
const gchar *file_part);
GFile * _gtk_file_chooser_entry_get_current_folder (GtkFileChooserEntry *chooser_entry);
const gchar * _gtk_file_chooser_entry_get_file_part (GtkFileChooserEntry *chooser_entry);
gboolean _gtk_file_chooser_entry_get_is_folder (GtkFileChooserEntry *chooser_entry,