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

Remove deprecated GtkFileChooser functions

Browse Source
This commit is contained in:
Christian Dywan 2009-10-07 18:29:01 +02:00 committed by Javier Jardón
parent 07501cf02e
commit d21bf0c1ec
8 changed files with 1 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gtk/gtkfilechooserbutton.c
View File

@ -820,10 +820,6 @@ gtk_file_chooser_button_set_property (GObject *object,
fs_bookmarks_changed_cb (priv->fs, button); fs_bookmarks_changed_cb (priv->fs, button);
break; break;
case GTK_FILE_CHOOSER_PROP_FILE_SYSTEM_BACKEND:
/* Ignore property */
break;
case GTK_FILE_CHOOSER_PROP_SELECT_MULTIPLE: case GTK_FILE_CHOOSER_PROP_SELECT_MULTIPLE:
g_warning ("%s: Choosers of type `%s` do not support selecting multiple files.", g_warning ("%s: Choosers of type `%s` do not support selecting multiple files.",
G_STRFUNC, G_OBJECT_TYPE_NAME (object)); G_STRFUNC, G_OBJECT_TYPE_NAME (object));
@ -856,7 +852,6 @@ gtk_file_chooser_button_get_property (GObject *object,
case PROP_TITLE: case PROP_TITLE:
case GTK_FILE_CHOOSER_PROP_ACTION: case GTK_FILE_CHOOSER_PROP_ACTION:
case GTK_FILE_CHOOSER_PROP_FILE_SYSTEM_BACKEND:
case GTK_FILE_CHOOSER_PROP_FILTER: case GTK_FILE_CHOOSER_PROP_FILTER:
case GTK_FILE_CHOOSER_PROP_LOCAL_ONLY: case GTK_FILE_CHOOSER_PROP_LOCAL_ONLY:
case GTK_FILE_CHOOSER_PROP_PREVIEW_WIDGET: case GTK_FILE_CHOOSER_PROP_PREVIEW_WIDGET:
@ -2738,33 +2733,6 @@ gtk_file_chooser_button_new (const gchar *title,
NULL); NULL);
} }
/**
* gtk_file_chooser_button_new_with_backend:
* @title: the title of the browse dialog.
* @action: the open mode for the widget.
* @backend: the name of the #GtkFileSystem backend to use.
*
* Creates a new file-selecting button widget using @backend.
*
* Returns: a new button widget.
*
* Since: 2.6
* Deprecated: 2.14: Use gtk_file_chooser_button_new() instead.
**/
GtkWidget *
gtk_file_chooser_button_new_with_backend (const gchar *title,
GtkFileChooserAction action,
const gchar *backend)
{
g_return_val_if_fail (action == GTK_FILE_CHOOSER_ACTION_OPEN ||
action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, NULL);
return g_object_new (GTK_TYPE_FILE_CHOOSER_BUTTON,
"action", action,
"title", (title ? title : _(DEFAULT_TITLE)),
NULL);
}
/** /**
* gtk_file_chooser_button_new_with_dialog: * gtk_file_chooser_button_new_with_dialog:
* @dialog: the widget to use as dialog * @dialog: the widget to use as dialog

4
gtk/gtkfilechooserdefault.c
View File

@ -5440,10 +5440,6 @@ gtk_file_chooser_default_set_property (GObject *object,
} }
break; break;
case GTK_FILE_CHOOSER_PROP_FILE_SYSTEM_BACKEND:
/* Ignore property */
break;
case GTK_FILE_CHOOSER_PROP_FILTER: case GTK_FILE_CHOOSER_PROP_FILTER:
set_current_filter (impl, g_value_get_object (value)); set_current_filter (impl, g_value_get_object (value));
break; break;

43
gtk/gtkfilechooserdialog.c
View File

