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

Really make GtkFileSystem private by _-prefixing all functions.

Browse Source 
* gtk/gtkfilechooserbutton.c:
        * gtk/gtkfilechooserdefault.c:
        * gtk/gtkfilechooserentry.c:
        * gtk/gtkfilesystem.c:
        * gtk/gtkfilesystem.h:
        * gtk/gtkfilesystemmodel.c:
        * gtk/gtkpathbar.c: Really make GtkFileSystem private
        by _-prefixing all functions.


svn path=/trunk/; revision=20378
This commit is contained in:
Matthias Clasen
2008-06-13 16:47:41 +00:00
parent 8845b9f01b
commit f9c7a4bbd0
8 changed files with 387 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2008-06-13 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkfilechooserbutton.c:
* gtk/gtkfilechooserdefault.c:
* gtk/gtkfilechooserentry.c:
* gtk/gtkfilesystem.c:
* gtk/gtkfilesystem.h:
* gtk/gtkfilesystemmodel.c:
* gtk/gtkpathbar.c: Really make GtkFileSystem private
by _-prefixing all functions.
2008-06-13 Matthias Clasen <mclasen@redhat.com>
* docs/RELEASE-HOWTO: Updates

120
gtk/gtkfilechooserbutton.c
View File

@ -717,11 +717,11 @@ gtk_file_chooser_button_constructor (GType type,
model_add_special (button);
list = gtk_file_system_list_volumes (priv->fs);
list = _gtk_file_system_list_volumes (priv->fs);
model_add_volumes (button, list);
g_slist_free (list);
list = gtk_file_system_list_bookmarks (priv->fs);
list = _gtk_file_system_list_bookmarks (priv->fs);
model_add_bookmarks (button, list);
g_slist_foreach (list, (GFunc) g_object_unref, NULL);
g_slist_free (list);
@ -1043,9 +1043,9 @@ dnd_select_folder_get_info_cb (GCancellable *cancellable,
data->file = g_file_new_for_uri (data->uris[data->i]);
data->button->priv->dnd_select_folder_cancellable =
gtk_file_system_get_info (data->file_system, data->file,
"standard::type",
dnd_select_folder_get_info_cb, user_data);
_gtk_file_system_get_info (data->file_system, data->file,
"standard::type",
dnd_select_folder_get_info_cb, user_data);
g_object_unref (cancellable);
}
@ -1100,9 +1100,9 @@ gtk_file_chooser_button_drag_data_received (GtkWidget *widget,
g_cancellable_cancel (priv->dnd_select_folder_cancellable);
priv->dnd_select_folder_cancellable =
gtk_file_system_get_info (priv->fs, info->file,
"standard::type",
dnd_select_folder_get_info_cb, info);
_gtk_file_system_get_info (priv->fs, info->file,
"standard::type",
dnd_select_folder_get_info_cb, info);
}
break;
@ -1229,7 +1229,7 @@ change_icon_theme_get_info_cb (GCancellable *cancellable,
if (cancelled || error)
goto out;
pixbuf = gtk_file_info_render_icon (info, GTK_WIDGET (data->button), data->button->priv->icon_size);
pixbuf = _gtk_file_info_render_icon (info, GTK_WIDGET (data->button), data->button->priv->icon_size);
if (pixbuf)
{
@ -1329,10 +1329,10 @@ change_icon_theme (GtkFileChooserButton *button)
gtk_tree_path_free (path);
cancellable =
gtk_file_system_get_info (priv->fs, data,
"standard::icon",
change_icon_theme_get_info_cb,
info);
_gtk_file_system_get_info (priv->fs, data,
"standard::icon",
change_icon_theme_get_info_cb,
info);
button->priv->change_icon_theme_cancellables =
g_slist_append (button->priv->change_icon_theme_cancellables, cancellable);
pixbuf = NULL;
@ -1352,10 +1352,10 @@ change_icon_theme (GtkFileChooserButton *button)
break;
case ROW_TYPE_VOLUME:
if (data)
pixbuf = gtk_file_system_volume_render_icon (data,
GTK_WIDGET (button),
priv->icon_size,
NULL);
pixbuf = _gtk_file_system_volume_render_icon (data,
GTK_WIDGET (button),
priv->icon_size,
NULL);
else
pixbuf = gtk_icon_theme_load_icon (theme, FALLBACK_ICON_NAME,
priv->icon_size, 0, NULL);
@ -1469,7 +1469,7 @@ set_info_get_info_cb (GCancellable *cancellable,
/* There was an error, leave the fallback name in there */
goto out;
pixbuf = gtk_file_info_render_icon (info, GTK_WIDGET (data->button), data->button->priv->icon_size);
pixbuf = _gtk_file_info_render_icon (info, GTK_WIDGET (data->button), data->button->priv->icon_size);
if (!data->label)
data->label = g_strdup (g_file_info_get_display_name (info));
@ -1505,15 +1505,15 @@ set_info_for_file_at_iter (GtkFileChooserButton *button,
data = g_new0 (struct SetDisplayNameData, 1);
data->button = g_object_ref (button);
data->label = gtk_file_system_get_bookmark_label (button->priv->fs, file);
data->label = _gtk_file_system_get_bookmark_label (button->priv->fs, file);
tree_path = gtk_tree_model_get_path (button->priv->model, iter);
data->row_ref = gtk_tree_row_reference_new (button->priv->model, tree_path);
gtk_tree_path_free (tree_path);
cancellable = gtk_file_system_get_info (button->priv->fs, file,
"standard::type,standard::icon,standard::display-name",
set_info_get_info_cb, data);
cancellable = _gtk_file_system_get_info (button->priv->fs, file,
"standard::type,standard::icon,standard::display-name",
set_info_get_info_cb, data);
gtk_list_store_set (GTK_LIST_STORE (button->priv->model), iter,
CANCELLABLE_COLUMN, cancellable,
@ -1600,7 +1600,7 @@ model_free_row_data (GtkFileChooserButton *button,
g_object_unref (data);
break;
case ROW_TYPE_VOLUME:
gtk_file_system_volume_free (data);
_gtk_file_system_volume_free (data);
break;
default:
break;
@ -1646,7 +1646,7 @@ model_add_special_get_info_cb (GCancellable *cancellable,
if (cancelled || error)
goto out;
pixbuf = gtk_file_info_render_icon (info, GTK_WIDGET (data->button), data->button->priv->icon_size);
pixbuf = _gtk_file_info_render_icon (info, GTK_WIDGET (data->button), data->button->priv->icon_size);
if (pixbuf)
{
@ -1705,9 +1705,9 @@ model_add_special (GtkFileChooserButton *button)
tree_path);
gtk_tree_path_free (tree_path);
cancellable = gtk_file_system_get_info (button->priv->fs, file,
"standard::icon,standard::display-name",
model_add_special_get_info_cb, info);
cancellable = _gtk_file_system_get_info (button->priv->fs, file,
"standard::icon,standard::display-name",
model_add_special_get_info_cb, info);
gtk_list_store_set (store, &iter,
ICON_COLUMN, NULL,
@ -1740,9 +1740,9 @@ model_add_special (GtkFileChooserButton *button)
tree_path);
gtk_tree_path_free (tree_path);
cancellable = gtk_file_system_get_info (button->priv->fs, file,
"standard::icon,standard::display-name",
model_add_special_get_info_cb, info);
cancellable = _gtk_file_system_get_info (button->priv->fs, file,
"standard::icon,standard::display-name",
model_add_special_get_info_cb, info);
gtk_list_store_set (store, &iter,
TYPE_COLUMN, ROW_TYPE_SPECIAL,
@ -1786,24 +1786,24 @@ model_add_volumes (GtkFileChooserButton *button,
if (local_only)
{
if (gtk_file_system_volume_is_mounted (volume))
if (_gtk_file_system_volume_is_mounted (volume))
{
GFile *base_file;
base_file = gtk_file_system_volume_get_root (volume);
base_file = _gtk_file_system_volume_get_root (volume);
if (base_file != NULL && !g_file_is_native (base_file))
{
gtk_file_system_volume_free (volume);
_gtk_file_system_volume_free (volume);
continue;
}
}
}
pixbuf = gtk_file_system_volume_render_icon (volume,
GTK_WIDGET (button),
button->priv->icon_size,
NULL);
display_name = gtk_file_system_volume_get_display_name (volume);
pixbuf = _gtk_file_system_volume_render_icon (volume,
GTK_WIDGET (button),
button->priv->icon_size,
NULL);
display_name = _gtk_file_system_volume_get_display_name (volume);
gtk_list_store_insert (store, &iter, pos);
gtk_list_store_set (store, &iter,
@ -1874,7 +1874,7 @@ model_add_bookmarks (GtkFileChooserButton *button,
* If we switch to a better bookmarks file format (XBEL), we
* should use mime info to get a better icon.
*/
label = gtk_file_system_get_bookmark_label (button->priv->fs, file);
label = _gtk_file_system_get_bookmark_label (button->priv->fs, file);
if (!label)
label = _gtk_file_chooser_label_for_file (file);
@ -1977,7 +1977,7 @@ model_update_current_folder (GtkFileChooserButton *button,
* If we switch to a better bookmarks file format (XBEL), we
* should use mime info to get a better icon.
*/
label = gtk_file_system_get_bookmark_label (button->priv->fs, file);
label = _gtk_file_system_get_bookmark_label (button->priv->fs, file);
if (!label)
label = _gtk_file_chooser_label_for_file (file);
@ -2115,11 +2115,11 @@ filter_model_visible_func (GtkTreeModel *model,
retval = TRUE;
if (local_only)
{
if (gtk_file_system_volume_is_mounted (data))
if (_gtk_file_system_volume_is_mounted (data))
{
GFile *base_file;
base_file = gtk_file_system_volume_get_root (data);
base_file = _gtk_file_system_volume_get_root (data);
if (base_file)
{
@ -2216,7 +2216,7 @@ update_combo_box (GtkFileChooserButton *button)
{
GFile *base_file;
base_file = gtk_file_system_volume_get_root (data);
base_file = _gtk_file_system_volume_get_root (data);
if (base_file)
{
row_found = (files &&
@ -2288,7 +2288,7 @@ update_label_get_info_cb (GCancellable *cancellable,
gtk_label_set_text (GTK_LABEL (priv->label), g_file_info_get_display_name (info));
pixbuf = gtk_file_info_render_icon (info, GTK_WIDGET (priv->image), priv->icon_size);
pixbuf = _gtk_file_info_render_icon (info, GTK_WIDGET (priv->image), priv->icon_size);
if (!pixbuf)
pixbuf = gtk_icon_theme_load_icon (get_icon_theme (GTK_WIDGET (priv->image)),
@ -2323,25 +2323,25 @@ update_label_and_image (GtkFileChooserButton *button)
file = files->data;
volume = gtk_file_system_get_volume_for_file (priv->fs, file);
volume = _gtk_file_system_get_volume_for_file (priv->fs, file);
if (volume)
{
GFile *base_file;
base_file = gtk_file_system_volume_get_root (volume);
base_file = _gtk_file_system_volume_get_root (volume);
if (base_file && g_file_equal (base_file, file))
{
label_text = gtk_file_system_volume_get_display_name (volume);
pixbuf = gtk_file_system_volume_render_icon (volume,
GTK_WIDGET (button),
priv->icon_size,
NULL);
label_text = _gtk_file_system_volume_get_display_name (volume);
pixbuf = _gtk_file_system_volume_render_icon (volume,
GTK_WIDGET (button),
priv->icon_size,
NULL);
}
if (base_file)
g_object_unref (base_file);
gtk_file_system_volume_free (volume);
_gtk_file_system_volume_free (volume);
if (label_text)
goto out;
@ -2356,16 +2356,16 @@ update_label_and_image (GtkFileChooserButton *button)
if (g_file_is_native (file))
{
priv->update_button_cancellable =
gtk_file_system_get_info (priv->fs, file,
"standard::icon,standard::display-name",
update_label_get_info_cb,
g_object_ref (button));
_gtk_file_system_get_info (priv->fs, file,
"standard::icon,standard::display-name",
update_label_get_info_cb,
g_object_ref (button));
}
else
{
GdkPixbuf *pixbuf;
label_text = gtk_file_system_get_bookmark_label (button->priv->fs, file);
label_text = _gtk_file_system_get_bookmark_label (button->priv->fs, file);
pixbuf = gtk_icon_theme_load_icon (get_icon_theme (GTK_WIDGET (priv->image)),
"gnome-fs-regular",
@ -2410,7 +2410,7 @@ fs_volumes_changed_cb (GtkFileSystem *fs,
priv->n_volumes = 0;
volumes = gtk_file_system_list_volumes (fs);
volumes = _gtk_file_system_list_volumes (fs);
model_add_volumes (user_data, volumes);
g_slist_free (volumes);
@ -2428,7 +2428,7 @@ fs_bookmarks_changed_cb (GtkFileSystem *fs,
GtkFileChooserButtonPrivate *priv = button->priv;
GSList *bookmarks;
bookmarks = gtk_file_system_list_bookmarks (fs);
bookmarks = _gtk_file_system_list_bookmarks (fs);
model_remove_rows (user_data,
model_get_type_position (user_data,
ROW_TYPE_BOOKMARK_SEPARATOR),
@ -2535,7 +2535,7 @@ combo_box_changed_cb (GtkComboBox *combo_box,
GFile *base_file;
gtk_file_chooser_unselect_all (GTK_FILE_CHOOSER (priv->dialog));
base_file = gtk_file_system_volume_get_root (data);
base_file = _gtk_file_system_volume_get_root (data);
if (base_file)
{
_gtk_file_chooser_set_current_folder_file (GTK_FILE_CHOOSER (priv->dialog),

188
gtk/gtkfilechooserdefault.c
View File

@ -868,7 +868,7 @@ shortcuts_free_row_data (GtkFileChooserDefault *impl,
GtkFileSystemVolume *volume;
volume = col_data;
gtk_file_system_volume_free (volume);
_gtk_file_system_volume_free (volume);
}
else
{
@ -1297,7 +1297,7 @@ shortcuts_reload_icons_get_info_cb (GCancellable *cancellable,
if (cancelled || error)
goto out;
pixbuf = gtk_file_info_render_icon (info, GTK_WIDGET (data->impl), data->impl->icon_size);
pixbuf = _gtk_file_info_render_icon (info, GTK_WIDGET (data->impl), data->impl->icon_size);
path = gtk_tree_row_reference_get_path (data->row_ref);
gtk_tree_model_get_iter (GTK_TREE_MODEL (data->impl->shortcuts_model), &iter, path);
@ -1357,8 +1357,8 @@ shortcuts_reload_icons (GtkFileChooserDefault *impl)
GtkFileSystemVolume *volume;
volume = data;
pixbuf = gtk_file_system_volume_render_icon (volume, GTK_WIDGET (impl),
impl->icon_size, NULL);
pixbuf = _gtk_file_system_volume_render_icon (volume, GTK_WIDGET (impl),
impl->icon_size, NULL);
}
else if (shortcut_type == SHORTCUT_TYPE_FILE)
{
@ -1377,10 +1377,10 @@ shortcuts_reload_icons (GtkFileChooserDefault *impl)
info->row_ref = gtk_tree_row_reference_new (GTK_TREE_MODEL (impl->shortcuts_model), tree_path);
gtk_tree_path_free (tree_path);
cancellable = gtk_file_system_get_info (impl->file_system, file,
"standard::icon",
shortcuts_reload_icons_get_info_cb,
info);
cancellable = _gtk_file_system_get_info (impl->file_system, file,
"standard::icon",
shortcuts_reload_icons_get_info_cb,
info);
impl->reload_icon_cancellables = g_slist_append (impl->reload_icon_cancellables, cancellable);
}
else
@ -1598,8 +1598,8 @@ get_file_info_finished (GCancellable *cancellable,
if (!request->label_copy)
request->label_copy = g_strdup (g_file_info_get_display_name (info));
pixbuf = gtk_file_info_render_icon (info, GTK_WIDGET (request->impl),
request->impl->icon_size);
pixbuf = _gtk_file_info_render_icon (info, GTK_WIDGET (request->impl),
request->impl->icon_size);
gtk_list_store_set (request->impl->shortcuts_model, &iter,
SHORTCUTS_COL_PIXBUF, pixbuf,
@ -1726,9 +1726,9 @@ shortcuts_insert_file (GtkFileChooserDefault *impl,
if (shortcut_type == SHORTCUT_TYPE_VOLUME)
{
data = volume;
label_copy = gtk_file_system_volume_get_display_name (volume);
pixbuf = gtk_file_system_volume_render_icon (volume, GTK_WIDGET (impl),
impl->icon_size, NULL);
label_copy = _gtk_file_system_volume_get_display_name (volume);
pixbuf = _gtk_file_system_volume_render_icon (volume, GTK_WIDGET (impl),
impl->icon_size, NULL);
}
else if (shortcut_type == SHORTCUT_TYPE_FILE)
{
@ -1757,9 +1757,9 @@ shortcuts_insert_file (GtkFileChooserDefault *impl,
request->row_ref = gtk_tree_row_reference_new (GTK_TREE_MODEL (impl->shortcuts_model), p);
gtk_tree_path_free (p);
cancellable = gtk_file_system_get_info (request->impl->file_system, request->file,
"standard::is-hidden,standard::display-name,standard::icon",
get_file_info_finished, request);
cancellable = _gtk_file_system_get_info (request->impl->file_system, request->file,
"standard::is-hidden,standard::display-name,standard::icon",
get_file_info_finished, request);
gtk_list_store_set (impl->shortcuts_model, &iter,
SHORTCUTS_COL_DATA, g_object_ref (file),
@ -1974,7 +1974,7 @@ shortcuts_append_bookmarks (GtkFileChooserDefault *impl,
if (shortcut_find_position (impl, file) != -1)
continue;
label = gtk_file_system_get_bookmark_label (impl->file_system, file);
label = _gtk_file_system_get_bookmark_label (impl->file_system, file);
shortcuts_insert_file (impl, start_row + num_inserted, SHORTCUT_TYPE_FILE, NULL, file, label, TRUE, SHORTCUTS_BOOKMARKS);
num_inserted++;
@ -2073,7 +2073,7 @@ shortcuts_add_volumes (GtkFileChooserDefault *impl)
shortcuts_remove_rows (impl, start_row, impl->num_volumes);
impl->num_volumes = 0;
list = gtk_file_system_list_volumes (impl->file_system);
list = _gtk_file_system_list_volumes (impl->file_system);
n = 0;
@ -2085,11 +2085,11 @@ shortcuts_add_volumes (GtkFileChooserDefault *impl)
if (impl->local_only)
{
if (gtk_file_system_volume_is_mounted (volume))
if (_gtk_file_system_volume_is_mounted (volume))
{
GFile *base_file;
base_file = gtk_file_system_volume_get_root (volume);
base_file = _gtk_file_system_volume_get_root (volume);
if (base_file != NULL && !g_file_is_native (base_file))
continue;
}
@ -2191,7 +2191,7 @@ shortcuts_add_bookmarks (GtkFileChooserDefault *impl)
impl->num_bookmarks = 0;
shortcuts_insert_separator (impl, SHORTCUTS_BOOKMARKS_SEPARATOR);
bookmarks = gtk_file_system_list_bookmarks (impl->file_system);
bookmarks = _gtk_file_system_list_bookmarks (impl->file_system);
shortcuts_append_bookmarks (impl, bookmarks);
g_slist_free (bookmarks);
@ -2261,9 +2261,9 @@ shortcuts_add_current_folder (GtkFileChooserDefault *impl)
pos = shortcuts_get_index (impl, SHORTCUTS_CURRENT_FOLDER);
volume = gtk_file_system_get_volume_for_file (impl->file_system, impl->current_folder);
volume = _gtk_file_system_get_volume_for_file (impl->file_system, impl->current_folder);
if (volume)
base_file = gtk_file_system_volume_get_root (volume);
base_file = _gtk_file_system_volume_get_root (volume);
else
base_file = NULL;
@ -2571,7 +2571,7 @@ shortcut_find_position (GtkFileChooserDefault *impl,
gboolean exists;
volume = col_data;
base_file = gtk_file_system_volume_get_root (volume);
base_file = _gtk_file_system_volume_get_root (volume);
exists = base_file && g_file_equal (file, base_file);
@ -2616,7 +2616,7 @@ shortcuts_add_bookmark_from_file (GtkFileChooserDefault *impl,
return FALSE;
error = NULL;
if (!gtk_file_system_insert_bookmark (impl->file_system, file, pos, &error))
if (!_gtk_file_system_insert_bookmark (impl->file_system, file, pos, &error))
{
error_adding_bookmark_dialog (impl, file, error);
return FALSE;
@ -2738,7 +2738,7 @@ remove_selected_bookmarks (GtkFileChooserDefault *impl)
file = col_data;
error = NULL;
if (!gtk_file_system_remove_bookmark (impl->file_system, file, &error))
if (!_gtk_file_system_remove_bookmark (impl->file_system, file, &error))
error_removing_bookmark_dialog (impl, file, error);
}
@ -3490,10 +3490,10 @@ shortcuts_reorder (GtkFileChooserDefault *impl,
goto out;
error = NULL;
if (gtk_file_system_remove_bookmark (impl->file_system, file, &error))
if (_gtk_file_system_remove_bookmark (impl->file_system, file, &error))
{
shortcuts_add_bookmark_from_file (impl, file, new_position);
gtk_file_system_set_bookmark_label (impl->file_system, file, name);
_gtk_file_system_set_bookmark_label (impl->file_system, file, name);
}
else
error_adding_bookmark_dialog (impl, file, error);
@ -3841,7 +3841,7 @@ shortcuts_edited (GtkCellRenderer *cell,
-1);
gtk_tree_path_free (path);
gtk_file_system_set_bookmark_label (impl->file_system, shortcut, new_text);
_gtk_file_system_set_bookmark_label (impl->file_system, shortcut, new_text);
}
static void
@ -4228,10 +4228,10 @@ file_list_drag_data_received_cb (GtkWidget *widget,
g_cancellable_cancel (impl->file_list_drag_data_received_cancellable);
impl->file_list_drag_data_received_cancellable =
gtk_file_system_get_info (impl->file_system, file,
"standard::type",
file_list_drag_data_received_get_info_cb,
data);
_gtk_file_system_get_info (impl->file_system, file,
"standard::type",
file_list_drag_data_received_get_info_cb,
data);
}
g_signal_stop_emission_by_name (widget, "drag_data_received");
@ -5368,7 +5368,7 @@ set_file_system_backend (GtkFileChooserDefault *impl)
{
profile_start ("start for backend", "default");
impl->file_system = gtk_file_system_new ();
impl->file_system = _gtk_file_system_new ();
g_signal_connect (impl->file_system, "volumes-changed",
G_CALLBACK (volumes_bookmarks_changed_cb), impl);
@ -6413,7 +6413,7 @@ show_and_select_files_finished_loading (GtkFolder *folder,
file = l->data;
info = gtk_folder_get_info (folder, file);
info = _gtk_folder_get_info (folder, file);
if (info)
{
if (!have_hidden)
@ -6476,7 +6476,7 @@ show_and_select_files_get_folder_cb (GCancellable *cancellable,
g_object_unref (cancellable);
if (gtk_folder_is_finished_loading (folder))
if (_gtk_folder_is_finished_loading (folder))
show_and_select_files_finished_loading (folder, user_data);
else
g_signal_connect (folder, "finished-loading",
@ -6519,9 +6519,9 @@ show_and_select_files (GtkFileChooserDefault *impl,
g_cancellable_cancel (impl->show_and_select_files_cancellable);
impl->show_and_select_files_cancellable =
gtk_file_system_get_folder (impl->file_system, parent_file,
"standard::is-hidden,standard::type,standard::name",
show_and_select_files_get_folder_cb, info);
_gtk_file_system_get_folder (impl->file_system, parent_file,
"standard::is-hidden,standard::type,standard::name",
show_and_select_files_get_folder_cb, info);
profile_end ("end", NULL);
return TRUE;
@ -6882,10 +6882,10 @@ update_current_folder_get_info_cb (GCancellable *cancellable,
impl->reload_state = RELOAD_HAS_FOLDER;
impl->update_current_folder_cancellable =
gtk_file_system_get_info (impl->file_system, data->file,
"standard::type",
update_current_folder_get_info_cb,
data);
_gtk_file_system_get_info (impl->file_system, data->file,
"standard::type",
update_current_folder_get_info_cb,
data);
set_busy_cursor (impl, TRUE);
@ -7018,10 +7018,10 @@ gtk_file_chooser_default_update_current_folder (GtkFileChooser *chooser,
impl->reload_state = RELOAD_HAS_FOLDER;
impl->update_current_folder_cancellable =
gtk_file_system_get_info (impl->file_system, file,
"standard::type",
update_current_folder_get_info_cb,
data);
_gtk_file_system_get_info (impl->file_system, file,
"standard::type",
update_current_folder_get_info_cb,
data);
set_busy_cursor (impl, TRUE);
@ -7647,9 +7647,9 @@ gtk_file_chooser_default_add_shortcut_folder (GtkFileChooser *chooser,
data->impl = g_object_ref (impl);
data->file = g_object_ref (file);
cancellable = gtk_file_system_get_info (impl->file_system, file,
"standard::type",
add_shortcut_get_info_cb, data);
cancellable = _gtk_file_system_get_info (impl->file_system, file,
"standard::type",
add_shortcut_get_info_cb, data);
if (!cancellable)
return FALSE;
@ -8069,10 +8069,10 @@ should_respond_after_confirm_overwrite (GtkFileChooserDefault *impl,
g_cancellable_cancel (impl->should_respond_get_info_cancellable);
impl->should_respond_get_info_cancellable =
gtk_file_system_get_info (impl->file_system, parent_file,
"standard::display-name",
confirmation_confirm_get_info_cb,
data);
_gtk_file_system_get_info (impl->file_system, parent_file,
"standard::display-name",
confirmation_confirm_get_info_cb,
data);
set_busy_cursor (data->impl, TRUE);
return FALSE;
}
@ -8215,11 +8215,11 @@ file_exists_get_info_cb (GCancellable *cancellable,
g_cancellable_cancel (data->impl->should_respond_get_info_cancellable);
data->impl->should_respond_get_info_cancellable =
gtk_file_system_get_info (data->impl->file_system,
data->parent_file,
"standard::type",
save_entry_get_info_cb,
data);
_gtk_file_system_get_info (data->impl->file_system,
data->parent_file,
"standard::type",
save_entry_get_info_cb,
data);
set_busy_cursor (data->impl, TRUE);
}
@ -8425,10 +8425,10 @@ gtk_file_chooser_default_should_respond (GtkFileChooserEmbed *chooser_embed)
g_cancellable_cancel (impl->file_exists_get_info_cancellable);
impl->file_exists_get_info_cancellable =
gtk_file_system_get_info (impl->file_system, file,
"standard::type",
file_exists_get_info_cb,
data);
_gtk_file_system_get_info (impl->file_system, file,
"standard::type",
file_exists_get_info_cb,
data);
set_busy_cursor (impl, TRUE);
retval = FALSE;
@ -8604,8 +8604,8 @@ search_hit_get_info_cb (GCancellable *cancellable,
display_name = g_strdup (g_file_info_get_display_name (info));
mime_type = g_strdup (g_file_info_get_content_type (info));
is_folder = (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY);
pixbuf = gtk_file_info_render_icon (info, GTK_WIDGET (request->impl),
request->impl->icon_size);
pixbuf = _gtk_file_info_render_icon (info, GTK_WIDGET (request->impl),
request->impl->icon_size);
gtk_list_store_set (request->impl->search_model, &iter,
SEARCH_MODEL_COL_PIXBUF, pixbuf,
@ -8676,11 +8676,11 @@ search_add_hit (GtkFileChooserDefault *impl,
request->row_ref = gtk_tree_row_reference_new (GTK_TREE_MODEL (impl->search_model), p);
gtk_tree_path_free (p);
cancellable = gtk_file_system_get_info (impl->file_system, file,
"standard::type,standard::icon,"
"standard::content-type,standard::display-name",
search_hit_get_info_cb,
request);
cancellable = _gtk_file_system_get_info (impl->file_system, file,
"standard::type,standard::icon,"
"standard::content-type,standard::display-name",
search_hit_get_info_cb,
request);
gtk_list_store_set (impl->search_model, &iter,
SEARCH_MODEL_COL_FILE, file,
@ -9768,10 +9768,10 @@ recent_idle_load (gpointer data)
request->row_ref = gtk_tree_row_reference_new (GTK_TREE_MODEL (impl->recent_model), p);
gtk_tree_path_free (p);
cancellable = gtk_file_system_get_info (impl->file_system, file,
"standard::type",
recent_item_get_info_cb,
request);
cancellable = _gtk_file_system_get_info (impl->file_system, file,
"standard::type",
recent_item_get_info_cb,
request);
gtk_list_store_set (impl->recent_model, &iter,
RECENT_MODEL_COL_FILE, file,
@ -10116,7 +10116,7 @@ shortcuts_activate_volume_mount_cb (GCancellable *cancellable,
{
char *msg, *name;
name = gtk_file_system_volume_get_display_name (volume);
name = _gtk_file_system_volume_get_display_name (volume);
msg = g_strdup_printf (_("Could not mount %s"), name);
error_message (impl, msg, error->message);
@ -10128,7 +10128,7 @@ shortcuts_activate_volume_mount_cb (GCancellable *cancellable,
goto out;
}
file = gtk_file_system_volume_get_root (volume);
file = _gtk_file_system_volume_get_root (volume);
if (file != NULL)
{
change_folder_and_display_error (impl, file, FALSE);
@ -10167,18 +10167,18 @@ shortcuts_activate_volume (GtkFileChooserDefault *impl,
*/
g_object_ref (impl);
if (!gtk_file_system_volume_is_mounted (volume))
if (!_gtk_file_system_volume_is_mounted (volume))
{
set_busy_cursor (impl, TRUE);
impl->shortcuts_activate_iter_cancellable =
gtk_file_system_mount_volume (impl->file_system, volume, NULL,
shortcuts_activate_volume_mount_cb,
g_object_ref (impl));
_gtk_file_system_mount_volume (impl->file_system, volume, NULL,
shortcuts_activate_volume_mount_cb,
g_object_ref (impl));
}
else
{
file = gtk_file_system_volume_get_root (volume);
file = _gtk_file_system_volume_get_root (volume);
if (file != NULL)
{
change_folder_and_display_error (impl, file, FALSE);
@ -10248,9 +10248,9 @@ shortcuts_activate_mount_enclosing_volume (GCancellable *cancellable,
}
data->impl->shortcuts_activate_iter_cancellable =
gtk_file_system_get_info (data->impl->file_system, data->file,
"standard::type",
shortcuts_activate_get_info_cb, data);
_gtk_file_system_get_info (data->impl->file_system, data->file,
"standard::type",
shortcuts_activate_get_info_cb, data);
}
static void
@ -10289,13 +10289,13 @@ shortcuts_activate_iter (GtkFileChooserDefault *impl,
struct ShortcutsActivateData *data;
GtkFileSystemVolume *volume;
volume = gtk_file_system_get_volume_for_file (impl->file_system, col_data);
volume = _gtk_file_system_get_volume_for_file (impl->file_system, col_data);
data = g_new0 (struct ShortcutsActivateData, 1);
data->impl = g_object_ref (impl);
data->file = g_object_ref (col_data);
if (!volume || !gtk_file_system_volume_is_mounted (volume))
if (!volume || !_gtk_file_system_volume_is_mounted (volume))
{
GMountOperation *mount_operation;
GtkWidget *toplevel;
@ -10305,17 +10305,17 @@ shortcuts_activate_iter (GtkFileChooserDefault *impl,
mount_operation = gtk_mount_operation_new (GTK_WINDOW (toplevel));
impl->shortcuts_activate_iter_cancellable =
gtk_file_system_mount_enclosing_volume (impl->file_system, col_data,
mount_operation,
shortcuts_activate_mount_enclosing_volume,
data);
_gtk_file_system_mount_enclosing_volume (impl->file_system, col_data,
mount_operation,
shortcuts_activate_mount_enclosing_volume,
data);
}
else
{
impl->shortcuts_activate_iter_cancellable =
gtk_file_system_get_info (impl->file_system, data->file,
"standard::type",
shortcuts_activate_get_info_cb, data);
_gtk_file_system_get_info (impl->file_system, data->file,
"standard::type",
shortcuts_activate_get_info_cb, data);
}
}
else if (shortcut_type == SHORTCUT_TYPE_SEARCH)
@ -10665,7 +10665,7 @@ list_icon_data_func (GtkTreeViewColumn *tree_column,
if (info)
{
/* FIXME: NULL GError */
pixbuf = gtk_file_info_render_icon (info, GTK_WIDGET (impl), impl->icon_size);
pixbuf = _gtk_file_info_render_icon (info, GTK_WIDGET (impl), impl->icon_size);
}
}
else

46
gtk/gtkfilechooserentry.c
View File

@ -435,7 +435,7 @@ maybe_append_separator_to_file (GtkFileChooserEntry *chooser_entry,
{
GFileInfo *info;
info = gtk_folder_get_info (chooser_entry->current_folder, file);
info = _gtk_folder_get_info (chooser_entry->current_folder, file);
if (info)
{
@ -494,12 +494,12 @@ find_common_prefix (GtkFileChooserEntry *chooser_entry,
text_up_to_cursor = gtk_editable_get_chars (editable, 0, gtk_editable_get_position (editable));
parsed = gtk_file_system_parse (chooser_entry->file_system,
chooser_entry->base_folder,
text_up_to_cursor,
&parsed_folder_file,
&parsed_file_part,
error);
parsed = _gtk_file_system_parse (chooser_entry->file_system,
chooser_entry->base_folder,
text_up_to_cursor,
&parsed_folder_file,
&parsed_file_part,
error);
g_free (text_up_to_cursor);
@ -1045,7 +1045,7 @@ explicitly_complete (GtkFileChooserEntry *chooser_entry)
CommonPrefixResult result;
g_assert (chooser_entry->current_folder != NULL);
g_assert (gtk_folder_is_finished_loading (chooser_entry->current_folder));
g_assert (_gtk_folder_is_finished_loading (chooser_entry->current_folder));
/* FIXME: see what Emacs does in case there is no common prefix, or there is more than one match:
*
@ -1109,7 +1109,7 @@ start_explicit_completion (GtkFileChooserEntry *chooser_entry)
}
if (chooser_entry->current_folder
&& gtk_folder_is_finished_loading (chooser_entry->current_folder))
&& _gtk_folder_is_finished_loading (chooser_entry->current_folder))
{
explicitly_complete (chooser_entry);
}
@ -1215,7 +1215,7 @@ populate_completion_store (GtkFileChooserEntry *chooser_entry)
discard_completion_store (chooser_entry);
files = gtk_folder_list_children (chooser_entry->current_folder);
files = _gtk_folder_list_children (chooser_entry->current_folder);
chooser_entry->completion_store = gtk_list_store_new (N_COLUMNS,
G_TYPE_STRING,
@ -1228,7 +1228,7 @@ populate_completion_store (GtkFileChooserEntry *chooser_entry)
file = tmp_list->data;
info = gtk_folder_get_info (chooser_entry->current_folder, file);
info = _gtk_folder_get_info (chooser_entry->current_folder, file);
if (info)
{
@ -1349,7 +1349,7 @@ load_directory_get_folder_callback (GCancellable *cancellable,
discard_completion_store (chooser_entry);
if (gtk_folder_is_finished_loading (chooser_entry->current_folder))
if (_gtk_folder_is_finished_loading (chooser_entry->current_folder))
finish_folder_load (chooser_entry);
else
g_signal_connect (chooser_entry->current_folder, "finished-loading",
@ -1371,11 +1371,11 @@ start_loading_current_folder (GtkFileChooserEntry *chooser_entry)
g_assert (chooser_entry->load_folder_cancellable == NULL);
chooser_entry->load_folder_cancellable =
gtk_file_system_get_folder (chooser_entry->file_system,
chooser_entry->current_folder_file,
"standard::name,standard::display-name,standard::type",
load_directory_get_folder_callback,
g_object_ref (chooser_entry));
_gtk_file_system_get_folder (chooser_entry->file_system,
chooser_entry->current_folder_file,
"standard::name,standard::display-name,standard::type",
load_directory_get_folder_callback,
g_object_ref (chooser_entry));
}
static void
@ -1454,9 +1454,9 @@ refresh_current_folder_and_file_part (GtkFileChooserEntry *chooser_entry,
if (!chooser_entry->file_system ||
!chooser_entry->base_folder ||
!gtk_file_system_parse (chooser_entry->file_system,
chooser_entry->base_folder, text,
&folder_file, &file_part, NULL)) /* NULL-GError */
!_gtk_file_system_parse (chooser_entry->file_system,
chooser_entry->base_folder, text,
&folder_file, &file_part, NULL)) /* NULL-GError */
{
folder_file = (chooser_entry->base_folder) ? g_object_ref (chooser_entry->base_folder) : NULL;
file_part = g_strdup ("");
@ -1489,7 +1489,7 @@ static void
autocomplete (GtkFileChooserEntry *chooser_entry)
{
g_assert (chooser_entry->current_folder != NULL);
g_assert (gtk_folder_is_finished_loading (chooser_entry->current_folder));
g_assert (_gtk_folder_is_finished_loading (chooser_entry->current_folder));
g_assert (gtk_editable_get_position (GTK_EDITABLE (chooser_entry)) == GTK_ENTRY (chooser_entry)->text_length);
append_common_prefix (chooser_entry, TRUE, FALSE);
@ -1508,7 +1508,7 @@ start_autocompletion (GtkFileChooserEntry *chooser_entry)
return;
}
if (gtk_folder_is_finished_loading (chooser_entry->current_folder))
if (_gtk_folder_is_finished_loading (chooser_entry->current_folder))
autocomplete (chooser_entry);
else
chooser_entry->load_complete_action = LOAD_COMPLETE_AUTOCOMPLETE;
@ -1795,7 +1795,7 @@ _gtk_file_chooser_entry_get_is_folder (GtkFileChooserEntry *chooser_entry,
{
GFileInfo *file_info;
file_info = gtk_folder_get_info (chooser_entry->current_folder, file);
file_info = _gtk_folder_get_info (chooser_entry->current_folder, file);
if (file_info)
{

176
gtk/gtkfilesystem.c
View File

@ -120,27 +120,27 @@ struct GtkFileSystemBookmark
gchar *label;
};
G_DEFINE_TYPE (GtkFileSystem, gtk_file_system, G_TYPE_OBJECT)
G_DEFINE_TYPE (GtkFileSystem, _gtk_file_system, G_TYPE_OBJECT)
G_DEFINE_TYPE (GtkFolder, gtk_folder, G_TYPE_OBJECT)
G_DEFINE_TYPE (GtkFolder, _gtk_folder, G_TYPE_OBJECT)
static void _gtk_folder_set_finished_loading (GtkFolder *folder,
gboolean finished_loading);
static void _gtk_folder_add_file (GtkFolder *folder,
GFile *file,
GFileInfo *info);
static void gtk_folder_set_finished_loading (GtkFolder *folder,
gboolean finished_loading);
static void gtk_folder_add_file (GtkFolder *folder,
GFile *file,
GFileInfo *info);
GQuark
gtk_file_system_error_quark (void)
_gtk_file_system_error_quark (void)
{
return g_quark_from_static_string ("gtk-file-system-error-quark");
}
/* GtkFileSystemBookmark methods */
void
gtk_file_system_bookmark_free (GtkFileSystemBookmark *bookmark)
_gtk_file_system_bookmark_free (GtkFileSystemBookmark *bookmark)
{
g_object_unref (bookmark->file);
g_free (bookmark->label);
@ -185,7 +185,7 @@ gtk_file_system_dispose (GObject *object)
priv->volume_monitor = NULL;
}
G_OBJECT_CLASS (gtk_file_system_parent_class)->dispose (object);
G_OBJECT_CLASS (_gtk_file_system_parent_class)->dispose (object);
}
static void
@ -202,15 +202,15 @@ gtk_file_system_finalize (GObject *object)
if (priv->bookmarks)
{
g_slist_foreach (priv->bookmarks, (GFunc) gtk_file_system_bookmark_free, NULL);
g_slist_foreach (priv->bookmarks, (GFunc) _gtk_file_system_bookmark_free, NULL);
g_slist_free (priv->bookmarks);
}
G_OBJECT_CLASS (gtk_file_system_parent_class)->finalize (object);
G_OBJECT_CLASS (_gtk_file_system_parent_class)->finalize (object);
}
static void
gtk_file_system_class_init (GtkFileSystemClass *class)
_gtk_file_system_class_init (GtkFileSystemClass *class)
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
@ -347,7 +347,7 @@ bookmarks_file_changed (GFileMonitor *monitor,
case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
case G_FILE_MONITOR_EVENT_CREATED:
case G_FILE_MONITOR_EVENT_DELETED:
g_slist_foreach (priv->bookmarks, (GFunc) gtk_file_system_bookmark_free, NULL);
g_slist_foreach (priv->bookmarks, (GFunc) _gtk_file_system_bookmark_free, NULL);
g_slist_free (priv->bookmarks);
priv->bookmarks = read_bookmarks (file);
@ -490,7 +490,7 @@ get_volumes_list (GtkFileSystem *file_system)
}
static void
gtk_file_system_init (GtkFileSystem *file_system)
_gtk_file_system_init (GtkFileSystem *file_system)
{
GtkFileSystemPrivate *priv;
GFile *bookmarks_file;
@ -539,13 +539,13 @@ gtk_file_system_init (GtkFileSystem *file_system)
/* GtkFileSystem public methods */
GtkFileSystem *
gtk_file_system_new (void)
_gtk_file_system_new (void)
{
return g_object_new (GTK_TYPE_FILE_SYSTEM, NULL);
}
GSList *
gtk_file_system_list_volumes (GtkFileSystem *file_system)
_gtk_file_system_list_volumes (GtkFileSystem *file_system)
{
GtkFileSystemPrivate *priv;
GSList *list;
@ -566,7 +566,7 @@ gtk_file_system_list_volumes (GtkFileSystem *file_system)
}
GSList *
gtk_file_system_list_bookmarks (GtkFileSystem *file_system)
_gtk_file_system_list_bookmarks (GtkFileSystem *file_system)
{
GtkFileSystemPrivate *priv;
GSList *bookmarks, *files = NULL;
@ -590,12 +590,12 @@ gtk_file_system_list_bookmarks (GtkFileSystem *file_system)
}
gboolean
gtk_file_system_parse (GtkFileSystem *file_system,
GFile *base_file,
const gchar *str,
GFile **folder,
gchar **file_part,
GError **error)
_gtk_file_system_parse (GtkFileSystem *file_system,
GFile *base_file,
const gchar *str,
GFile **folder,
gchar **file_part,
GError **error)
{
GFile *file;
gboolean result = FALSE;
@ -713,11 +713,11 @@ enumerate_children_callback (GObject *source_object,
}
GCancellable *
gtk_file_system_get_folder (GtkFileSystem *file_system,
GFile *file,
const gchar *attributes,
GtkFileSystemGetFolderCallback callback,
gpointer data)
_gtk_file_system_get_folder (GtkFileSystem *file_system,
GFile *file,
const gchar *attributes,
GtkFileSystemGetFolderCallback callback,
gpointer data)
{
GCancellable *cancellable;
AsyncFuncData *async_data;
@ -780,11 +780,11 @@ query_info_callback (GObject *source_object,
}
GCancellable *
gtk_file_system_get_info (GtkFileSystem *file_system,
GFile *file,
const gchar *attributes,
GtkFileSystemGetInfoCallback callback,
gpointer data)
_gtk_file_system_get_info (GtkFileSystem *file_system,
GFile *file,
const gchar *attributes,
GtkFileSystemGetInfoCallback callback,
gpointer data)
{
GCancellable *cancellable;
AsyncFuncData *async_data;
@ -856,11 +856,11 @@ volume_mount_cb (GObject *source_object,
}
GCancellable *
gtk_file_system_mount_volume (GtkFileSystem *file_system,
GtkFileSystemVolume *volume,
GMountOperation *mount_operation,
GtkFileSystemVolumeMountCallback callback,
gpointer data)
_gtk_file_system_mount_volume (GtkFileSystem *file_system,
GtkFileSystemVolume *volume,
GMountOperation *mount_operation,
GtkFileSystemVolumeMountCallback callback,
gpointer data)
{
GCancellable *cancellable;
AsyncFuncData *async_data;
@ -909,7 +909,7 @@ enclosing_volume_mount_cb (GObject *source_object,
async_data = (AsyncFuncData *) user_data;
g_file_mount_enclosing_volume_finish (G_FILE (source_object), result, &error);
volume = gtk_file_system_get_volume_for_file (async_data->file_system, G_FILE (source_object));
volume = _gtk_file_system_get_volume_for_file (async_data->file_system, G_FILE (source_object));
gdk_threads_enter ();
((GtkFileSystemVolumeMountCallback) async_data->callback) (async_data->cancellable, volume,
@ -921,11 +921,11 @@ enclosing_volume_mount_cb (GObject *source_object,
}
GCancellable *
gtk_file_system_mount_enclosing_volume (GtkFileSystem *file_system,
GFile *file,
GMountOperation *mount_operation,
GtkFileSystemVolumeMountCallback callback,
gpointer data)
_gtk_file_system_mount_enclosing_volume (GtkFileSystem *file_system,
GFile *file,
GMountOperation *mount_operation,
GtkFileSystemVolumeMountCallback callback,
gpointer data)
{
GCancellable *cancellable;
AsyncFuncData *async_data;
@ -955,10 +955,10 @@ gtk_file_system_mount_enclosing_volume (GtkFileSystem *file_
}
gboolean
gtk_file_system_insert_bookmark (GtkFileSystem *file_system,
GFile *file,
gint position,
GError **error)
_gtk_file_system_insert_bookmark (GtkFileSystem *file_system,
GFile *file,
gint position,
GError **error)
{
GtkFileSystemPrivate *priv;
GSList *bookmarks;
@ -1012,9 +1012,9 @@ gtk_file_system_insert_bookmark (GtkFileSystem *file_system,
}
gboolean
gtk_file_system_remove_bookmark (GtkFileSystem *file_system,
GFile *file,
GError **error)
_gtk_file_system_remove_bookmark (GtkFileSystem *file_system,
GFile *file,
GError **error)
{
GtkFileSystemPrivate *priv;
GtkFileSystemBookmark *bookmark;
@ -1037,7 +1037,7 @@ gtk_file_system_remove_bookmark (GtkFileSystem *file_system,
{
result = TRUE;
priv->bookmarks = g_slist_remove_link (priv->bookmarks, bookmarks);
gtk_file_system_bookmark_free (bookmark);
_gtk_file_system_bookmark_free (bookmark);
g_slist_free_1 (bookmarks);
break;
}
@ -1070,8 +1070,8 @@ gtk_file_system_remove_bookmark (GtkFileSystem *file_system,
}
gchar *
gtk_file_system_get_bookmark_label (GtkFileSystem *file_system,
GFile *file)
_gtk_file_system_get_bookmark_label (GtkFileSystem *file_system,
GFile *file)
{
GtkFileSystemPrivate *priv;
GSList *bookmarks;
@ -1100,9 +1100,9 @@ gtk_file_system_get_bookmark_label (GtkFileSystem *file_system,
}
void
gtk_file_system_set_bookmark_label (GtkFileSystem *file_system,
GFile *file,
const gchar *label)
_gtk_file_system_set_bookmark_label (GtkFileSystem *file_system,
GFile *file,
const gchar *label)
{
GtkFileSystemPrivate *priv;
gboolean changed = FALSE;
@ -1139,8 +1139,8 @@ gtk_file_system_set_bookmark_label (GtkFileSystem *file_system,
}
GtkFileSystemVolume *
gtk_file_system_get_volume_for_file (GtkFileSystem *file_system,
GFile *file)
_gtk_file_system_get_volume_for_file (GtkFileSystem *file_system,
GFile *file)
{
GtkFileSystemPrivate *priv;
GMount *mount;
@ -1231,7 +1231,7 @@ query_created_file_info_callback (GObject *source_object,
}
folder = GTK_FOLDER (user_data);
_gtk_folder_add_file (folder, file, info);
gtk_folder_add_file (folder, file, info);
files = g_slist_prepend (NULL, file);
g_signal_emit (folder, folder_signals[FILES_ADDED], 0, files);
@ -1314,7 +1314,7 @@ enumerator_files_callback (GObject *source_object,
G_PRIORITY_DEFAULT,
NULL, NULL, NULL);
_gtk_folder_set_finished_loading (folder, TRUE);
gtk_folder_set_finished_loading (folder, TRUE);
return;
}
@ -1331,7 +1331,7 @@ enumerator_files_callback (GObject *source_object,
info = f->data;
child_file = g_file_get_child (priv->folder_file, g_file_info_get_name (info));
_gtk_folder_add_file (folder, child_file, info);
gtk_folder_add_file (folder, child_file, info);
files = g_slist_prepend (files, child_file);
}
@ -1391,11 +1391,11 @@ gtk_folder_finalize (GObject *object)
g_object_unref (priv->cancellable);
g_free (priv->attributes);
G_OBJECT_CLASS (gtk_folder_parent_class)->finalize (object);
G_OBJECT_CLASS (_gtk_folder_parent_class)->finalize (object);
}
static void
gtk_folder_class_init (GtkFolderClass *class)
_gtk_folder_class_init (GtkFolderClass *class)
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
@ -1470,7 +1470,7 @@ gtk_folder_class_init (GtkFolderClass *class)
}
static void
gtk_folder_init (GtkFolder *folder)
_gtk_folder_init (GtkFolder *folder)
{
GtkFolderPrivate *priv;
@ -1484,8 +1484,8 @@ gtk_folder_init (GtkFolder *folder)
}
static void
_gtk_folder_set_finished_loading (GtkFolder *folder,
gboolean finished_loading)
gtk_folder_set_finished_loading (GtkFolder *folder,
gboolean finished_loading)
{
GtkFolderPrivate *priv;
@ -1498,9 +1498,9 @@ _gtk_folder_set_finished_loading (GtkFolder *folder,
}
static void
_gtk_folder_add_file (GtkFolder *folder,
GFile *file,
GFileInfo *info)
gtk_folder_add_file (GtkFolder *folder,
GFile *file,
GFileInfo *info)
{
GtkFolderPrivate *priv;
@ -1512,7 +1512,7 @@ _gtk_folder_add_file (GtkFolder *folder,
}
GSList *
gtk_folder_list_children (GtkFolder *folder)
_gtk_folder_list_children (GtkFolder *folder)
{
GtkFolderPrivate *priv;
GList *files, *elem;
@ -1531,8 +1531,8 @@ gtk_folder_list_children (GtkFolder *folder)
}
GFileInfo *
gtk_folder_get_info (GtkFolder *folder,
GFile *file)
_gtk_folder_get_info (GtkFolder *folder,
GFile *file)
{
GtkFolderPrivate *priv;
GFileInfo *info;
@ -1547,7 +1547,7 @@ gtk_folder_get_info (GtkFolder *folder,
}
gboolean
gtk_folder_is_finished_loading (GtkFolder *folder)
_gtk_folder_is_finished_loading (GtkFolder *folder)
{
GtkFolderPrivate *priv;
@ -1558,7 +1558,7 @@ gtk_folder_is_finished_loading (GtkFolder *folder)
/* GtkFileSystemVolume public methods */
gchar *
gtk_file_system_volume_get_display_name (GtkFileSystemVolume *volume)
_gtk_file_system_volume_get_display_name (GtkFileSystemVolume *volume)
{
DEBUG ("volume_get_display_name");
@ -1575,7 +1575,7 @@ gtk_file_system_volume_get_display_name (GtkFileSystemVolume *volume)
}
gboolean
gtk_file_system_volume_is_mounted (GtkFileSystemVolume *volume)
_gtk_file_system_volume_is_mounted (GtkFileSystemVolume *volume)
{
gboolean mounted;
@ -1605,7 +1605,7 @@ gtk_file_system_volume_is_mounted (GtkFileSystemVolume *volume)
}
GFile *
gtk_file_system_volume_get_root (GtkFileSystemVolume *volume)
_gtk_file_system_volume_get_root (GtkFileSystemVolume *volume)
{
GFile *file = NULL;
@ -1679,7 +1679,7 @@ get_icon_for_special_directory (GFile *file)
NULL
};
g_object_unref (special_file);
return g_themed_icon_new_from_names (names, -1);
return g_themed_icon_new_from_names ((char **)names, -1);
}
g_object_unref (special_file);
@ -1696,7 +1696,7 @@ get_icon_for_special_directory (GFile *file)
NULL
};
g_object_unref (special_file);
return g_themed_icon_new_from_names (names, -1);
return g_themed_icon_new_from_names ((char **)names, -1);
}
g_object_unref (special_file);
@ -1705,10 +1705,10 @@ get_icon_for_special_directory (GFile *file)
}
GdkPixbuf *
gtk_file_system_volume_render_icon (GtkFileSystemVolume *volume,
GtkWidget *widget,
gint icon_size,
GError **error)
_gtk_file_system_volume_render_icon (GtkFileSystemVolume *volume,
GtkWidget *widget,
gint icon_size,
GError **error)
{
GIcon *icon = NULL;
GdkPixbuf *pixbuf;
@ -1722,7 +1722,7 @@ gtk_file_system_volume_render_icon (GtkFileSystemVolume *volume,
DEBUG ("volume_get_icon_name");
if (IS_ROOT_VOLUME (volume))
icon = g_themed_icon_new_from_names (harddisk_icons, -1);
icon = g_themed_icon_new_from_names ((char **)harddisk_icons, -1);
else if (G_IS_DRIVE (volume))
icon = g_drive_get_icon (G_DRIVE (volume));
else if (G_IS_VOLUME (volume))
@ -1751,7 +1751,7 @@ gtk_file_system_volume_render_icon (GtkFileSystemVolume *volume,
}
void
gtk_file_system_volume_free (GtkFileSystemVolume *volume)
_gtk_file_system_volume_free (GtkFileSystemVolume *volume)
{
/* Root volume doesn't need to be freed */
if (IS_ROOT_VOLUME (volume))
@ -1765,13 +1765,13 @@ gtk_file_system_volume_free (GtkFileSystemVolume *volume)
/* GFileInfo helper functions */
GdkPixbuf *
gtk_file_info_render_icon (GFileInfo *info,
_gtk_file_info_render_icon (GFileInfo *info,
GtkWidget *widget,
gint icon_size)
{
GIcon *icon;
GdkPixbuf *pixbuf = NULL;
gchar *thumbnail_path;
const gchar *thumbnail_path;
thumbnail_path = g_file_info_get_attribute_byte_string (info, G_FILE_ATTRIBUTE_THUMBNAIL_PATH);

128
gtk/gtkfilesystem.h
View File

@ -27,14 +27,14 @@
G_BEGIN_DECLS
#define GTK_TYPE_FILE_SYSTEM (gtk_file_system_get_type ())
#define GTK_TYPE_FILE_SYSTEM (_gtk_file_system_get_type ())
#define GTK_FILE_SYSTEM(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GTK_TYPE_FILE_SYSTEM, GtkFileSystem))
#define GTK_FILE_SYSTEM_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), GTK_TYPE_FILE_SYSTEM, GtkFileSystemClass))
#define GTK_IS_FILE_SYSTEM(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTK_TYPE_FILE_SYSTEM))
#define GTK_IS_FILE_SYSTEM_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), GTK_TYPE_FILE_SYSTEM))
#define GTK_FILE_SYSTEM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GTK_TYPE_FILE_SYSTEM, GtkFileSystemClass))
#define GTK_TYPE_FOLDER (gtk_folder_get_type ())
#define GTK_TYPE_FOLDER (_gtk_folder_get_type ())
#define GTK_FOLDER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GTK_TYPE_FOLDER, GtkFolder))
#define GTK_FOLDER_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), GTK_TYPE_FOLDER, GtkFolderClass))
#define GTK_IS_FOLDER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTK_TYPE_FOLDER))
@ -44,7 +44,7 @@ G_BEGIN_DECLS
/* GError enumeration for GtkFileSystem
*/
#define GTK_FILE_SYSTEM_ERROR (gtk_file_system_error_quark ())
#define GTK_FILE_SYSTEM_ERROR (_gtk_file_system_error_quark ())
typedef enum
{
@ -56,7 +56,7 @@ typedef enum
GTK_FILE_SYSTEM_ERROR_ALREADY_EXISTS
} GtkFileSystemError;
GQuark gtk_file_system_error_quark (void);
GQuark _gtk_file_system_error_quark (void);
typedef struct GtkFileSystemClass GtkFileSystemClass;
typedef struct GtkFileSystem GtkFileSystem;
@ -111,84 +111,84 @@ typedef void (* GtkFileSystemVolumeMountCallback) (GCancellable *cancell
gpointer data);
/* GtkFileSystem methods */
GType gtk_file_system_get_type (void) G_GNUC_CONST;
GType _gtk_file_system_get_type (void) G_GNUC_CONST;
GtkFileSystem * gtk_file_system_new (void);
GtkFileSystem * _gtk_file_system_new (void);
GSList * gtk_file_system_list_volumes (GtkFileSystem *file_system);
GSList * gtk_file_system_list_bookmarks (GtkFileSystem *file_system);
GSList * _gtk_file_system_list_volumes (GtkFileSystem *file_system);
GSList * _gtk_file_system_list_bookmarks (GtkFileSystem *file_system);
gboolean gtk_file_system_parse (GtkFileSystem *file_system,
GFile *base_file,
const gchar *str,
GFile **folder,
gchar **file_part,
GError **error);
gboolean _gtk_file_system_parse (GtkFileSystem *file_system,
GFile *base_file,
const gchar *str,
GFile **folder,
gchar **file_part,
GError **error);
GCancellable * gtk_file_system_get_folder (GtkFileSystem *file_system,
GFile *file,
const gchar *attributes,
GtkFileSystemGetFolderCallback callback,
gpointer data);
GCancellable * gtk_file_system_get_info (GtkFileSystem *file_system,
GFile *file,
const gchar *attributes,
GtkFileSystemGetInfoCallback callback,
gpointer data);
GCancellable * gtk_file_system_mount_volume (GtkFileSystem *file_system,
GtkFileSystemVolume *volume,
GMountOperation *mount_operation,
GtkFileSystemVolumeMountCallback callback,
gpointer data);
GCancellable * gtk_file_system_mount_enclosing_volume (GtkFileSystem *file_system,
GFile *file,
GMountOperation *mount_operation,
GtkFileSystemVolumeMountCallback callback,
gpointer data);
GCancellable * _gtk_file_system_get_folder (GtkFileSystem *file_system,
GFile *file,
const gchar *attributes,
GtkFileSystemGetFolderCallback callback,
gpointer data);
GCancellable * _gtk_file_system_get_info (GtkFileSystem *file_system,
GFile *file,
const gchar *attributes,
GtkFileSystemGetInfoCallback callback,
gpointer data);
GCancellable * _gtk_file_system_mount_volume (GtkFileSystem *file_system,
GtkFileSystemVolume *volume,
GMountOperation *mount_operation,
GtkFileSystemVolumeMountCallback callback,
gpointer data);
GCancellable * _gtk_file_system_mount_enclosing_volume (GtkFileSystem *file_system,
GFile *file,
GMountOperation *mount_operation,
GtkFileSystemVolumeMountCallback callback,
gpointer data);
gboolean gtk_file_system_insert_bookmark (GtkFileSystem *file_system,
GFile *file,
gint position,
GError **error);
gboolean gtk_file_system_remove_bookmark (GtkFileSystem *file_system,
GFile *file,
GError **error);
gboolean _gtk_file_system_insert_bookmark (GtkFileSystem *file_system,
GFile *file,
gint position,
GError **error);
gboolean _gtk_file_system_remove_bookmark (GtkFileSystem *file_system,
GFile *file,
GError **error);
gchar * gtk_file_system_get_bookmark_label (GtkFileSystem *file_system,
GFile *file);
void gtk_file_system_set_bookmark_label (GtkFileSystem *file_system,
GFile *file,
const gchar *label);
gchar * _gtk_file_system_get_bookmark_label (GtkFileSystem *file_system,
GFile *file);
void _gtk_file_system_set_bookmark_label (GtkFileSystem *file_system,
GFile *file,
const gchar *label);
GtkFileSystemVolume * gtk_file_system_get_volume_for_file (GtkFileSystem *file_system,
GFile *file);
GtkFileSystemVolume * _gtk_file_system_get_volume_for_file (GtkFileSystem *file_system,
GFile *file);
/* GtkFolder functions */
GSList * gtk_folder_list_children (GtkFolder *folder);
GFileInfo * gtk_folder_get_info (GtkFolder *folder,
GFile *file);
GSList * _gtk_folder_list_children (GtkFolder *folder);
GFileInfo * _gtk_folder_get_info (GtkFolder *folder,
GFile *file);
gboolean gtk_folder_is_finished_loading (GtkFolder *folder);
gboolean _gtk_folder_is_finished_loading (GtkFolder *folder);
/* GtkFileSystemVolume methods */
gchar * gtk_file_system_volume_get_display_name (GtkFileSystemVolume *volume);
gboolean gtk_file_system_volume_is_mounted (GtkFileSystemVolume *volume);
GFile * gtk_file_system_volume_get_root (GtkFileSystemVolume *volume);
GdkPixbuf * gtk_file_system_volume_render_icon (GtkFileSystemVolume *volume,
GtkWidget *widget,
gint icon_size,
GError **error);
gchar * _gtk_file_system_volume_get_display_name (GtkFileSystemVolume *volume);
gboolean _gtk_file_system_volume_is_mounted (GtkFileSystemVolume *volume);
GFile * _gtk_file_system_volume_get_root (GtkFileSystemVolume *volume);
GdkPixbuf * _gtk_file_system_volume_render_icon (GtkFileSystemVolume *volume,
GtkWidget *widget,
gint icon_size,
GError **error);
void gtk_file_system_volume_free (GtkFileSystemVolume *volume);
void _gtk_file_system_volume_free (GtkFileSystemVolume *volume);
/* GtkFileSystemBookmark methods */
void gtk_file_system_bookmark_free (GtkFileSystemBookmark *bookmark);
void _gtk_file_system_bookmark_free (GtkFileSystemBookmark *bookmark);
/* GFileInfo helper functions */
GdkPixbuf * gtk_file_info_render_icon (GFileInfo *info,
GtkWidget *widget,
gint icon_size);
GdkPixbuf * _gtk_file_info_render_icon (GFileInfo *info,
GtkWidget *widget,
gint icon_size);
G_END_DECLS

38
gtk/gtkfilesystemmodel.c
View File

@ -682,10 +682,10 @@ _gtk_file_system_model_new (GtkFileSystem *file_system,
model->roots = NULL;
cancellable = gtk_file_system_get_folder (file_system, root_file,
attributes,
got_root_folder_cb,
g_object_ref (model));
cancellable = _gtk_file_system_get_folder (file_system, root_file,
attributes,
got_root_folder_cb,
g_object_ref (model));
if (!cancellable)
{
/* In this case got_root_folder_cb() will never be called, so we
@ -1056,10 +1056,10 @@ ref_path_cb (GCancellable *cancellable,
{
GCancellable *cancellable;
cancellable = gtk_file_system_get_folder (info->model->file_system,
info->files->data,
info->model->attributes,
ref_path_cb, data);
cancellable = _gtk_file_system_get_folder (info->model->file_system,
info->files->data,
info->model->attributes,
ref_path_cb, data);
info->model->pending_cancellables =
g_slist_append (info->model->pending_cancellables, cancellable);
}
@ -1187,10 +1187,10 @@ _gtk_file_system_model_path_do (GtkFileSystemModel *model,
{
GCancellable *cancellable;
cancellable = gtk_file_system_get_folder (model->file_system,
files->data,
model->attributes,
ref_path_cb, info);
cancellable = _gtk_file_system_get_folder (model->file_system,
files->data,
model->attributes,
ref_path_cb, info);
model->pending_cancellables = g_slist_append (model->pending_cancellables, cancellable);
}
}
@ -1300,8 +1300,8 @@ file_model_node_get_info (GtkFileSystemModel *model,
}
else if (node->parent || model->root_folder)
{
node->info = gtk_folder_get_info ((node->parent != NULL) ? node->parent->folder : model->root_folder,
node->file);
node->info = _gtk_folder_get_info ((node->parent != NULL) ? node->parent->folder : model->root_folder,
node->file);
}
else
g_assert_not_reached ();
@ -1565,11 +1565,11 @@ file_model_node_get_children (GtkFileSystemModel *model,
data->node = node;
cancellable =
gtk_file_system_get_folder (model->file_system,
node->file,
model->attributes,
get_children_get_folder_cb,
data);
_gtk_file_system_get_folder (model->file_system,
node->file,
model->attributes,
get_children_get_folder_cb,
data);
model->pending_cancellables = g_slist_append (model->pending_cancellables, cancellable);
node->load_pending = TRUE;

56
gtk/gtkpathbar.c
View File

@ -1202,8 +1202,8 @@ set_button_image_get_info_cb (GCancellable *cancellable,
if (cancelled || error)
goto out;
pixbuf = gtk_file_info_render_icon (info, GTK_WIDGET (data->path_bar),
data->path_bar->icon_size);
pixbuf = _gtk_file_info_render_icon (info, GTK_WIDGET (data->path_bar),
data->path_bar->icon_size);
gtk_image_set_from_pixbuf (GTK_IMAGE (data->button_data->image), pixbuf);
switch (data->button_data->type)
@ -1248,15 +1248,15 @@ set_button_image (GtkPathBar *path_bar,
break;
}
volume = gtk_file_system_get_volume_for_file (path_bar->file_system, path_bar->root_file);
volume = _gtk_file_system_get_volume_for_file (path_bar->file_system, path_bar->root_file);
if (volume == NULL)
return;
path_bar->root_icon = gtk_file_system_volume_render_icon (volume,
GTK_WIDGET (path_bar),
path_bar->icon_size,
NULL);
gtk_file_system_volume_free (volume);
path_bar->root_icon = _gtk_file_system_volume_render_icon (volume,
GTK_WIDGET (path_bar),
path_bar->icon_size,
NULL);
_gtk_file_system_volume_free (volume);
gtk_image_set_from_pixbuf (GTK_IMAGE (button_data->image), path_bar->root_icon);
break;
@ -1276,11 +1276,11 @@ set_button_image (GtkPathBar *path_bar,
g_cancellable_cancel (button_data->cancellable);
button_data->cancellable =
gtk_file_system_get_info (path_bar->file_system,
path_bar->home_file,
"standard::icon",
set_button_image_get_info_cb,
data);
_gtk_file_system_get_info (path_bar->file_system,
path_bar->home_file,
"standard::icon",
set_button_image_get_info_cb,
data);
break;
case DESKTOP_BUTTON:
@ -1298,11 +1298,11 @@ set_button_image (GtkPathBar *path_bar,
g_cancellable_cancel (button_data->cancellable);
button_data->cancellable =
gtk_file_system_get_info (path_bar->file_system,
path_bar->desktop_file,
"standard::icon",
set_button_image_get_info_cb,
data);
_gtk_file_system_get_info (path_bar->file_system,
path_bar->desktop_file,
"standard::icon",
set_button_image_get_info_cb,
data);
break;
default:
break;
@ -1681,11 +1681,11 @@ gtk_path_bar_get_info_callback (GCancellable *cancellable,
file_info->parent_file = g_file_get_parent (file_info->file);
file_info->path_bar->get_info_cancellable =
gtk_file_system_get_info (file_info->path_bar->file_system,
file_info->file,
"standard::display-name,standard::is-hidden",
gtk_path_bar_get_info_callback,
file_info);
_gtk_file_system_get_info (file_info->path_bar->file_system,
file_info->file,
"standard::display-name,standard::is-hidden",
gtk_path_bar_get_info_callback,
file_info);
}
gboolean
@ -1719,11 +1719,11 @@ _gtk_path_bar_set_file (GtkPathBar *path_bar,
g_cancellable_cancel (path_bar->get_info_cancellable);
path_bar->get_info_cancellable =
gtk_file_system_get_info (path_bar->file_system,
info->file,
"standard::display-name,standard::is-hidden",
gtk_path_bar_get_info_callback,
info);
_gtk_file_system_get_info (path_bar->file_system,
info->file,
"standard::display-name,standard::is-hidden",
gtk_path_bar_get_info_callback,
info);
return TRUE;
}