X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkfilechooserembed.c;h=327c5423c42a00c5405c32cd19cde5565a40fa28;hb=2de67d907b1eb63ac07ab1211f0a3e800439e18c;hp=1402a4a093bc49ede26367c6e3403467b42bf2fe;hpb=2b8e4e109baef1b9a3f86bf0208e4059eeb955f9;p=~andy%2Fgtk

diff --git a/gtk/gtkfilechooserembed.c b/gtk/gtkfilechooserembed.c
index 1402a4a09..327c5423c 100644
--- a/gtk/gtkfilechooserembed.c
+++ b/gtk/gtkfilechooserembed.c
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 #include "gtkfilechooserembed.h"
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
@@ -28,9 +28,6 @@ static void gtk_file_chooser_embed_class_init (gpointer g_iface);
 static void delegate_get_default_size         (GtkFileChooserEmbed *chooser_embed,
 					       gint                *default_width,
 					       gint                *default_height);
-static void delegate_get_resizable_hints      (GtkFileChooserEmbed *chooser_embed,
-					       gboolean            *resize_horizontally,
-					       gboolean            *resize_vertically);
 static gboolean delegate_should_respond       (GtkFileChooserEmbed *chooser_embed);
 static void delegate_initial_focus            (GtkFileChooserEmbed *chooser_embed);
 static void delegate_default_size_changed     (GtkFileChooserEmbed *chooser_embed,
@@ -57,7 +54,6 @@ void
 _gtk_file_chooser_embed_delegate_iface_init (GtkFileChooserEmbedIface *iface)
 {
   iface->get_default_size = delegate_get_default_size;
-  iface->get_resizable_hints = delegate_get_resizable_hints;
   iface->should_respond = delegate_should_respond;
   iface->initial_focus = delegate_initial_focus;
 }
@@ -69,8 +65,8 @@ _gtk_file_chooser_embed_delegate_iface_init (GtkFileChooserEmbedIface *iface)
  *
  * Establishes that calls on @receiver for #GtkFileChooser methods should be
  * delegated to @delegate, and that #GtkFileChooser signals emitted on @delegate
- * should be forwarded to @receiver. Must be used in confunction with
- * _gtk_file_chooser_delegate_iface_init().
+ * should be forwarded to @receiver. Must be used in conjunction with
+ * _gtk_file_chooser_embed_delegate_iface_init().
  **/
 void
 _gtk_file_chooser_embed_set_delegate (GtkFileChooserEmbed *receiver,
@@ -81,9 +77,9 @@ _gtk_file_chooser_embed_set_delegate (GtkFileChooserEmbed *receiver,
   
   g_object_set_data (G_OBJECT (receiver), I_("gtk-file-chooser-embed-delegate"), delegate);
 
-  g_signal_connect (delegate, "default_size_changed",
+  g_signal_connect (delegate, "default-size-changed",
 		    G_CALLBACK (delegate_default_size_changed), receiver);
-  g_signal_connect (delegate, "response_requested",
+  g_signal_connect (delegate, "response-requested",
 		    G_CALLBACK (delegate_response_requested), receiver);
 }
 
@@ -96,14 +92,6 @@ delegate_get_default_size (GtkFileChooserEmbed *chooser_embed,
 {
   _gtk_file_chooser_embed_get_default_size (get_delegate (chooser_embed), default_width, default_height);
 }
-     
-static void
-delegate_get_resizable_hints (GtkFileChooserEmbed *chooser_embed,
-			      gboolean            *resize_horizontally,
-			      gboolean            *resize_vertically)
-{
-  _gtk_file_chooser_embed_get_resizable_hints (get_delegate (chooser_embed), resize_horizontally, resize_vertically);
-}
 
 static gboolean
 delegate_should_respond (GtkFileChooserEmbed *chooser_embed)
@@ -141,7 +129,7 @@ _gtk_file_chooser_embed_get_type (void)
 
   if (!file_chooser_embed_type)
     {
-      static const GTypeInfo file_chooser_embed_info =
+      const GTypeInfo file_chooser_embed_info =
       {
 	sizeof (GtkFileChooserEmbedIface),  /* class_size */
 	NULL,                          /* base_init */
@@ -207,18 +195,3 @@ _gtk_file_chooser_embed_initial_focus (GtkFileChooserEmbed *chooser_embed)
 
   GTK_FILE_CHOOSER_EMBED_GET_IFACE (chooser_embed)->initial_focus (chooser_embed);
 }
-
-void
-_gtk_file_chooser_embed_get_resizable_hints (GtkFileChooserEmbed *chooser_embed,
-					     gboolean            *resize_horizontally,
-					     gboolean            *resize_vertically)
-{
-  g_return_if_fail (GTK_IS_FILE_CHOOSER_EMBED (chooser_embed));
-  g_return_if_fail (resize_horizontally != NULL);
-  g_return_if_fail (resize_vertically != NULL);
-
-  GTK_FILE_CHOOSER_EMBED_GET_IFACE (chooser_embed)->get_resizable_hints (chooser_embed, resize_horizontally, resize_vertically);
-}
-
-#define __GTK_FILE_CHOOSER_EMBED_C__
-#include "gtkaliasdef.c"