X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkfilechooserdialog.c;h=6ed41b68f31928d982878e43b9cc3438f878890d;hb=e54f8f4c623182b6870b27ef283cae2e71749662;hp=93ba739e7fdfeb16e0f4ce3f087ec67b5932959b;hpb=f667ed1996baf908c610419d7544dc9c95d308e2;p=~andy%2Fgtk diff --git a/gtk/gtkfilechooserdialog.c b/gtk/gtkfilechooserdialog.c index 93ba739e7..6ed41b68f 100644 --- a/gtk/gtkfilechooserdialog.c +++ b/gtk/gtkfilechooserdialog.c @@ -14,24 +14,185 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ -#include -#include "gtkfilechooserprivate.h" +#include "config.h" + #include "gtkfilechooserdialog.h" + +#include "gtkfilechooserprivate.h" #include "gtkfilechooserwidget.h" #include "gtkfilechooserutils.h" #include "gtkfilechooserembed.h" #include "gtkfilesystem.h" +#include "gtksizerequest.h" #include "gtktypebuiltins.h" #include "gtkintl.h" -#include "gtkalias.h" #include + +/** + * SECTION:gtkfilechooserdialog + * @Short_description: A file chooser dialog, suitable for "File/Open" or "File/Save" commands + * @Title: GtkFileChooserDialog + * @See_also: #GtkFileChooser, #GtkDialog + * + * #GtkFileChooserDialog is a dialog box suitable for use with + * "File/Open" or "File/Save as" commands. This widget works by + * putting a #GtkFileChooserWidget inside a #GtkDialog. It exposes + * the #GtkFileChooser interface, so you can use all of the + * #GtkFileChooser functions on the file chooser dialog as well as + * those for #GtkDialog. + * + * Note that #GtkFileChooserDialog does not have any methods of its + * own. Instead, you should use the functions that work on a + * #GtkFileChooser. + * + * + * Typical usage + * In the simplest of cases, you can the following code to use + * #GtkFileChooserDialog to select a file for opening: + * + * + * GtkWidget *dialog; + * + * dialog = gtk_file_chooser_dialog_new ("Open File", + * parent_window, + * GTK_FILE_CHOOSER_ACTION_OPEN, + * GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + * GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, + * NULL); + * + * if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) + * { + * char *filename; + * + * filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); + * open_file (filename); + * g_free (filename); + * } + * + * gtk_widget_destroy (dialog); + * + * + * To use a dialog for saving, you can use this: + * + * + * GtkWidget *dialog; + * + * dialog = gtk_file_chooser_dialog_new ("Save File", + * parent_window, + * GTK_FILE_CHOOSER_ACTION_SAVE, + * GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + * GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, + * NULL); + * gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE); + * + * if (user_edited_a_new_document) + * gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), "Untitled document"); + * else + * gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (dialog), filename_for_existing_document); + * + * if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) + * { + * char *filename; + * + * filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); + * save_to_file (filename); + * g_free (filename); + * } + * + * gtk_widget_destroy (dialog); + * + * + * + *
+ * Setting up a file chooser dialog + * There are various cases in which you may need to use a #GtkFileChooserDialog: + * To select a file for opening, as for a + * File/Open command. Use + * #GTK_FILE_CHOOSER_ACTION_OPEN. + * + * To save a file for the first time, as for a + * File/Save command. Use + * #GTK_FILE_CHOOSER_ACTION_SAVE, and suggest a name such as + * "Untitled" with gtk_file_chooser_set_current_name(). + * + * To save a file under a different name, as for a + * File/Save As command. Use + * #GTK_FILE_CHOOSER_ACTION_SAVE, and set the existing filename + * with gtk_file_chooser_set_filename(). + * + * To choose a folder instead of a file. Use + * #GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER. + * + * + * + * Old versions of the file chooser's documentation suggested + * using gtk_file_chooser_set_current_folder() in various + * situations, with the intention of letting the application + * suggest a reasonable default folder. This is no longer + * considered to be a good policy, as now the file chooser is + * able to make good suggestions on its own. In general, you + * should only cause the file chooser to show a specific folder + * when it is appropriate to use gtk_file_chooser_set_filename(), + * i.e. when you are doing a File/Save + * As command and you already + * have a file saved somewhere. + * + * + *
+ *
+ * Response Codes + * #GtkFileChooserDialog inherits from #GtkDialog, so buttons that + * go in its action area have response codes such as + * #GTK_RESPONSE_ACCEPT and #GTK_RESPONSE_CANCEL. For example, you + * could call gtk_file_chooser_dialog_new() as follows: + * + * + * GtkWidget *dialog; + * + * dialog = gtk_file_chooser_dialog_new ("Open File", + * parent_window, + * GTK_FILE_CHOOSER_ACTION_OPEN, + * GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + * GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, + * NULL); + * + * + * This will create buttons for "Cancel" and "Open" that use stock + * response identifiers from #GtkResponseType. For most dialog + * boxes you can use your own custom response codes rather than the + * ones in #GtkResponseType, but #GtkFileChooserDialog assumes that + * its "accept"-type action, e.g. an "Open" or "Save" button, + * will have one of the following response + * codes: + * + * + * #GTK_RESPONSE_ACCEPT + * #GTK_RESPONSE_OK + * #GTK_RESPONSE_YES + * #GTK_RESPONSE_APPLY + * + * + * This is because #GtkFileChooserDialog must intercept responses + * and switch to folders if appropriate, rather than letting the + * dialog terminate — the implementation uses these known + * response codes to know which responses can be blocked if + * appropriate. + * + * + * To summarize, make sure you use a + * stock response code + * when you use #GtkFileChooserDialog to ensure proper operation. + * + * + *
+ */ + + #define GTK_FILE_CHOOSER_DIALOG_GET_PRIVATE(o) (GTK_FILE_CHOOSER_DIALOG (o)->priv) static void gtk_file_chooser_dialog_finalize (GObject *object); @@ -72,6 +233,8 @@ gtk_file_chooser_dialog_class_init (GtkFileChooserDialogClass *class) widget_class->map = gtk_file_chooser_dialog_map; widget_class->unmap = gtk_file_chooser_dialog_unmap; + gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_FILE_CHOOSER); + _gtk_file_chooser_install_properties (gobject_class); g_type_class_add_private (class, sizeof (GtkFileChooserDialogPrivate)); @@ -80,6 +243,7 @@ gtk_file_chooser_dialog_class_init (GtkFileChooserDialogClass *class) static void gtk_file_chooser_dialog_init (GtkFileChooserDialog *dialog) { + GtkWidget *action_area, *content_area; GtkFileChooserDialogPrivate *priv = G_TYPE_INSTANCE_GET_PRIVATE (dialog, GTK_TYPE_FILE_CHOOSER_DIALOG, GtkFileChooserDialogPrivate); @@ -88,10 +252,14 @@ gtk_file_chooser_dialog_init (GtkFileChooserDialog *dialog) dialog->priv = priv; dialog->priv->response_requested = FALSE; - gtk_dialog_set_has_separator (fc_dialog, FALSE); + content_area = gtk_dialog_get_content_area (fc_dialog); + action_area = gtk_dialog_get_action_area (fc_dialog); + gtk_container_set_border_width (GTK_CONTAINER (fc_dialog), 5); - gtk_box_set_spacing (GTK_BOX (fc_dialog->vbox), 2); /* 2 * 5 + 2 = 12 */ - gtk_container_set_border_width (GTK_CONTAINER (fc_dialog->action_area), 5); + gtk_box_set_spacing (GTK_BOX (content_area), 2); /* 2 * 5 + 2 = 12 */ + gtk_container_set_border_width (GTK_CONTAINER (action_area), 5); + + gtk_window_set_role (GTK_WINDOW (dialog), "GtkFileChooserDialog"); /* We do a signal connection here rather than overriding the method in * class_init because GtkDialog::response is a RUN_LAST signal. We want *our* @@ -112,11 +280,22 @@ gtk_file_chooser_dialog_finalize (GObject *object) G_OBJECT_CLASS (gtk_file_chooser_dialog_parent_class)->finalize (object); } +static gboolean +is_stock_accept_response_id (int response_id) +{ + return (response_id == GTK_RESPONSE_ACCEPT + || response_id == GTK_RESPONSE_OK + || response_id == GTK_RESPONSE_YES + || response_id == GTK_RESPONSE_APPLY); +} + /* Callback used when the user activates a file in the file chooser widget */ static void file_chooser_widget_file_activated (GtkFileChooser *chooser, GtkFileChooserDialog *dialog) { + GtkDialog *fc_dialog = GTK_DIALOG (dialog); + GtkWidget *action_area; GList *children, *l; if (gtk_window_activate_default (GTK_WINDOW (dialog))) @@ -125,8 +304,8 @@ file_chooser_widget_file_activated (GtkFileChooser *chooser, /* There probably isn't a default widget, so make things easier for the * programmer by looking for a reasonable button on our own. */ - - children = gtk_container_get_children (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area)); + action_area = gtk_dialog_get_action_area (fc_dialog); + children = gtk_container_get_children (GTK_CONTAINER (action_area)); for (l = children; l; l = l->next) { @@ -134,11 +313,9 @@ file_chooser_widget_file_activated (GtkFileChooser *chooser, int response_id; widget = GTK_WIDGET (l->data); - response_id = gtk_dialog_get_response_for_widget (GTK_DIALOG (dialog), widget); - if (response_id == GTK_RESPONSE_ACCEPT - || response_id == GTK_RESPONSE_OK - || response_id == GTK_RESPONSE_YES - || response_id == GTK_RESPONSE_APPLY) + response_id = gtk_dialog_get_response_for_widget (fc_dialog, widget); + if (gtk_widget_is_sensitive (widget) && + is_stock_accept_response_id (response_id)) { gtk_widget_activate (widget); /* Should we gtk_dialog_response (dialog, response_id) instead? */ break; @@ -148,80 +325,68 @@ file_chooser_widget_file_activated (GtkFileChooser *chooser, g_list_free (children); } +#if 0 +/* FIXME: to see why this function is ifdef-ed out, see the comment below in + * file_chooser_widget_default_size_changed(). + */ static void -clamp_to_screen (GtkWidget *widget, - gint *width, - gint *height) +load_position (int *out_xpos, int *out_ypos) { - GdkScreen *screen; - int monitor_num; - GdkRectangle monitor; + GtkFileChooserSettings *settings; + int x, y, width, height; - g_return_if_fail (GTK_WIDGET_REALIZED (widget)); - - screen = gtk_widget_get_screen (widget); - monitor_num = gdk_screen_get_monitor_at_window (screen, widget->window); + settings = _gtk_file_chooser_settings_new (); + _gtk_file_chooser_settings_get_geometry (settings, &x, &y, &width, &height); + g_object_unref (settings); - gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); - - if (width) - *width = MIN (*width, (monitor.width * 3) / 4); - - if (height) - *height = MIN (*height, (monitor.height * 3) / 4); + *out_xpos = x; + *out_ypos = y; } +#endif static void file_chooser_widget_default_size_changed (GtkWidget *widget, GtkFileChooserDialog *dialog) { GtkFileChooserDialogPrivate *priv; - gint width, height; gint default_width, default_height; GtkRequisition req, widget_req; - gboolean resizable; priv = GTK_FILE_CHOOSER_DIALOG_GET_PRIVATE (dialog); /* Unset any previously set size */ gtk_widget_set_size_request (GTK_WIDGET (dialog), -1, -1); - if (GTK_WIDGET_DRAWABLE (widget)) + if (gtk_widget_is_drawable (widget)) { /* Force a size request of everything before we start. This will make sure * that widget->requisition is meaningful. */ - gtk_widget_size_request (GTK_WIDGET (dialog), &req); - gtk_widget_size_request (widget, &widget_req); - - width = req.width - widget_req.width; - height = req.height - widget_req.height; - } - else - { - width = GTK_WIDGET (dialog)->allocation.width - widget->allocation.width; - height = GTK_WIDGET (dialog)->allocation.height - widget->allocation.height; + gtk_widget_get_preferred_size (GTK_WIDGET (dialog), + &req, NULL); + gtk_widget_get_preferred_size (widget, + &widget_req, NULL); } - resizable = _gtk_file_chooser_embed_get_resizable (GTK_FILE_CHOOSER_EMBED (priv->widget)); _gtk_file_chooser_embed_get_default_size (GTK_FILE_CHOOSER_EMBED (priv->widget), &default_width, &default_height); - /* Ideal target size plus any extra size */ - width = default_width + width + (2 * GTK_CONTAINER (dialog)->border_width); - height = default_height + height + (2 * GTK_CONTAINER (dialog)->border_width); + gtk_window_resize (GTK_WINDOW (dialog), default_width, default_height); - if (GTK_WIDGET_REALIZED (dialog)) - clamp_to_screen (GTK_WIDGET (dialog), &width, &height); - - if (resizable) - { - gtk_window_set_resizable (GTK_WINDOW (dialog), resizable); - gtk_window_resize (GTK_WINDOW (dialog), width, height); - } - else + if (!gtk_widget_get_mapped (GTK_WIDGET (dialog))) { - gtk_widget_set_size_request (GTK_WIDGET (dialog), width, -1); - gtk_window_set_resizable (GTK_WINDOW (dialog), resizable); +#if 0 + /* FIXME: the code to restore the position does not work yet. It is not + * clear whether it is actually desirable --- if enabled, applications + * would not be able to say "center the file chooser on top of my toplevel + * window". So, we don't use this code at all. + */ + load_position (&xpos, &ypos); + if (xpos >= 0 && ypos >= 0) + { + gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_NONE); + gtk_window_move (GTK_WINDOW (dialog), xpos, ypos); + } +#endif } } @@ -229,13 +394,20 @@ static void file_chooser_widget_response_requested (GtkWidget *widget, GtkFileChooserDialog *dialog) { + GtkDialog *fc_dialog = GTK_DIALOG (dialog); + GtkWidget *action_area; GList *children, *l; + dialog->priv->response_requested = TRUE; + + if (gtk_window_activate_default (GTK_WINDOW (dialog))) + return; + /* There probably isn't a default widget, so make things easier for the * programmer by looking for a reasonable button on our own. */ - - children = gtk_container_get_children (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area)); + action_area = gtk_dialog_get_action_area (fc_dialog); + children = gtk_container_get_children (GTK_CONTAINER (action_area)); for (l = children; l; l = l->next) { @@ -243,18 +415,18 @@ file_chooser_widget_response_requested (GtkWidget *widget, int response_id; widget = GTK_WIDGET (l->data); - response_id = gtk_dialog_get_response_for_widget (GTK_DIALOG (dialog), widget); - if (response_id == GTK_RESPONSE_ACCEPT - || response_id == GTK_RESPONSE_OK - || response_id == GTK_RESPONSE_YES - || response_id == GTK_RESPONSE_APPLY) + response_id = gtk_dialog_get_response_for_widget (fc_dialog, widget); + if (gtk_widget_is_sensitive (widget) && + is_stock_accept_response_id (response_id)) { - dialog->priv->response_requested = TRUE; gtk_widget_activate (widget); /* Should we gtk_dialog_response (dialog, response_id) instead? */ break; } } + if (l == NULL) + dialog->priv->response_requested = FALSE; + g_list_free (children); } @@ -264,6 +436,7 @@ gtk_file_chooser_dialog_constructor (GType type, GObjectConstructParam *construct_params) { GtkFileChooserDialogPrivate *priv; + GtkWidget *content_area; GObject *object; object = G_OBJECT_CLASS (gtk_file_chooser_dialog_parent_class)->constructor (type, @@ -275,7 +448,6 @@ gtk_file_chooser_dialog_constructor (GType type, if (priv->file_system) priv->widget = g_object_new (GTK_TYPE_FILE_CHOOSER_WIDGET, - "file-system-backend", priv->file_system, NULL); else priv->widget = g_object_new (GTK_TYPE_FILE_CHOOSER_WIDGET, NULL); @@ -287,8 +459,10 @@ gtk_file_chooser_dialog_constructor (GType type, g_signal_connect (priv->widget, "response-requested", G_CALLBACK (file_chooser_widget_response_requested), object); + content_area = gtk_dialog_get_content_area (GTK_DIALOG (object)); + gtk_container_set_border_width (GTK_CONTAINER (priv->widget), 5); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (object)->vbox), priv->widget, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (content_area), priv->widget, TRUE, TRUE, 0); gtk_widget_show (priv->widget); @@ -311,10 +485,6 @@ gtk_file_chooser_dialog_set_property (GObject *object, 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: g_object_set_property (G_OBJECT (priv->widget), pspec->name, value); break; @@ -332,56 +502,28 @@ gtk_file_chooser_dialog_get_property (GObject *object, g_object_get_property (G_OBJECT (priv->widget), pspec->name, value); } -#if 0 static void -set_default_size (GtkFileChooserDialog *dialog) +foreach_ensure_default_response_cb (GtkWidget *widget, + gpointer data) { - GtkWidget *widget; - GtkWindow *window; - int default_width, default_height; - int width, height; - int font_size; - GdkScreen *screen; - int monitor_num; - GtkRequisition req; - GdkRectangle monitor; - - widget = GTK_WIDGET (dialog); - window = GTK_WINDOW (dialog); - - /* Size based on characters */ - - font_size = pango_font_description_get_size (widget->style->font_desc); - font_size = PANGO_PIXELS (font_size); - - width = font_size * NUM_CHARS; - height = font_size * NUM_LINES; - - /* Use at least the requisition size... */ - - gtk_widget_size_request (widget, &req); - width = MAX (width, req.width); - height = MAX (height, req.height); - - /* ... but no larger than the monitor */ - - screen = gtk_widget_get_screen (widget); - monitor_num = gdk_screen_get_monitor_at_window (screen, widget->window); + GtkFileChooserDialog *dialog = GTK_FILE_CHOOSER_DIALOG (data); + int response_id; - gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); - - width = MIN (width, monitor.width * 3 / 4); - height = MIN (height, monitor.height * 3 / 4); - - /* Set size */ + response_id = gtk_dialog_get_response_for_widget (GTK_DIALOG (dialog), widget); + if (is_stock_accept_response_id (response_id)) + gtk_dialog_set_default_response (GTK_DIALOG (dialog), response_id); +} - gtk_window_get_default_size (window, &default_width, &default_height); +static void +ensure_default_response (GtkFileChooserDialog *dialog) +{ + GtkWidget *action_area; - gtk_window_set_default_size (window, - (default_width == -1) ? width : default_width, - (default_height == -1) ? height : default_height); + action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog)); + gtk_container_foreach (GTK_CONTAINER (action_area), + foreach_ensure_default_response_cb, + dialog); } -#endif /* GtkWidget::map handler */ static void @@ -390,31 +532,40 @@ gtk_file_chooser_dialog_map (GtkWidget *widget) GtkFileChooserDialog *dialog = GTK_FILE_CHOOSER_DIALOG (widget); GtkFileChooserDialogPrivate *priv = GTK_FILE_CHOOSER_DIALOG_GET_PRIVATE (dialog); - if (!GTK_WIDGET_MAPPED (priv->widget)) - gtk_widget_map (priv->widget); + ensure_default_response (dialog); - file_chooser_widget_default_size_changed (priv->widget, dialog); _gtk_file_chooser_embed_initial_focus (GTK_FILE_CHOOSER_EMBED (priv->widget)); GTK_WIDGET_CLASS (gtk_file_chooser_dialog_parent_class)->map (widget); } +static void +save_dialog_geometry (GtkFileChooserDialog *dialog) +{ + GtkWindow *window; + GSettings *settings; + int x, y, width, height; + + settings = _gtk_file_chooser_get_settings_for_widget (GTK_WIDGET (dialog)); + + window = GTK_WINDOW (dialog); + + gtk_window_get_position (window, &x, &y); + gtk_window_get_size (window, &width, &height); + + g_settings_set (settings, SETTINGS_KEY_WINDOW_POSITION, "(ii)", x, y); + g_settings_set (settings, SETTINGS_KEY_WINDOW_SIZE, "(ii)", width, height); +} + /* GtkWidget::unmap handler */ static void gtk_file_chooser_dialog_unmap (GtkWidget *widget) { GtkFileChooserDialog *dialog = GTK_FILE_CHOOSER_DIALOG (widget); - GtkFileChooserDialogPrivate *priv = GTK_FILE_CHOOSER_DIALOG_GET_PRIVATE (dialog); - GTK_WIDGET_CLASS (gtk_file_chooser_dialog_parent_class)->unmap (widget); + save_dialog_geometry (dialog); - /* See bug #145470. We unmap the GtkFileChooserWidget so that if the dialog - * is remapped, the widget will be remapped as well. Implementations should - * refresh their contents when this happens, as some applications keep a - * single file chooser alive and map/unmap it as needed, rather than creating - * a new file chooser every time they need one. - */ - gtk_widget_unmap (priv->widget); + GTK_WIDGET_CLASS (gtk_file_chooser_dialog_parent_class)->unmap (widget); } /* GtkDialog::response handler */ @@ -427,12 +578,9 @@ response_cb (GtkDialog *dialog, priv = GTK_FILE_CHOOSER_DIALOG_GET_PRIVATE (dialog); /* Act only on response IDs we recognize */ - if ((response_id == GTK_RESPONSE_ACCEPT || - response_id == GTK_RESPONSE_OK || - response_id == GTK_RESPONSE_YES || - response_id == GTK_RESPONSE_APPLY) && - !priv->response_requested && - !_gtk_file_chooser_embed_should_respond (GTK_FILE_CHOOSER_EMBED (priv->widget))) + if (is_stock_accept_response_id (response_id) + && !priv->response_requested + && !_gtk_file_chooser_embed_should_respond (GTK_FILE_CHOOSER_EMBED (priv->widget))) { g_signal_stop_emission_by_name (dialog, "response"); } @@ -444,7 +592,6 @@ static GtkWidget * gtk_file_chooser_dialog_new_valist (const gchar *title, GtkWindow *parent, GtkFileChooserAction action, - const gchar *backend, const gchar *first_button_text, va_list varargs) { @@ -455,7 +602,6 @@ gtk_file_chooser_dialog_new_valist (const gchar *title, result = g_object_new (GTK_TYPE_FILE_CHOOSER_DIALOG, "title", title, "action", action, - "file-system-backend", backend, NULL); if (parent) @@ -473,11 +619,11 @@ gtk_file_chooser_dialog_new_valist (const gchar *title, /** * gtk_file_chooser_dialog_new: - * @title: Title of the dialog, or %NULL - * @parent: Transient parent of the dialog, or %NULL + * @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 - * @first_button_text: 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 + * @first_button_text: (allow-none): stock ID or text to go in the first button, or %NULL + * @...: response ID for the first button, then additional (button, id) pairs, ending with %NULL * * Creates a new #GtkFileChooserDialog. This function is analogous to * gtk_dialog_new_with_buttons(). @@ -498,50 +644,9 @@ gtk_file_chooser_dialog_new (const gchar *title, va_start (varargs, first_button_text); result = gtk_file_chooser_dialog_new_valist (title, parent, action, - NULL, first_button_text, - varargs); - va_end (varargs); - - return result; -} - -/** - * gtk_file_chooser_dialog_new_with_backend: - * @title: Title of the dialog, or %NULL - * @parent: 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: 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 - **/ -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, + first_button_text, varargs); va_end (varargs); return result; } - -#define __GTK_FILE_CHOOSER_DIALOG_C__ -#include "gtkaliasdef.c"