@ -308,10 +308,6 @@ gtk_file_chooser_dialog_set_property (GObject *object,
switch (prop_id) switch (prop_id)
{ {
case GTK_FILE_CHOOSER_PROP_FILE_SYSTEM_BACKEND:
g_free (priv->file_system);
priv->file_system = g_value_dup_string (value);
break;
default: default:
g_object_set_property (G_OBJECT (priv->widget), pspec->name, value); g_object_set_property (G_OBJECT (priv->widget), pspec->name, value);
break; break;
@ -468,44 +464,5 @@ gtk_file_chooser_dialog_new (const gchar *title,
return result; return result;
} }
/**
* gtk_file_chooser_dialog_new_with_backend:
* @title: (allow-none): Title of the dialog, or %NULL
* @parent: (allow-none): Transient parent of the dialog, or %NULL
* @action: Open or save mode for the dialog
* @backend: The name of the specific filesystem backend to use.
* @first_button_text: (allow-none): stock ID or text to go in the first button, or %NULL
* @Varargs: response ID for the first button, then additional (button, id) pairs, ending with %NULL
*
* Creates a new #GtkFileChooserDialog with a specified backend. This is
* especially useful if you use gtk_file_chooser_set_local_only() to allow
* non-local files and you use a more expressive vfs, such as gnome-vfs,
* to load files.
*
* Return value: a new #GtkFileChooserDialog
*
* Since: 2.4
* Deprecated: 2.14: Use gtk_file_chooser_dialog_new() instead.
**/
GtkWidget *
gtk_file_chooser_dialog_new_with_backend (const gchar *title,
GtkWindow *parent,
GtkFileChooserAction action,
const gchar *backend,
const gchar *first_button_text,
...)
{
GtkWidget *result;
va_list varargs;
va_start (varargs, first_button_text);
result = gtk_file_chooser_dialog_new_valist (title, parent, action,
backend, first_button_text,
varargs);
va_end (varargs);
return result;
}
#define __GTK_FILE_CHOOSER_DIALOG_C__ #define __GTK_FILE_CHOOSER_DIALOG_C__
#include "gtkaliasdef.c" #include "gtkaliasdef.c"

9
gtk/gtkfilechooserdialog.h
View File

@ -60,15 +60,6 @@ GtkWidget *gtk_file_chooser_dialog_new (const gchar *title
const gchar *first_button_text, const gchar *first_button_text,
...) G_GNUC_NULL_TERMINATED; ...) G_GNUC_NULL_TERMINATED;
#ifndef GTK_DISABLE_DEPRECATED
GtkWidget *gtk_file_chooser_dialog_new_with_backend (const gchar *title,
GtkWindow *parent,
GtkFileChooserAction action,
const gchar *backend,
const gchar *first_button_text,
...) G_GNUC_NULL_TERMINATED;
#endif /* GTK_DISABLE_DEPRECATED */
G_END_DECLS G_END_DECLS
#endif /* __GTK_FILE_CHOOSER_DIALOG_H__ */ #endif /* __GTK_FILE_CHOOSER_DIALOG_H__ */

3
gtk/gtkfilechooserutils.c
View File

@ -90,9 +90,6 @@ _gtk_file_chooser_install_properties (GObjectClass *klass)
g_object_class_override_property (klass, g_object_class_override_property (klass,
GTK_FILE_CHOOSER_PROP_EXTRA_WIDGET, GTK_FILE_CHOOSER_PROP_EXTRA_WIDGET,
"extra-widget"); "extra-widget");
g_object_class_override_property (klass,
GTK_FILE_CHOOSER_PROP_FILE_SYSTEM_BACKEND,
"file-system-backend");
g_object_class_override_property (klass, g_object_class_override_property (klass,
GTK_FILE_CHOOSER_PROP_FILTER, GTK_FILE_CHOOSER_PROP_FILTER,
"filter"); "filter");

2
gtk/gtkfilechooserutils.h
View File

@ -31,7 +31,7 @@ G_BEGIN_DECLS
typedef enum { typedef enum {
GTK_FILE_CHOOSER_PROP_FIRST = 0x1000, GTK_FILE_CHOOSER_PROP_FIRST = 0x1000,
GTK_FILE_CHOOSER_PROP_ACTION = GTK_FILE_CHOOSER_PROP_FIRST, GTK_FILE_CHOOSER_PROP_ACTION = GTK_FILE_CHOOSER_PROP_FIRST,
GTK_FILE_CHOOSER_PROP_FILE_SYSTEM_BACKEND, /* GTK_FILE_CHOOSER_PROP_FILE_SYSTEM_BACKEND, */
GTK_FILE_CHOOSER_PROP_FILTER, GTK_FILE_CHOOSER_PROP_FILTER,
GTK_FILE_CHOOSER_PROP_LOCAL_ONLY, GTK_FILE_CHOOSER_PROP_LOCAL_ONLY,
GTK_FILE_CHOOSER_PROP_PREVIEW_WIDGET, GTK_FILE_CHOOSER_PROP_PREVIEW_WIDGET,

29
gtk/gtkfilechooserwidget.c
View File

@ -126,10 +126,6 @@ gtk_file_chooser_widget_set_property (GObject *object,
switch (prop_id) switch (prop_id)
{ {
case GTK_FILE_CHOOSER_PROP_FILE_SYSTEM_BACKEND:
g_free (priv->file_system);
priv->file_system = g_value_dup_string (value);
break;
default: default:
g_object_set_property (G_OBJECT (priv->impl), pspec->name, value); g_object_set_property (G_OBJECT (priv->impl), pspec->name, value);
break; break;
@ -167,30 +163,5 @@ gtk_file_chooser_widget_new (GtkFileChooserAction action)
NULL); NULL);
} }
/**
* gtk_file_chooser_widget_new_with_backend:
* @action: Open or save mode for the widget
* @backend: The name of the specific filesystem backend to use.
*
* Creates a new #GtkFileChooserWidget with a specified backend. This is
* especially useful if you use gtk_file_chooser_set_local_only() to allow
* non-local files. This is a file chooser widget that can be embedded in
* custom windows and it is the same widget that is used by
* #GtkFileChooserDialog.
*
* Return value: a new #GtkFileChooserWidget
*
* Since: 2.4
* Deprecated: 2.14: Use gtk_file_chooser_widget_new() instead.
**/
GtkWidget *
gtk_file_chooser_widget_new_with_backend (GtkFileChooserAction action,
const gchar *backend)
{
return g_object_new (GTK_TYPE_FILE_CHOOSER_WIDGET,
"action", action,
NULL);
}
#define __GTK_FILE_CHOOSER_WIDGET_C__ #define __GTK_FILE_CHOOSER_WIDGET_C__
#include "gtkaliasdef.c" #include "gtkaliasdef.c"

6
gtk/gtkfilechooserwidget.h
View File

@ -56,12 +56,6 @@ struct _GtkFileChooserWidgetClass
GType gtk_file_chooser_widget_get_type (void) G_GNUC_CONST; GType gtk_file_chooser_widget_get_type (void) G_GNUC_CONST;
GtkWidget *gtk_file_chooser_widget_new (GtkFileChooserAction action); GtkWidget *gtk_file_chooser_widget_new (GtkFileChooserAction action);
#ifndef GTK_DISABLE_DEPRECATED
GtkWidget *gtk_file_chooser_widget_new_with_backend (GtkFileChooserAction action,
const gchar *backend);
#endif /* GTK_DISABLE_DEPRECATED */
G_END_DECLS G_END_DECLS
#endif /* __GTK_FILE_CHOOSER_WIDGET_H__ */ #endif /* __GTK_FILE_CHOOSER_WIDGET_H__ */