Revert name change

[~andy/gtk] / gtk / gtkfilechooserwidget.c

diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index 2e9d3bef4d3e46a2264a5e2b7db1096963399934..bb0792117f96f70d4af094491b2e11091407e228 100644 (file)
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -18,22 +18,19 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
+#include "gtkfilechooserprivate.h"
+
 #include "gtkfilechooserwidget.h"
 #include "gtkfilechooserdefault.h"
 #include "gtkfilechooserutils.h"
 #include "gtktypebuiltins.h"
-
-struct _GtkFileChooserWidgetPrivate
-{
-  GtkWidget *impl;
-
-  char *file_system;
-};
+#include "gtkfilechooserembed.h"
+#include "gtkintl.h"
+#include "gtkalias.h"
 
 #define GTK_FILE_CHOOSER_WIDGET_GET_PRIVATE(o)  (GTK_FILE_CHOOSER_WIDGET (o)->priv)
 
-static void gtk_file_chooser_widget_class_init   (GtkFileChooserWidgetClass *class);
-static void gtk_file_chooser_widget_init         (GtkFileChooserWidget      *chooser_widget);
 static void gtk_file_chooser_widget_finalize     (GObject                   *object);
 
 static GObject* gtk_file_chooser_widget_constructor  (GType                  type,
@@ -48,52 +45,17 @@ static void     gtk_file_chooser_widget_get_property (GObject               *obj
                                                      GValue                *value,
                                                      GParamSpec            *pspec);
 
-static GObjectClass *parent_class;
-
-GType
-gtk_file_chooser_widget_get_type (void)
-{
-  static GType file_chooser_widget_type = 0;
-
-  if (!file_chooser_widget_type)
-    {
-      static const GTypeInfo file_chooser_widget_info =
-      {
-       sizeof (GtkFileChooserWidgetClass),
-       NULL,           /* base_init */
-       NULL,           /* base_finalize */
-       (GClassInitFunc) gtk_file_chooser_widget_class_init,
-       NULL,           /* class_finalize */
-       NULL,           /* class_data */
-       sizeof (GtkFileChooserWidget),
-       0,              /* n_preallocs */
-       (GInstanceInitFunc) gtk_file_chooser_widget_init,
-      };
-      
-      static const GInterfaceInfo file_chooser_info =
-      {
-       (GInterfaceInitFunc) _gtk_file_chooser_delegate_iface_init, /* interface_init */
-       NULL,                                                       /* interface_finalize */
-       NULL                                                        /* interface_data */
-      };
-
-      file_chooser_widget_type = g_type_register_static (GTK_TYPE_VBOX, "GtkFileChooserWidget",
-                                                        &file_chooser_widget_info, 0);
-      g_type_add_interface_static (file_chooser_widget_type,
-                                  GTK_TYPE_FILE_CHOOSER,
-                                  &file_chooser_info);
-    }
-
-  return file_chooser_widget_type;
-}
+G_DEFINE_TYPE_WITH_CODE (GtkFileChooserWidget, gtk_file_chooser_widget, GTK_TYPE_VBOX,
+                        G_IMPLEMENT_INTERFACE (GTK_TYPE_FILE_CHOOSER,
+                                               _gtk_file_chooser_delegate_iface_init)
+                        G_IMPLEMENT_INTERFACE (GTK_TYPE_FILE_CHOOSER_EMBED,
+                                               _gtk_file_chooser_embed_delegate_iface_init))
 
 static void
 gtk_file_chooser_widget_class_init (GtkFileChooserWidgetClass *class)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (class);
 
-  parent_class = g_type_class_peek_parent (class);
-
   gobject_class->constructor = gtk_file_chooser_widget_constructor;
   gobject_class->set_property = gtk_file_chooser_widget_set_property;
   gobject_class->get_property = gtk_file_chooser_widget_get_property;
@@ -119,6 +81,8 @@ gtk_file_chooser_widget_finalize (GObject *object)
   GtkFileChooserWidget *chooser = GTK_FILE_CHOOSER_WIDGET (object);
 
   g_free (chooser->priv->file_system);
+
+  G_OBJECT_CLASS (gtk_file_chooser_widget_parent_class)->finalize (object);
 }
 
 static GObject*
@@ -128,12 +92,10 @@ gtk_file_chooser_widget_constructor (GType                  type,
 {
   GtkFileChooserWidgetPrivate *priv;
   GObject *object;
-  gchar *current_folder;
-  gchar *current_folder_uri;
   
-  object = parent_class->constructor (type,
-                                     n_construct_properties,
-                                     construct_params);
+  object = G_OBJECT_CLASS (gtk_file_chooser_widget_parent_class)->constructor (type,
+                                                                              n_construct_properties,
+                                                                              construct_params);
   priv = GTK_FILE_CHOOSER_WIDGET_GET_PRIVATE (object);
 
   gtk_widget_push_composite_child ();
@@ -143,17 +105,11 @@ gtk_file_chooser_widget_constructor (GType                  type,
   gtk_box_pack_start (GTK_BOX (object), priv->impl, TRUE, TRUE, 0);
   gtk_widget_show (priv->impl);
 
-  current_folder = g_get_current_dir ();
-  current_folder_uri = g_filename_to_uri (current_folder, NULL, NULL);
-  if (current_folder_uri)
-    {
-      gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (priv->impl), current_folder_uri);
-      g_free (current_folder_uri);
-    }
-  g_free (current_folder);
-  
   _gtk_file_chooser_set_delegate (GTK_FILE_CHOOSER (object),
                                  GTK_FILE_CHOOSER (priv->impl));
+
+  _gtk_file_chooser_embed_set_delegate (GTK_FILE_CHOOSER_EMBED (object),
+                                       GTK_FILE_CHOOSER_EMBED (priv->impl));
   
   gtk_widget_pop_composite_child ();
 
@@ -210,3 +166,31 @@ gtk_file_chooser_widget_new (GtkFileChooserAction action)
                       "action", action,
                       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
+ **/
+GtkWidget *
+gtk_file_chooser_widget_new_with_backend (GtkFileChooserAction  action,
+                                         const gchar          *backend)
+{
+  return g_object_new (GTK_TYPE_FILE_CHOOSER_WIDGET,
+                      "action", action,
+                      "file-system-backend", backend,
+                      NULL);
+}
+
+#define __GTK_FILE_CHOOSER_WIDGET_C__
+#include "gtkaliasdef.c"