X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkfilechooserembed.c;h=336c2b3a4539e472470b54ebffae57d32f4fe917;hb=ba63578e626ed0c5f062c01aa47b4ac2438d54b3;hp=8fc3719809ea3b355d8806d4a2f7b58c220f198c;hpb=f4bbe8f0deb8d1c36829acfc791d632d27805f30;p=~andy%2Fgtk
diff --git a/gtk/gtkfilechooserembed.c b/gtk/gtkfilechooserembed.c
index 8fc371980..336c2b3a4 100644
--- a/gtk/gtkfilechooserembed.c
+++ b/gtk/gtkfilechooserembed.c
@@ -13,27 +13,24 @@
* 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 "config.h"
#include "gtkfilechooserembed.h"
#include "gtkmarshalers.h"
-#include "gtkalias.h"
+#include "gtkintl.h"
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,
gpointer data);
+static void delegate_response_requested (GtkFileChooserEmbed *chooser_embed,
+ gpointer data);
static GtkFileChooserEmbed *
get_delegate (GtkFileChooserEmbed *receiver)
@@ -54,7 +51,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;
}
@@ -66,8 +62,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,
@@ -76,10 +72,12 @@ _gtk_file_chooser_embed_set_delegate (GtkFileChooserEmbed *receiver,
g_return_if_fail (GTK_IS_FILE_CHOOSER_EMBED (receiver));
g_return_if_fail (GTK_IS_FILE_CHOOSER_EMBED (delegate));
- g_object_set_data (G_OBJECT (receiver), g_intern_static_string ("gtk-file-chooser-embed-delegate"), delegate);
+ 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_CALLBACK (delegate_response_requested), receiver);
}
@@ -91,14 +89,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)
@@ -119,6 +109,13 @@ delegate_default_size_changed (GtkFileChooserEmbed *chooser_embed,
g_signal_emit_by_name (data, "default-size-changed");
}
+static void
+delegate_response_requested (GtkFileChooserEmbed *chooser_embed,
+ gpointer data)
+{
+ g_signal_emit_by_name (data, "response-requested");
+}
+
/* publicly callable functions */
@@ -129,7 +126,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 */
@@ -138,7 +135,7 @@ _gtk_file_chooser_embed_get_type (void)
};
file_chooser_embed_type = g_type_register_static (G_TYPE_INTERFACE,
- g_intern_static_string ("GtkFileChooserEmbed"),
+ I_("GtkFileChooserEmbed"),
&file_chooser_embed_info, 0);
g_type_interface_add_prerequisite (file_chooser_embed_type, GTK_TYPE_WIDGET);
@@ -152,13 +149,20 @@ gtk_file_chooser_embed_class_init (gpointer g_iface)
{
GType iface_type = G_TYPE_FROM_INTERFACE (g_iface);
- g_signal_new ("default-size-changed",
+ g_signal_new (I_("default-size-changed"),
iface_type,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkFileChooserEmbedIface, default_size_changed),
NULL, NULL,
_gtk_marshal_VOID__VOID,
G_TYPE_NONE, 0);
+ g_signal_new (I_("response-requested"),
+ iface_type,
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GtkFileChooserEmbedIface, response_requested),
+ NULL, NULL,
+ _gtk_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
}
void
@@ -188,18 +192,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"