diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2005-09-01 05:11:46 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-09-01 05:11:46 +0000 |
| commit | 94eec042676a8e18cebc9af8f27cd251355f4ba4 (patch) | |
| tree | 51b9ff698258fc9799413f62fb82589c8d525f0e | |
| parent | f4bbe8f0deb8d1c36829acfc791d632d27805f30 (diff) | |
| download | gtk+-94eec042676a8e18cebc9af8f27cd251355f4ba4.tar.gz | |
Intern some more strings.
2005-09-01 Matthias Clasen <mclasen@redhat.com>
* gdk/*.c: Intern some more strings.
* gtk/gtkintl.h:
* gtk/*.c: Define an I_() macro and use it instead of the
bulky g_intern_static_string().
185 files changed, 799 insertions, 699 deletions
@@ -1,5 +1,17 @@ +2005-09-01 Matthias Clasen <mclasen@redhat.com> + + * gdk/*.c: Intern some more strings. + * gtk/gtkintl.h: + * gtk/*.c: Define an I_() macro and use it instead of the + bulky g_intern_static_string(). + 2005-08-31 Matthias Clasen <mclasen@redhat.com> - + + * gtk/gtkbindings.c (binding_signal_new): Intern the signal name + instead of copying it. + + * gtk/gtktypeutils.c (gtk_identifier_get_type): Some more string interning. + * gtk/*.c: Also intern static strings passed to g_object_set_data(). diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index fcaa747507..d705b2c430 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,17 @@ +2005-09-01 Matthias Clasen <mclasen@redhat.com> + + * gdk/*.c: Intern some more strings. + * gtk/gtkintl.h: + * gtk/*.c: Define an I_() macro and use it instead of the + bulky g_intern_static_string(). + 2005-08-31 Matthias Clasen <mclasen@redhat.com> - + + * gtk/gtkbindings.c (binding_signal_new): Intern the signal name + instead of copying it. + + * gtk/gtktypeutils.c (gtk_identifier_get_type): Some more string interning. + * gtk/*.c: Also intern static strings passed to g_object_set_data(). diff --git a/configure.in b/configure.in index 9647faa704..fb5dfb5851 100644 --- a/configure.in +++ b/configure.in @@ -31,7 +31,7 @@ m4_define([gtk_api_version], [2.0]) m4_define([gtk_binary_version], [2.4.0]) # required versions of other packages -m4_define([glib_required_version], [2.7.1]) +m4_define([glib_required_version], [2.9.0]) m4_define([pango_required_version], [1.9.0]) m4_define([atk_required_version], [1.0.1]) m4_define([cairo_required_version], [0.9.2]) diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c index 986fcdf25d..f11e35672a 100644 --- a/gdk/gdkdisplay.c +++ b/gdk/gdkdisplay.c @@ -134,7 +134,7 @@ gdk_display_class_init (GdkDisplayClass *class) * Since: 2.2 */ signals[CLOSED] = - g_signal_new ("closed", + g_signal_new (g_intern_static_string ("closed"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GdkDisplayClass, closed), diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c index ca603624ea..b506472281 100644 --- a/gdk/gdkdisplaymanager.c +++ b/gdk/gdkdisplaymanager.c @@ -113,7 +113,7 @@ gdk_display_manager_class_init (GdkDisplayManagerClass *klass) * Since: 2.2 */ signals[DISPLAY_OPENED] = - g_signal_new ("display_opened", + g_signal_new (g_intern_static_string ("display_opened"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GdkDisplayManagerClass, display_opened), diff --git a/gdk/gdkpango.c b/gdk/gdkpango.c index 4ddec897c5..809f1c3f1b 100644 --- a/gdk/gdkpango.c +++ b/gdk/gdkpango.c @@ -546,7 +546,8 @@ on_renderer_display_closed (GdkDisplay *display, g_signal_handlers_disconnect_by_func (renderer->priv->screen, (gpointer)on_renderer_display_closed, renderer); - g_object_set_data (G_OBJECT (renderer->priv->screen), "gdk-pango-renderer", NULL); + g_object_set_data (G_OBJECT (renderer->priv->screen), + g_intern_static_string ("gdk-pango-renderer"), NULL); } /** @@ -579,7 +580,8 @@ gdk_pango_renderer_get_default (GdkScreen *screen) if (!renderer) { renderer = gdk_pango_renderer_new (screen); - g_object_set_data_full (G_OBJECT (screen), "gdk-pango-renderer", renderer, + g_object_set_data_full (G_OBJECT (screen), + g_intern_static_string ("gdk-pango-renderer"), renderer, (GDestroyNotify)g_object_unref); g_signal_connect (gdk_screen_get_display (screen), "closed", diff --git a/gdk/gdkscreen.c b/gdk/gdkscreen.c index 94c4f96eb7..9493e8e7f8 100644 --- a/gdk/gdkscreen.c +++ b/gdk/gdkscreen.c @@ -103,7 +103,8 @@ gdk_screen_class_init (GdkScreenClass *klass) g_param_spec_pointer ("font-options", P_("Font options"), P_("The default font options for the screen"), - G_PARAM_READWRITE)); + G_PARAM_READWRITE|G_PARAM_STATIC_NAME| + G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB)); g_object_class_install_property (object_class, PROP_RESOLUTION, @@ -113,7 +114,8 @@ gdk_screen_class_init (GdkScreenClass *klass) -G_MAXDOUBLE, G_MAXDOUBLE, -1.0, - G_PARAM_READWRITE)); + G_PARAM_READWRITE|G_PARAM_STATIC_NAME| + G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB)); /** * GdkScreen::size-changed: @@ -125,7 +127,7 @@ gdk_screen_class_init (GdkScreenClass *klass) * Since: 2.2 */ signals[SIZE_CHANGED] = - g_signal_new ("size_changed", + g_signal_new (g_intern_static_string ("size_changed"), G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GdkScreenClass, size_changed), diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c index 7f2a2a5a38..9ec43e3be4 100644 --- a/gdk/x11/gdkscreen-x11.c +++ b/gdk/x11/gdkscreen-x11.c @@ -97,7 +97,7 @@ gdk_screen_x11_class_init (GdkScreenX11Class *klass) parent_class = g_type_class_peek_parent (klass); signals[WINDOW_MANAGER_CHANGED] = - g_signal_new ("window_manager_changed", + g_signal_new (g_intern_static_string ("window_manager_changed"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GdkScreenX11Class, window_manager_changed), diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c index c1cfb59bc5..a5cbe6e423 100644 --- a/gtk/gtkaboutdialog.c +++ b/gtk/gtkaboutdialog.c @@ -1139,7 +1139,7 @@ gtk_about_dialog_set_website (GtkAboutDialog *about, if (activate_url_hook != NULL) { g_object_set_data_full (G_OBJECT (priv->website_button), - g_intern_static_string ("url"), + I_("url"), g_strdup (website), g_free); if (priv->website_label == NULL) gtk_about_dialog_set_website_label (about, website); @@ -1158,7 +1158,7 @@ gtk_about_dialog_set_website (GtkAboutDialog *about, { priv->website = NULL; g_object_set_data (G_OBJECT (priv->website_button), - g_intern_static_string ("url"), NULL); + I_("url"), NULL); gtk_widget_hide (priv->website_button); } g_free (tmp); @@ -1696,7 +1696,7 @@ create_link_button (GtkWidget *about, gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE); g_object_set_data_full (G_OBJECT (button), - g_intern_static_string ("url"), + I_("url"), g_strdup (url), g_free); set_link_button_text (about, button, text); @@ -1991,10 +1991,10 @@ add_credits_page (GtkAboutDialog *about, { q1++; q0++; - link_type = g_intern_static_string ("email"); + link_type = I_("email"); } else - link_type = g_intern_static_string ("url"); + link_type = I_("url"); link = g_strndup (q1, q2 - q1); tag = gtk_text_buffer_create_tag (buffer, NULL, @@ -2297,7 +2297,7 @@ gtk_show_about_dialog (GtkWindow *parent, gtk_window_set_transient_for (GTK_WINDOW (dialog), parent); gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE); g_object_set_data_full (G_OBJECT (parent), - g_intern_static_string ("gtk-about-dialog"), + I_("gtk-about-dialog"), dialog, g_object_unref); } else diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c index 4ca34fd833..d7324d4e5a 100644 --- a/gtk/gtkaccelgroup.c +++ b/gtk/gtkaccelgroup.c @@ -78,7 +78,7 @@ gtk_accel_group_get_type (void) (GInstanceInitFunc) gtk_accel_group_init, }; - object_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkAccelGroup"), + object_type = g_type_register_static (G_TYPE_OBJECT, I_("GtkAccelGroup"), &object_info, 0); } @@ -111,7 +111,7 @@ gtk_accel_group_class_init (GtkAccelGroupClass *class) * Returns: %TRUE if the accelerator was activated */ signal_accel_activate = - g_signal_new ("accel_activate", + g_signal_new (I_("accel_activate"), G_OBJECT_CLASS_TYPE (class), G_SIGNAL_DETAILED, 0, @@ -136,7 +136,7 @@ gtk_accel_group_class_init (GtkAccelGroupClass *class) * their visual representation if the @accel_closure is theirs. */ signal_accel_changed = - g_signal_new ("accel_changed", + g_signal_new (I_("accel_changed"), G_OBJECT_CLASS_TYPE (class), G_SIGNAL_RUN_FIRST | G_SIGNAL_DETAILED, G_STRUCT_OFFSET (GtkAccelGroupClass, accel_changed), diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c index ffd8056f3a..fd159c34ba 100644 --- a/gtk/gtkaccellabel.c +++ b/gtk/gtkaccellabel.c @@ -85,7 +85,7 @@ gtk_accel_label_get_type (void) }; accel_label_type = - g_type_register_static (GTK_TYPE_LABEL, g_intern_static_string ("GtkAccelLabel"), + g_type_register_static (GTK_TYPE_LABEL, I_("GtkAccelLabel"), &accel_label_info, 0); } diff --git a/gtk/gtkaccelmap.c b/gtk/gtkaccelmap.c index 7b9d049ce1..98150ed221 100644 --- a/gtk/gtkaccelmap.c +++ b/gtk/gtkaccelmap.c @@ -23,6 +23,7 @@ #include "gtkmarshalers.h" #include "gtkwindow.h" /* in lack of GtkAcceleratable */ +#include "gtkintl.h" #include "gtkalias.h" #include <glib/gstdio.h> @@ -953,7 +954,7 @@ gtk_accel_map_class_init (GtkAccelMapClass *accel_map_class) * * Since: 2.4 */ - accel_map_signals[CHANGED] = g_signal_new ("changed", + accel_map_signals[CHANGED] = g_signal_new (I_("changed"), G_TYPE_FROM_CLASS (accel_map_class), G_SIGNAL_DETAILED|G_SIGNAL_RUN_LAST, 0, diff --git a/gtk/gtkaccessible.c b/gtk/gtkaccessible.c index e39d382f12..d6cb43cbdb 100644 --- a/gtk/gtkaccessible.c +++ b/gtk/gtkaccessible.c @@ -21,6 +21,7 @@ #include <string.h> #include "gtkwidget.h" +#include "gtkintl.h" #include "gtkaccessible.h" #include "gtkalias.h" @@ -49,7 +50,7 @@ gtk_accessible_get_type (void) }; accessible_type = - g_type_register_static (ATK_TYPE_OBJECT, g_intern_static_string ("GtkAccessible"), + g_type_register_static (ATK_TYPE_OBJECT, I_("GtkAccessible"), &accessible_info, 0); } diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c index c4f67d1e50..6665d893e2 100644 --- a/gtk/gtkaction.c +++ b/gtk/gtkaction.c @@ -132,7 +132,7 @@ gtk_action_get_type (void) }; type = g_type_register_static (G_TYPE_OBJECT, - g_intern_static_string ("GtkAction"), + I_("GtkAction"), &type_info, 0); } return type; @@ -308,7 +308,7 @@ gtk_action_class_init (GtkActionClass *klass) * Since: 2.4 */ action_signals[ACTIVATE] = - g_signal_new ("activate", + g_signal_new (I_("activate"), G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE, G_STRUCT_OFFSET (GtkActionClass, activate), NULL, NULL, @@ -798,7 +798,7 @@ connect_proxy (GtkAction *action, GtkWidget *proxy) { g_object_ref (action); - g_object_set_data_full (G_OBJECT (proxy), g_intern_static_string ("gtk-action"), action, + g_object_set_data_full (G_OBJECT (proxy), I_("gtk-action"), action, g_object_unref); /* add this widget to the list of proxies */ @@ -982,7 +982,7 @@ static void disconnect_proxy (GtkAction *action, GtkWidget *proxy) { - g_object_set_data (G_OBJECT (proxy), g_intern_static_string ("gtk-action"), NULL); + g_object_set_data (G_OBJECT (proxy), I_("gtk-action"), NULL); /* remove proxy from list of proxies */ g_signal_handlers_disconnect_by_func (proxy, diff --git a/gtk/gtkactiongroup.c b/gtk/gtkactiongroup.c index 2554dc0d08..7910644d60 100644 --- a/gtk/gtkactiongroup.c +++ b/gtk/gtkactiongroup.c @@ -106,7 +106,7 @@ gtk_action_group_get_type (void) (GInstanceInitFunc) gtk_action_group_init, }; - type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkActionGroup"), + type = g_type_register_static (G_TYPE_OBJECT, I_("GtkActionGroup"), &type_info, 0); } @@ -172,7 +172,7 @@ gtk_action_group_class_init (GtkActionGroupClass *klass) * Since: 2.4 */ action_group_signals[CONNECT_PROXY] = - g_signal_new ("connect_proxy", + g_signal_new (I_("connect_proxy"), G_OBJECT_CLASS_TYPE (klass), 0, 0, NULL, NULL, _gtk_marshal_VOID__OBJECT_OBJECT, @@ -195,7 +195,7 @@ gtk_action_group_class_init (GtkActionGroupClass *klass) * Since: 2.4 */ action_group_signals[DISCONNECT_PROXY] = - g_signal_new ("disconnect_proxy", + g_signal_new (I_("disconnect_proxy"), G_OBJECT_CLASS_TYPE (klass), 0, 0, NULL, NULL, _gtk_marshal_VOID__OBJECT_OBJECT, @@ -216,7 +216,7 @@ gtk_action_group_class_init (GtkActionGroupClass *klass) * Since: 2.4 */ action_group_signals[PRE_ACTIVATE] = - g_signal_new ("pre_activate", + g_signal_new (I_("pre_activate"), G_OBJECT_CLASS_TYPE (klass), 0, 0, NULL, NULL, _gtk_marshal_VOID__OBJECT, @@ -237,7 +237,7 @@ gtk_action_group_class_init (GtkActionGroupClass *klass) * Since: 2.4 */ action_group_signals[POST_ACTIVATE] = - g_signal_new ("post_activate", + g_signal_new (I_("post_activate"), G_OBJECT_CLASS_TYPE (klass), 0, 0, NULL, NULL, _gtk_marshal_VOID__OBJECT, diff --git a/gtk/gtkadjustment.c b/gtk/gtkadjustment.c index bc5f8064b2..6f31797bae 100644 --- a/gtk/gtkadjustment.c +++ b/gtk/gtkadjustment.c @@ -85,7 +85,7 @@ gtk_adjustment_get_type (void) }; adjustment_type = - g_type_register_static (GTK_TYPE_OBJECT, g_intern_static_string ("GtkAdjustment"), + g_type_register_static (GTK_TYPE_OBJECT, I_("GtkAdjustment"), &adjustment_info, 0); } @@ -213,7 +213,7 @@ gtk_adjustment_class_init (GtkAdjustmentClass *class) adjustment_signals[CHANGED] = - g_signal_new ("changed", + g_signal_new (I_("changed"), G_OBJECT_CLASS_TYPE (class), G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE, G_STRUCT_OFFSET (GtkAdjustmentClass, changed), @@ -221,7 +221,7 @@ gtk_adjustment_class_init (GtkAdjustmentClass *class) _gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); adjustment_signals[VALUE_CHANGED] = - g_signal_new ("value_changed", + g_signal_new (I_("value_changed"), G_OBJECT_CLASS_TYPE (class), G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE, G_STRUCT_OFFSET (GtkAdjustmentClass, value_changed), diff --git a/gtk/gtkalignment.c b/gtk/gtkalignment.c index ec00ac5862..0248ca285a 100644 --- a/gtk/gtkalignment.c +++ b/gtk/gtkalignment.c @@ -91,7 +91,7 @@ gtk_alignment_get_type (void) (GInstanceInitFunc) gtk_alignment_init, }; - alignment_type = g_type_register_static (GTK_TYPE_BIN, g_intern_static_string ("GtkAlignment"), + alignment_type = g_type_register_static (GTK_TYPE_BIN, I_("GtkAlignment"), &alignment_info, 0); } diff --git a/gtk/gtkarrow.c b/gtk/gtkarrow.c index 60f3723c3c..6635816df2 100644 --- a/gtk/gtkarrow.c +++ b/gtk/gtkarrow.c @@ -76,7 +76,7 @@ gtk_arrow_get_type (void) (GInstanceInitFunc) gtk_arrow_init, }; - arrow_type = g_type_register_static (GTK_TYPE_MISC, g_intern_static_string ("GtkArrow"), + arrow_type = g_type_register_static (GTK_TYPE_MISC, I_("GtkArrow"), &arrow_info, 0); } diff --git a/gtk/gtkaspectframe.c b/gtk/gtkaspectframe.c index 59fb042823..f15ccec17c 100644 --- a/gtk/gtkaspectframe.c +++ b/gtk/gtkaspectframe.c @@ -82,7 +82,7 @@ gtk_aspect_frame_get_type (void) }; aspect_frame_type = - g_type_register_static (GTK_TYPE_FRAME, g_intern_static_string ("GtkAspectFrame"), + g_type_register_static (GTK_TYPE_FRAME, I_("GtkAspectFrame"), &aspect_frame_info, 0); } diff --git a/gtk/gtkbbox.c b/gtk/gtkbbox.c index 088a2be407..f30656a773 100644 --- a/gtk/gtkbbox.c +++ b/gtk/gtkbbox.c @@ -89,7 +89,7 @@ gtk_button_box_get_type (void) }; button_box_type = - g_type_register_static (GTK_TYPE_BOX, g_intern_static_string ("GtkButtonBox"), + g_type_register_static (GTK_TYPE_BOX, I_("GtkButtonBox"), &button_box_info, G_TYPE_FLAG_ABSTRACT); } diff --git a/gtk/gtkbin.c b/gtk/gtkbin.c index 073c909566..a1a8bf1311 100644 --- a/gtk/gtkbin.c +++ b/gtk/gtkbin.c @@ -26,6 +26,7 @@ #include <config.h> #include "gtkbin.h" +#include "gtkintl.h" #include "gtkalias.h" @@ -66,7 +67,7 @@ gtk_bin_get_type (void) NULL, /* value_table */ }; - bin_type = g_type_register_static (GTK_TYPE_CONTAINER, g_intern_static_string ("GtkBin"), + bin_type = g_type_register_static (GTK_TYPE_CONTAINER, I_("GtkBin"), &bin_info, G_TYPE_FLAG_ABSTRACT); } diff --git a/gtk/gtkbindings.c b/gtk/gtkbindings.c index 7127d4d506..46a786f496 100644 --- a/gtk/gtkbindings.c +++ b/gtk/gtkbindings.c @@ -67,7 +67,7 @@ binding_signal_new (const gchar *signal_name, signal = g_new (GtkBindingSignal, 1); signal->next = NULL; - signal->signal_name = g_strdup (signal_name); + signal->signal_name = g_intern_string (signal_name); signal->n_args = n_args; signal->args = g_new0 (GtkBindingArg, n_args); @@ -85,7 +85,6 @@ binding_signal_free (GtkBindingSignal *sig) g_free (sig->args[i].d.string_data); } g_free (sig->args); - g_free (sig->signal_name); g_free (sig); } diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c index a70ccd7dfb..1ddabd2160 100644 --- a/gtk/gtkbox.c +++ b/gtk/gtkbox.c @@ -100,7 +100,7 @@ gtk_box_get_type (void) NULL, /* value_table */ }; - box_type = g_type_register_static (GTK_TYPE_CONTAINER, g_intern_static_string ("GtkBox"), + box_type = g_type_register_static (GTK_TYPE_CONTAINER, I_("GtkBox"), &box_info, G_TYPE_FLAG_ABSTRACT); } diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c index 8e7db584b3..fe7e529404 100644 --- a/gtk/gtkbutton.c +++ b/gtk/gtkbutton.c @@ -165,7 +165,7 @@ gtk_button_get_type (void) (GInstanceInitFunc) gtk_button_init, }; - button_type = g_type_register_static (GTK_TYPE_BIN, g_intern_static_string ("GtkButton"), + button_type = g_type_register_static (GTK_TYPE_BIN, I_("GtkButton"), &button_info, 0); } @@ -323,7 +323,7 @@ gtk_button_class_init (GtkButtonClass *klass) * @Deprecated: Use the GtkWidget::button-press-event signal. */ button_signals[PRESSED] = - g_signal_new ("pressed", + g_signal_new (I_("pressed"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkButtonClass, pressed), @@ -340,7 +340,7 @@ gtk_button_class_init (GtkButtonClass *klass) * @Deprecated: Use the GtkWidget::button-release-event signal. */ button_signals[RELEASED] = - g_signal_new ("released", + g_signal_new (I_("released"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkButtonClass, released), @@ -355,7 +355,7 @@ gtk_button_class_init (GtkButtonClass *klass) * Emitted when the button has been activated (pressed and released). */ button_signals[CLICKED] = - g_signal_new ("clicked", + g_signal_new (I_("clicked"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkButtonClass, clicked), @@ -372,7 +372,7 @@ gtk_button_class_init (GtkButtonClass *klass) * @Deprecated: Use the GtkWidget::enter-notify-event signal. */ button_signals[ENTER] = - g_signal_new ("enter", + g_signal_new (I_("enter"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkButtonClass, enter), @@ -389,7 +389,7 @@ gtk_button_class_init (GtkButtonClass *klass) * @Deprecated: Use the GtkWidget::leave-notify-event signal. */ button_signals[LEAVE] = - g_signal_new ("leave", + g_signal_new (I_("leave"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkButtonClass, leave), @@ -407,7 +407,7 @@ gtk_button_class_init (GtkButtonClass *klass) * "clicked" signal. */ button_signals[ACTIVATE] = - g_signal_new ("activate", + g_signal_new (I_("activate"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkButtonClass, activate), @@ -1797,7 +1797,7 @@ gtk_button_screen_changed (GtkWidget *widget, g_signal_connect (settings, "notify::gtk-button-images", G_CALLBACK (gtk_button_setting_changed), 0); g_object_set_data (G_OBJECT (settings), - g_intern_static_string ("gtk-button-connection"), + I_("gtk-button-connection"), GUINT_TO_POINTER (show_image_connection)); show_image_change_notify (GTK_BUTTON (widget)); diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c index 1b4b03d927..f1ecd1d480 100644 --- a/gtk/gtkcalendar.c +++ b/gtk/gtkcalendar.c @@ -495,7 +495,7 @@ gtk_calendar_class_init (GtkCalendarClass *class) GTK_PARAM_READWRITE)); gtk_calendar_signals[MONTH_CHANGED_SIGNAL] = - g_signal_new ("month_changed", + g_signal_new (I_("month_changed"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkCalendarClass, month_changed), @@ -503,7 +503,7 @@ gtk_calendar_class_init (GtkCalendarClass *class) _gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); gtk_calendar_signals[DAY_SELECTED_SIGNAL] = - g_signal_new ("day_selected", + g_signal_new (I_("day_selected"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkCalendarClass, day_selected), @@ -511,7 +511,7 @@ gtk_calendar_class_init (GtkCalendarClass *class) _gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); gtk_calendar_signals[DAY_SELECTED_DOUBLE_CLICK_SIGNAL] = - g_signal_new ("day_selected_double_click", + g_signal_new (I_("day_selected_double_click"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkCalendarClass, day_selected_double_click), @@ -519,7 +519,7 @@ gtk_calendar_class_init (GtkCalendarClass *class) _gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); gtk_calendar_signals[PREV_MONTH_SIGNAL] = - g_signal_new ("prev_month", + g_signal_new (I_("prev_month"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkCalendarClass, prev_month), @@ -527,7 +527,7 @@ gtk_calendar_class_init (GtkCalendarClass *class) _gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); gtk_calendar_signals[NEXT_MONTH_SIGNAL] = - g_signal_new ("next_month", + g_signal_new (I_("next_month"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkCalendarClass, next_month), @@ -535,7 +535,7 @@ gtk_calendar_class_init (GtkCalendarClass *class) _gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); gtk_calendar_signals[PREV_YEAR_SIGNAL] = - g_signal_new ("prev_year", + g_signal_new (I_("prev_year"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkCalendarClass, prev_year), @@ -543,7 +543,7 @@ gtk_calendar_class_init (GtkCalendarClass *class) _gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); gtk_calendar_signals[NEXT_YEAR_SIGNAL] = - g_signal_new ("next_year", + g_signal_new (I_("next_year"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkCalendarClass, next_year), @@ -2886,7 +2886,7 @@ set_status_pending (GdkDragContext *context, GdkDragAction suggested_action) { g_object_set_data (G_OBJECT (context), - g_intern_static_string ("gtk-calendar-status-pending"), + I_("gtk-calendar-status-pending"), GINT_TO_POINTER (suggested_action)); } diff --git a/gtk/gtkcelleditable.c b/gtk/gtkcelleditable.c index 7400ec7758..e35b5c7672 100644 --- a/gtk/gtkcelleditable.c +++ b/gtk/gtkcelleditable.c @@ -21,6 +21,7 @@ #include <config.h> #include "gtkcelleditable.h" #include "gtkmarshalers.h" +#include "gtkintl.h" #include "gtkalias.h" static void gtk_cell_editable_base_init (gpointer g_class); @@ -46,7 +47,7 @@ gtk_cell_editable_get_type (void) }; cell_editable_type = - g_type_register_static (G_TYPE_INTERFACE, g_intern_static_string ("GtkCellEditable"), + g_type_register_static (G_TYPE_INTERFACE, I_("GtkCellEditable"), &cell_editable_info, 0); g_type_interface_add_prerequisite (cell_editable_type, GTK_TYPE_WIDGET); @@ -62,14 +63,14 @@ gtk_cell_editable_base_init (gpointer g_class) if (! initialized) { - g_signal_new ("editing_done", + g_signal_new (I_("editing_done"), GTK_TYPE_CELL_EDITABLE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkCellEditableIface, editing_done), NULL, NULL, _gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); - g_signal_new ("remove_widget", + g_signal_new (I_("remove_widget"), GTK_TYPE_CELL_EDITABLE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkCellEditableIface, remove_widget), diff --git a/gtk/gtkcelllayout.c b/gtk/gtkcelllayout.c index f39bf9d68c..1fb7232aee 100644 --- a/gtk/gtkcelllayout.c +++ b/gtk/gtkcelllayout.c @@ -19,6 +19,7 @@ #include <config.h> #include "gtkcelllayout.h" +#include "gtkintl.h" #include "gtkalias.h" GType @@ -42,7 +43,7 @@ gtk_cell_layout_get_type (void) }; cell_layout_type = - g_type_register_static (G_TYPE_INTERFACE, g_intern_static_string ("GtkCellLayout"), + g_type_register_static (G_TYPE_INTERFACE, I_("GtkCellLayout"), &cell_layout_info, 0); g_type_interface_add_prerequisite (cell_layout_type, G_TYPE_OBJECT); diff --git a/gtk/gtkcellrenderer.c b/gtk/gtkcellrenderer.c index 4df4c4c23c..3f4d52e3bf 100644 --- a/gtk/gtkcellrenderer.c +++ b/gtk/gtkcellrenderer.c @@ -97,7 +97,7 @@ gtk_cell_renderer_get_type (void) NULL, /* value_table */ }; - cell_type = g_type_register_static (GTK_TYPE_OBJECT, g_intern_static_string ("GtkCellRenderer"), + cell_type = g_type_register_static (GTK_TYPE_OBJECT, I_("GtkCellRenderer"), &cell_info, G_TYPE_FLAG_ABSTRACT); } @@ -145,7 +145,7 @@ gtk_cell_renderer_class_init (GtkCellRendererClass *class) * Since: 2.4 */ cell_renderer_signals[EDITING_CANCELED] = - g_signal_new ("editing-canceled", + g_signal_new (I_("editing-canceled"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkCellRendererClass, editing_canceled), @@ -190,7 +190,7 @@ gtk_cell_renderer_class_init (GtkCellRendererClass *class) * Since: 2.6 */ cell_renderer_signals[EDITING_STARTED] = - g_signal_new ("editing-started", + g_signal_new (I_("editing-started"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkCellRendererClass, editing_started), diff --git a/gtk/gtkcellrenderercombo.c b/gtk/gtkcellrenderercombo.c index c47cc3360c..b34bb058ca 100644 --- a/gtk/gtkcellrenderercombo.c +++ b/gtk/gtkcellrenderercombo.c @@ -378,7 +378,7 @@ gtk_cell_renderer_combo_start_editing (GtkCellRenderer *cell, g_object_set (combo, "has-frame", FALSE, NULL); g_object_set_data_full (G_OBJECT (combo), - g_intern_static_string (GTK_CELL_RENDERER_COMBO_PATH), + I_(GTK_CELL_RENDERER_COMBO_PATH), g_strdup (path), g_free); gtk_widget_show (combo); diff --git a/gtk/gtkcellrendererpixbuf.c b/gtk/gtkcellrendererpixbuf.c index 0aad2d8aab..dfdb59fef4 100644 --- a/gtk/gtkcellrendererpixbuf.c +++ b/gtk/gtkcellrendererpixbuf.c @@ -107,7 +107,7 @@ gtk_cell_renderer_pixbuf_get_type (void) }; cell_pixbuf_type = - g_type_register_static (GTK_TYPE_CELL_RENDERER, g_intern_static_string ("GtkCellRendererPixbuf"), + g_type_register_static (GTK_TYPE_CELL_RENDERER, I_("GtkCellRendererPixbuf"), &cell_pixbuf_info, 0); } diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c index 0c090b3e40..5c1434b05d 100644 --- a/gtk/gtkcellrenderertext.c +++ b/gtk/gtkcellrenderertext.c @@ -171,7 +171,7 @@ gtk_cell_renderer_text_get_type (void) }; cell_text_type = - g_type_register_static (GTK_TYPE_CELL_RENDERER, g_intern_static_string ("GtkCellRendererText"), + g_type_register_static (GTK_TYPE_CELL_RENDERER, I_("GtkCellRendererText"), &cell_text_info, 0); } @@ -564,7 +564,7 @@ gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class) P_("Whether this tag affects the ellipsize mode")); text_cell_renderer_signals [EDITED] = - g_signal_new ("edited", + g_signal_new (I_("edited"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkCellRendererTextClass, edited), @@ -1806,7 +1806,7 @@ gtk_cell_renderer_text_start_editing (GtkCellRenderer *cell, if (celltext->text) gtk_entry_set_text (GTK_ENTRY (priv->entry), celltext->text); - g_object_set_data_full (G_OBJECT (priv->entry), g_intern_static_string (GTK_CELL_RENDERER_TEXT_PATH), g_strdup (path), g_free); + g_object_set_data_full (G_OBJECT (priv->entry), I_(GTK_CELL_RENDERER_TEXT_PATH), g_strdup (path), g_free); gtk_editable_select_region (GTK_EDITABLE (priv->entry), 0, -1); diff --git a/gtk/gtkcellrenderertoggle.c b/gtk/gtkcellrenderertoggle.c index 3ccd6f867e..6cec148035 100644 --- a/gtk/gtkcellrenderertoggle.c +++ b/gtk/gtkcellrenderertoggle.c @@ -106,7 +106,7 @@ gtk_cell_renderer_toggle_get_type (void) }; cell_toggle_type = - g_type_register_static (GTK_TYPE_CELL_RENDERER, g_intern_static_string ("GtkCellRendererToggle"), + g_type_register_static (GTK_TYPE_CELL_RENDERER, I_("GtkCellRendererToggle"), &cell_toggle_info, 0); } @@ -179,7 +179,7 @@ gtk_cell_renderer_toggle_class_init (GtkCellRendererToggleClass *class) * The ::toggled signal is emitted when the cell is toggled. **/ toggle_cell_signals[TOGGLED] = - g_signal_new ("toggled", + g_signal_new (I_("toggled"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkCellRendererToggleClass, toggled), diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c index 047fbc794e..0df21966e4 100644 --- a/gtk/gtkcellview.c +++ b/gtk/gtkcellview.c @@ -149,7 +149,7 @@ gtk_cell_view_get_type (void) NULL }; - cell_view_type = g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkCellView"), + cell_view_type = g_type_register_static (GTK_TYPE_WIDGET, I_("GtkCellView"), &cell_view_info, 0); g_type_add_interface_static (cell_view_type, GTK_TYPE_CELL_LAYOUT, diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c index 2ee76f97c7..a65772c890 100644 --- a/gtk/gtkcheckbutton.c +++ b/gtk/gtkcheckbutton.c @@ -75,7 +75,7 @@ gtk_check_button_get_type (void) }; check_button_type = - g_type_register_static (GTK_TYPE_TOGGLE_BUTTON, g_intern_static_string ("GtkCheckButton"), + g_type_register_static (GTK_TYPE_TOGGLE_BUTTON, I_("GtkCheckButton"), &check_button_info, 0); } diff --git a/gtk/gtkcheckmenuitem.c b/gtk/gtkcheckmenuitem.c index 91788ab467..9c8ef0f275 100644 --- a/gtk/gtkcheckmenuitem.c +++ b/gtk/gtkcheckmenuitem.c @@ -90,7 +90,7 @@ gtk_check_menu_item_get_type (void) }; check_menu_item_type = - g_type_register_static (GTK_TYPE_MENU_ITEM, g_intern_static_string ("GtkCheckMenuItem"), + g_type_register_static (GTK_TYPE_MENU_ITEM, I_("GtkCheckMenuItem"), &check_menu_item_info, 0); } @@ -157,7 +157,7 @@ gtk_check_menu_item_class_init (GtkCheckMenuItemClass *klass) klass->draw_indicator = gtk_real_check_menu_item_draw_indicator; check_menu_item_signals[TOGGLED] = - g_signal_new ("toggled", + g_signal_new (I_("toggled"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkCheckMenuItemClass, toggled), diff --git a/gtk/gtkclipboard.c b/gtk/gtkclipboard.c index fd8790ce01..d30c0ea454 100644 --- a/gtk/gtkclipboard.c +++ b/gtk/gtkclipboard.c @@ -27,6 +27,7 @@ #include "gtkinvisible.h" #include "gtkmain.h" #include "gtkmarshalers.h" +#include "gtkintl.h" #include "gtkalias.h" #ifdef GDK_WINDOWING_X11 @@ -160,7 +161,7 @@ gtk_clipboard_get_type (void) (GInstanceInitFunc) NULL, }; - clipboard_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkClipboard"), + clipboard_type = g_type_register_static (G_TYPE_OBJECT, I_("GtkClipboard"), &clipboard_info, 0); } @@ -179,7 +180,7 @@ gtk_clipboard_class_init (GtkClipboardClass *class) class->owner_change = gtk_clipboard_owner_change; clipboard_signals[OWNER_CHANGE] = - g_signal_new ("owner_change", + g_signal_new (I_("owner_change"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkClipboardClass, owner_change), @@ -208,7 +209,7 @@ gtk_clipboard_finalize (GObject *object) clipboards = g_object_get_data (G_OBJECT (clipboard->display), "gtk-clipboard-list"); clipboards = g_slist_remove (clipboards, clipboard); - g_object_set_data (G_OBJECT (clipboard->display), g_intern_static_string ("gtk-clipboard-list"), clipboards); + g_object_set_data (G_OBJECT (clipboard->display), I_("gtk-clipboard-list"), clipboards); if (g_main_loop_is_running (clipboard->store_loop)) { @@ -237,7 +238,7 @@ clipboard_display_closed (GdkDisplay *display, clipboards = g_object_get_data (G_OBJECT (display), "gtk-clipboard-list"); g_object_run_dispose (G_OBJECT (clipboard)); clipboards = g_slist_remove (clipboards, clipboard); - g_object_set_data (G_OBJECT (display), g_intern_static_string ("gtk-clipboard-list"), clipboards); + g_object_set_data (G_OBJECT (display), I_("gtk-clipboard-list"), clipboards); g_object_unref (clipboard); } @@ -372,7 +373,7 @@ get_clipboard_widget (GdkDisplay *display) if (!clip_widget) { clip_widget = make_clipboard_widget (display, TRUE); - g_object_set_data (G_OBJECT (display), g_intern_static_string ("gtk-clipboard-widget"), clip_widget); + g_object_set_data (G_OBJECT (display), I_("gtk-clipboard-widget"), clip_widget); } return clip_widget; @@ -1502,7 +1503,7 @@ clipboard_peek (GdkDisplay *display, clipboard->n_cached_targets = -1; clipboard->n_storable_targets = -1; clipboards = g_slist_prepend (clipboards, clipboard); - g_object_set_data (G_OBJECT (display), g_intern_static_string ("gtk-clipboard-list"), clipboards); + g_object_set_data (G_OBJECT (display), I_("gtk-clipboard-list"), clipboards); g_signal_connect (display, "closed", G_CALLBACK (clipboard_display_closed), clipboard); gdk_display_request_selection_notification (display, selection); diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c index 883939c289..93c9ee3bbd 100644 --- a/gtk/gtkclist.c +++ b/gtk/gtkclist.c @@ -39,6 +39,7 @@ #include "gtkbindings.h" #include "gtkdnd.h" #include "gtkmarshalers.h" +#include "gtkintl.h" #include <gdk/gdkkeysyms.h> #include "gtkalias.h" @@ -488,7 +489,7 @@ gtk_clist_get_type (void) (GtkClassInitFunc) NULL, }; - g_intern_static_string ("GtkCList"); + I_("GtkCList"); clist_type = gtk_type_unique (GTK_TYPE_CONTAINER, &clist_info); } @@ -611,7 +612,7 @@ gtk_clist_class_init (GtkCListClass *klass) ARG_SORT_TYPE); widget_class->set_scroll_adjustments_signal = - gtk_signal_new ("set_scroll_adjustments", + gtk_signal_new (I_("set_scroll_adjustments"), GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkCListClass, set_scroll_adjustments), @@ -619,7 +620,7 @@ gtk_clist_class_init (GtkCListClass *klass) GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT); clist_signals[SELECT_ROW] = - gtk_signal_new ("select_row", + gtk_signal_new (I_("select_row"), GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkCListClass, select_row), @@ -629,7 +630,7 @@ gtk_clist_class_init (GtkCListClass *klass) GTK_TYPE_INT, GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); clist_signals[UNSELECT_ROW] = - gtk_signal_new ("unselect_row", + gtk_signal_new (I_("unselect_row"), GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkCListClass, unselect_row), @@ -637,21 +638,21 @@ gtk_clist_class_init (GtkCListClass *klass) GTK_TYPE_NONE, 3, GTK_TYPE_INT, GTK_TYPE_INT, GDK_TYPE_EVENT); clist_signals[ROW_MOVE] = - gtk_signal_new ("row_move", + gtk_signal_new (I_("row_move"), GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkCListClass, row_move), _gtk_marshal_VOID__INT_INT, GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT); clist_signals[CLICK_COLUMN] = - gtk_signal_new ("click_column", + gtk_signal_new (I_("click_column"), GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkCListClass, click_column), _gtk_marshal_VOID__INT, GTK_TYPE_NONE, 1, GTK_TYPE_INT); clist_signals[RESIZE_COLUMN] = - gtk_signal_new ("resize_column", + gtk_signal_new (I_("resize_column"), GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkCListClass, resize_column), @@ -659,56 +660,56 @@ gtk_clist_class_init (GtkCListClass *klass) GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT); clist_signals[TOGGLE_FOCUS_ROW] = - gtk_signal_new ("toggle_focus_row", + gtk_signal_new (I_("toggle_focus_row"), GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkCListClass, toggle_focus_row), _gtk_marshal_VOID__VOID, GTK_TYPE_NONE, 0); clist_signals[SELECT_ALL] = - gtk_signal_new ("select_all", + gtk_signal_new (I_("select_all"), GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkCListClass, select_all), _gtk_marshal_VOID__VOID, GTK_TYPE_NONE, 0); clist_signals[UNSELECT_ALL] = - gtk_signal_new ("unselect_all", + gtk_signal_new (I_("unselect_all"), GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkCListClass, unselect_all), _gtk_marshal_VOID__VOID, GTK_TYPE_NONE, 0); clist_signals[UNDO_SELECTION] = - gtk_signal_new ("undo_selection", + gtk_signal_new (I_("undo_selection"), GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkCListClass, undo_selection), _gtk_marshal_VOID__VOID, GTK_TYPE_NONE, 0); clist_signals[START_SELECTION] = - gtk_signal_new ("start_selection", + gtk_signal_new (I_("start_selection"), GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkCListClass, start_selection), _gtk_marshal_VOID__VOID, GTK_TYPE_NONE, 0); clist_signals[END_SELECTION] = - gtk_signal_new ("end_selection", + gtk_signal_new (I_("end_selection"), GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkCListClass, end_selection), _gtk_marshal_VOID__VOID, GTK_TYPE_NONE, 0); clist_signals[TOGGLE_ADD_MODE] = - gtk_signal_new ("toggle_add_mode", + gtk_signal_new (I_("toggle_add_mode"), GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkCListClass, toggle_add_mode), _gtk_marshal_VOID__VOID, GTK_TYPE_NONE, 0); clist_signals[EXTEND_SELECTION] = - gtk_signal_new ("extend_selection", + gtk_signal_new (I_("extend_selection"), GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkCListClass, extend_selection), @@ -716,21 +717,21 @@ gtk_clist_class_init (GtkCListClass *klass) GTK_TYPE_NONE, 3, GTK_TYPE_SCROLL_TYPE, GTK_TYPE_FLOAT, GTK_TYPE_BOOL); clist_signals[SCROLL_VERTICAL] = - gtk_signal_new ("scroll_vertical", + gtk_signal_new (I_("scroll_vertical"), GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkCListClass, scroll_vertical), _gtk_marshal_VOID__ENUM_FLOAT, GTK_TYPE_NONE, 2, GTK_TYPE_SCROLL_TYPE, GTK_TYPE_FLOAT); clist_signals[SCROLL_HORIZONTAL] = - gtk_signal_new ("scroll_horizontal", + gtk_signal_new (I_("scroll_horizontal"), GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkCListClass, scroll_horizontal), _gtk_marshal_VOID__ENUM_FLOAT, GTK_TYPE_NONE, 2, GTK_TYPE_SCROLL_TYPE, GTK_TYPE_FLOAT); clist_signals[ABORT_COLUMN_RESIZE] = - gtk_signal_new ("abort_column_resize", + gtk_signal_new (I_("abort_column_resize"), GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkCListClass, abort_column_resize), @@ -739,7 +740,7 @@ gtk_clist_class_init (GtkCListClass *klass) binding_set = gtk_binding_set_by_class (klass); gtk_binding_entry_add_signal (binding_set, GDK_Up, 0, - "scroll_vertical", 2, + "scroll_vertical", 2, GTK_TYPE_ENUM, GTK_SCROLL_STEP_BACKWARD, GTK_TYPE_FLOAT, 0.0); gtk_binding_entry_add_signal (binding_set, GDK_KP_Up, 0, diff --git a/gtk/gtkcolorbutton.c b/gtk/gtkcolorbutton.c index 38779da3cb..b509643981 100644 --- a/gtk/gtkcolorbutton.c +++ b/gtk/gtkcolorbutton.c @@ -159,7 +159,7 @@ gtk_color_button_get_type (void) }; color_button_type = - g_type_register_static (GTK_TYPE_BUTTON, g_intern_static_string ("GtkColorButton"), + g_type_register_static (GTK_TYPE_BUTTON, I_("GtkColorButton"), &color_button_info, 0); } @@ -261,7 +261,7 @@ gtk_color_button_class_init (GtkColorButtonClass *klass) * * Since: 2.4 */ - color_button_signals[COLOR_SET] = g_signal_new ("color_set", + color_button_signals[COLOR_SET] = g_signal_new (I_("color_set"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkColorButtonClass, color_set), diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c index 1617bf9c9e..a1b6c717fb 100644 --- a/gtk/gtkcolorsel.c +++ b/gtk/gtkcolorsel.c @@ -297,7 +297,7 @@ color_sample_drag_end (GtkWidget *widget, GdkDragContext *context, gpointer data) { - g_object_set_data (G_OBJECT (widget), g_intern_static_string ("gtk-color-selection-drag-window"), NULL); + g_object_set_data (G_OBJECT (widget), I_("gtk-color-selection-drag-window"), NULL); } static void @@ -732,7 +732,7 @@ palette_drag_end (GtkWidget *widget, GdkDragContext *context, gpointer data) { - g_object_set_data (G_OBJECT (widget), g_intern_static_string ("gtk-color-selection-drag-window"), NULL); + g_object_set_data (G_OBJECT (widget), I_("gtk-color-selection-drag-window"), NULL); } static GdkColor * @@ -871,7 +871,7 @@ palette_set_color (GtkWidget *drawing_area, G_CALLBACK (palette_drag_handle), colorsel); - g_object_set_data (G_OBJECT (drawing_area), g_intern_static_string ("color_set"), + g_object_set_data (G_OBJECT (drawing_area), I_("color_set"), GINT_TO_POINTER (1)); } @@ -880,7 +880,7 @@ palette_set_color (GtkWidget *drawing_area, new_color[2] = color[2]; new_color[3] = 1.0; - g_object_set_data_full (G_OBJECT (drawing_area), g_intern_static_string ("color_val"), new_color, (GDestroyNotify)g_free); + g_object_set_data_full (G_OBJECT (drawing_area), I_("color_val"), new_color, (GDestroyNotify)g_free); } static gboolean @@ -953,7 +953,7 @@ do_popup (GtkColorSelection *colorsel, GtkWidget *mi; g_object_set_data (G_OBJECT (drawing_area), - g_intern_static_string ("gtk-color-sel"), + I_("gtk-color-sel"), colorsel); menu = gtk_menu_new (); @@ -980,7 +980,7 @@ palette_enter (GtkWidget *drawing_area, gpointer data) { g_object_set_data (G_OBJECT (drawing_area), - g_intern_static_string ("gtk-colorsel-have-pointer"), + I_("gtk-colorsel-have-pointer"), GUINT_TO_POINTER (TRUE)); return FALSE; @@ -992,7 +992,7 @@ palette_leave (GtkWidget *drawing_area, gpointer data) { g_object_set_data (G_OBJECT (drawing_area), - g_intern_static_string ("gtk-colorsel-have-pointer"), + I_("gtk-colorsel-have-pointer"), NULL); return FALSE; @@ -1127,7 +1127,7 @@ palette_new (GtkColorSelection *colorsel) GTK_WIDGET_SET_FLAGS (retval, GTK_CAN_FOCUS); - g_object_set_data (G_OBJECT (retval), g_intern_static_string ("color_set"), GINT_TO_POINTER (0)); + g_object_set_data (G_OBJECT (retval), I_("color_set"), GINT_TO_POINTER (0)); gtk_widget_set_events (retval, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_EXPOSURE_MASK @@ -1644,7 +1644,7 @@ make_label_spinbutton (GtkColorSelection *colorsel, { adjust = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 255.0, 1.0, 1.0, 1.0)); } - g_object_set_data (G_OBJECT (adjust), g_intern_static_string ("COLORSEL"), colorsel); + g_object_set_data (G_OBJECT (adjust), I_("COLORSEL"), colorsel); *spinbutton = gtk_spin_button_new (adjust, 10.0, 0); gtk_tooltips_set_tip (priv->tooltips, *spinbutton, tooltip, NULL); @@ -1837,7 +1837,7 @@ gtk_color_selection_get_type (void) }; color_selection_type = - g_type_register_static (GTK_TYPE_VBOX, g_intern_static_string ("GtkColorSelection"), + g_type_register_static (GTK_TYPE_VBOX, I_("GtkColorSelection"), &color_selection_info, 0); } @@ -1898,7 +1898,7 @@ gtk_color_selection_class_init (GtkColorSelectionClass *klass) GTK_PARAM_READWRITE)); color_selection_signals[COLOR_CHANGED] = - g_signal_new ("color_changed", + g_signal_new (I_("color_changed"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkColorSelectionClass, color_changed), @@ -1965,7 +1965,7 @@ gtk_color_selection_init (GtkColorSelection *colorsel) button = gtk_button_new (); gtk_widget_set_events (button, GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK); - g_object_set_data (G_OBJECT (button), g_intern_static_string ("COLORSEL"), colorsel); + g_object_set_data (G_OBJECT (button), I_("COLORSEL"), colorsel); g_signal_connect (button, "clicked", G_CALLBACK (get_screen_color), NULL); picker_image = gtk_image_new_from_stock (GTK_STOCK_COLOR_PICKER, GTK_ICON_SIZE_BUTTON); @@ -2003,7 +2003,7 @@ gtk_color_selection_init (GtkColorSelection *colorsel) gtk_misc_set_alignment (GTK_MISC (priv->opacity_label), 1.0, 0.5); gtk_table_attach_defaults (GTK_TABLE (table), priv->opacity_label, 0, 1, 4, 5); adjust = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 255.0, 1.0, 1.0, 0.0)); - g_object_set_data (G_OBJECT (adjust), g_intern_static_string ("COLORSEL"), colorsel); + g_object_set_data (G_OBJECT (adjust), I_("COLORSEL"), colorsel); priv->opacity_slider = gtk_hscale_new (adjust); gtk_tooltips_set_tip (priv->tooltips, priv->opacity_slider, diff --git a/gtk/gtkcolorseldialog.c b/gtk/gtkcolorseldialog.c index f008c29768..97a84fff56 100644 --- a/gtk/gtkcolorseldialog.c +++ b/gtk/gtkcolorseldialog.c @@ -65,7 +65,7 @@ gtk_color_selection_dialog_get_type (void) }; color_selection_dialog_type = - g_type_register_static (GTK_TYPE_DIALOG, g_intern_static_string ("GtkColorSelectionDialog"), + g_type_register_static (GTK_TYPE_DIALOG, I_("GtkColorSelectionDialog"), &colorsel_diag_info, 0); } diff --git a/gtk/gtkcombo.c b/gtk/gtkcombo.c index e7963f9609..c614e8ec86 100644 --- a/gtk/gtkcombo.c +++ b/gtk/gtkcombo.c @@ -366,7 +366,7 @@ gtk_combo_func (GtkListItem * li) GtkWidget *label; gchar *ltext = NULL; - ltext = g_object_get_data (G_OBJECT (li), g_intern_static_string (gtk_combo_string_key)); + ltext = g_object_get_data (G_OBJECT (li), I_(gtk_combo_string_key)); if (!ltext) { label = GTK_BIN (li)->child; @@ -1042,7 +1042,7 @@ gtk_combo_get_type (void) (GInstanceInitFunc) gtk_combo_init, }; - combo_type = g_type_register_static (GTK_TYPE_HBOX, g_intern_static_string ("GtkCombo"), + combo_type = g_type_register_static (GTK_TYPE_HBOX, I_("GtkCombo"), &combo_info, 0); } @@ -1151,7 +1151,7 @@ gtk_combo_set_item_string (GtkCombo * combo, GtkItem * item, const gchar * item_ g_return_if_fail (GTK_IS_COMBO (combo)); g_return_if_fail (item != NULL); - g_object_set_data_full (G_OBJECT (item), g_intern_static_string (gtk_combo_string_key), + g_object_set_data_full (G_OBJECT (item), I_(gtk_combo_string_key), g_strdup (item_value), g_free); } diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index 8c9b87cf53..0fc95250a0 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -462,7 +462,7 @@ gtk_combo_box_get_type (void) }; combo_box_type = g_type_register_static (GTK_TYPE_BIN, - g_intern_static_string ("GtkComboBox"), + I_("GtkComboBox"), &combo_box_info, 0); @@ -533,7 +533,7 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass) * Since: 2.4 */ combo_box_signals[CHANGED] = - g_signal_new ("changed", + g_signal_new (I_("changed"), G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkComboBoxClass, changed), @@ -2544,7 +2544,7 @@ gtk_combo_box_menu_fill_level (GtkComboBox *combo_box, item = gtk_separator_menu_item_new (); path = gtk_tree_model_get_path (model, &iter); g_object_set_data_full (G_OBJECT (item), - g_intern_static_string ("gtk-combo-box-item-path"), + I_("gtk-combo-box-item-path"), gtk_tree_row_reference_new (model, path), (GDestroyNotify)gtk_tree_row_reference_free); gtk_tree_path_free (path); @@ -3065,7 +3065,7 @@ gtk_combo_box_menu_row_inserted (GtkTreeModel *model, { item = gtk_separator_menu_item_new (); g_object_set_data_full (G_OBJECT (item), - g_intern_static_string ("gtk-combo-box-item-path"), + I_("gtk-combo-box-item-path"), gtk_tree_row_reference_new (model, path), (GDestroyNotify)gtk_tree_row_reference_free); } diff --git a/gtk/gtkcomboboxentry.c b/gtk/gtkcomboboxentry.c index 01d5e4c03f..5ce651e032 100644 --- a/gtk/gtkcomboboxentry.c +++ b/gtk/gtkcomboboxentry.c @@ -90,7 +90,7 @@ gtk_combo_box_entry_get_type (void) }; combo_box_entry_type = g_type_register_static (GTK_TYPE_COMBO_BOX, - g_intern_static_string ("GtkComboBoxEntry"), + I_("GtkComboBoxEntry"), &combo_box_entry_info, 0); } diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c index a92a5291e4..a02d16539c 100644 --- a/gtk/gtkcontainer.c +++ b/gtk/gtkcontainer.c @@ -135,7 +135,7 @@ gtk_container_get_type (void) }; container_type = - g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkContainer"), + g_type_register_static (GTK_TYPE_WIDGET, I_("GtkContainer"), &container_info, G_TYPE_FLAG_ABSTRACT); } @@ -224,7 +224,7 @@ gtk_container_class_init (GtkContainerClass *class) GTK_TYPE_WIDGET, GTK_PARAM_WRITABLE)); container_signals[ADD] = - g_signal_new ("add", + g_signal_new (I_("add"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkContainerClass, add), @@ -233,7 +233,7 @@ gtk_container_class_init (GtkContainerClass *class) G_TYPE_NONE, 1, GTK_TYPE_WIDGET); container_signals[REMOVE] = - g_signal_new ("remove", + g_signal_new (I_("remove"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkContainerClass, remove), @@ -242,7 +242,7 @@ gtk_container_class_init (GtkContainerClass *class) G_TYPE_NONE, 1, GTK_TYPE_WIDGET); container_signals[CHECK_RESIZE] = - g_signal_new ("check_resize", + g_signal_new (I_("check_resize"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkContainerClass, check_resize), @@ -250,7 +250,7 @@ gtk_container_class_init (GtkContainerClass *class) _gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); container_signals[SET_FOCUS_CHILD] = - g_signal_new ("set-focus-child", + g_signal_new (I_("set-focus-child"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkContainerClass, set_focus_child), @@ -2072,7 +2072,7 @@ chain_widget_destroyed (GtkWidget *widget, user_data); g_object_set_data (G_OBJECT (container), - g_intern_static_string ("gtk-container-focus-chain"), + I_("gtk-container-focus-chain"), chain); } @@ -2129,7 +2129,7 @@ gtk_container_set_focus_chain (GtkContainer *container, chain = g_list_reverse (chain); g_object_set_data (G_OBJECT (container), - g_intern_static_string ("gtk-container-focus-chain"), + I_("gtk-container-focus-chain"), chain); } @@ -2189,7 +2189,7 @@ gtk_container_unset_focus_chain (GtkContainer *container) container->has_focus_chain = FALSE; g_object_set_data (G_OBJECT (container), - g_intern_static_string ("gtk-container-focus-chain"), + I_("gtk-container-focus-chain"), NULL); tmp_list = chain; diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c index c96dbd3b64..72376fd96e 100644 --- a/gtk/gtkctree.c +++ b/gtk/gtkctree.c @@ -38,6 +38,7 @@ #include "gtkmain.h" #include "gtkmarshalers.h" #include "gtkdnd.h" +#include "gtkintl.h" #include <gdk/gdkkeysyms.h> #include "gtkalias.h" @@ -342,7 +343,7 @@ gtk_ctree_get_type (void) (GtkClassInitFunc) NULL, }; - g_intern_static_string ("GtkCTree"); + I_("GtkCTree"); ctree_type = gtk_type_unique (GTK_TYPE_CLIST, &ctree_info); } @@ -435,7 +436,7 @@ gtk_ctree_class_init (GtkCTreeClass *klass) ARG_EXPANDER_STYLE); ctree_signals[TREE_SELECT_ROW] = - gtk_signal_new ("tree_select_row", + gtk_signal_new (I_("tree_select_row"), GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_select_row), @@ -444,7 +445,7 @@ gtk_ctree_class_init (GtkCTreeClass *klass) GTK_TYPE_CTREE_NODE, GTK_TYPE_INT); ctree_signals[TREE_UNSELECT_ROW] = - gtk_signal_new ("tree_unselect_row", + gtk_signal_new (I_("tree_unselect_row"), GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_unselect_row), @@ -453,7 +454,7 @@ gtk_ctree_class_init (GtkCTreeClass *klass) GTK_TYPE_CTREE_NODE, GTK_TYPE_INT); ctree_signals[TREE_EXPAND] = - gtk_signal_new ("tree_expand", + gtk_signal_new (I_("tree_expand"), GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_expand), @@ -461,7 +462,7 @@ gtk_ctree_class_init (GtkCTreeClass *klass) GTK_TYPE_NONE, 1, GTK_TYPE_CTREE_NODE); ctree_signals[TREE_COLLAPSE] = - gtk_signal_new ("tree_collapse", + gtk_signal_new (I_("tree_collapse"), GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_collapse), @@ -469,7 +470,7 @@ gtk_ctree_class_init (GtkCTreeClass *klass) GTK_TYPE_NONE, 1, GTK_TYPE_CTREE_NODE); ctree_signals[TREE_MOVE] = - gtk_signal_new ("tree_move", + gtk_signal_new (I_("tree_move"), GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_move), @@ -479,7 +480,7 @@ gtk_ctree_class_init (GtkCTreeClass *klass) GTK_TYPE_CTREE_NODE, GTK_TYPE_CTREE_NODE); ctree_signals[CHANGE_FOCUS_ROW_EXPANSION] = - gtk_signal_new ("change_focus_row_expansion", + gtk_signal_new (I_("change_focus_row_expansion"), GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkCTreeClass, diff --git a/gtk/gtkcurve.c b/gtk/gtkcurve.c index bb61d39ec5..c96c3658d9 100644 --- a/gtk/gtkcurve.c +++ b/gtk/gtkcurve.c @@ -100,7 +100,7 @@ gtk_curve_get_type (void) (GInstanceInitFunc) gtk_curve_init, }; - curve_type = g_type_register_static (GTK_TYPE_DRAWING_AREA, g_intern_static_string ("GtkCurve"), + curve_type = g_type_register_static (GTK_TYPE_DRAWING_AREA, I_("GtkCurve"), &curve_info, 0); } return curve_type; @@ -164,7 +164,7 @@ gtk_curve_class_init (GtkCurveClass *class) GTK_PARAM_READWRITE)); curve_type_changed_signal = - g_signal_new ("curve_type_changed", + g_signal_new (I_("curve_type_changed"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkCurveClass, curve_type_changed), diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c index f16e6cde80..59a5a30f98 100644 --- a/gtk/gtkdialog.c +++ b/gtk/gtkdialog.c @@ -114,7 +114,7 @@ gtk_dialog_get_type (void) (GInstanceInitFunc) gtk_dialog_init, }; - dialog_type = g_type_register_static (GTK_TYPE_WINDOW, g_intern_static_string ("GtkDialog"), + dialog_type = g_type_register_static (GTK_TYPE_WINDOW, I_("GtkDialog"), &dialog_info, 0); } @@ -152,7 +152,7 @@ gtk_dialog_class_init (GtkDialogClass *class) GTK_PARAM_READWRITE)); dialog_signals[RESPONSE] = - g_signal_new ("response", + g_signal_new (I_("response"), G_OBJECT_CLASS_TYPE (class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkDialogClass, response), @@ -162,7 +162,7 @@ gtk_dialog_class_init (GtkDialogClass *class) G_TYPE_INT); dialog_signals[CLOSE] = - g_signal_new ("close", + g_signal_new (I_("close"), G_OBJECT_CLASS_TYPE (class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkDialogClass, close), @@ -539,7 +539,7 @@ get_response_data (GtkWidget *widget, ad = g_new (ResponseData, 1); g_object_set_data_full (G_OBJECT (widget), - g_intern_static_string ("gtk-dialog-response-data"), + I_("gtk-dialog-response-data"), ad, g_free); } diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c index c4611f496e..1ab4bf7205 100644 --- a/gtk/gtkdnd.c +++ b/gtk/gtkdnd.c @@ -42,6 +42,7 @@ #include "gtkplug.h" #include "gtkstock.h" #include "gtkwindow.h" +#include "gtkintl.h" #include "gtkalias.h" static GSList *source_widgets = NULL; @@ -316,7 +317,7 @@ set_can_change_screen (GtkWidget *widget, { can_change_screen = can_change_screen != FALSE; - g_object_set_data (G_OBJECT (widget), g_intern_static_string ("gtk-dnd-can-change-screen"), + g_object_set_data (G_OBJECT (widget), I_("gtk-dnd-can-change-screen"), GUINT_TO_POINTER (can_change_screen)); } @@ -349,7 +350,7 @@ gtk_drag_get_ipc_widget (GdkScreen *screen) result = drag_widgets->data; drag_widgets = drag_widgets->next; g_object_set_data (G_OBJECT (screen), - g_intern_static_string ("gtk-dnd-ipc-widgets"), + I_("gtk-dnd-ipc-widgets"), drag_widgets); g_slist_free_1 (tmp); } @@ -378,7 +379,7 @@ gtk_drag_release_ipc_widget (GtkWidget *widget) "gtk-dnd-ipc-widgets"); drag_widgets = g_slist_prepend (drag_widgets, widget); g_object_set_data (G_OBJECT (screen), - g_intern_static_string ("gtk-dnd-ipc-widgets"), + I_("gtk-dnd-ipc-widgets"), drag_widgets); } @@ -796,7 +797,7 @@ gtk_drag_get_data (GtkWidget *widget, g_signal_connect (selection_widget, "selection_received", G_CALLBACK (gtk_drag_selection_received), widget); - g_object_set_data (G_OBJECT (selection_widget), g_intern_static_string ("drag-context"), context); + g_object_set_data (G_OBJECT (selection_widget), I_("drag-context"), context); gtk_selection_convert (selection_widget, gdk_drag_get_selection (context), @@ -883,7 +884,7 @@ gtk_drag_finish (GdkDragContext *context, g_object_ref (context); - g_object_set_data (G_OBJECT (selection_widget), g_intern_static_string ("drag-context"), context); + g_object_set_data (G_OBJECT (selection_widget), I_("drag-context"), context); g_signal_connect (selection_widget, "selection_received", G_CALLBACK (gtk_drag_selection_received), NULL); @@ -1019,7 +1020,7 @@ gtk_drag_dest_set_internal (GtkWidget *widget, g_signal_connect (widget, "hierarchy_changed", G_CALLBACK (gtk_drag_dest_hierarchy_changed), site); - g_object_set_data_full (G_OBJECT (widget), g_intern_static_string ("gtk-drag-dest"), + g_object_set_data_full (G_OBJECT (widget), I_("gtk-drag-dest"), site, gtk_drag_dest_site_destroy); } @@ -1115,7 +1116,7 @@ gtk_drag_dest_unset (GtkWidget *widget) { g_return_if_fail (GTK_IS_WIDGET (widget)); - g_object_set_data (G_OBJECT (widget), g_intern_static_string ("gtk-drag-dest"), NULL); + g_object_set_data (G_OBJECT (widget), I_("gtk-drag-dest"), NULL); } /** @@ -1511,7 +1512,7 @@ gtk_drag_selection_received (GtkWidget *widget, gtk_drag_selection_received, data); - g_object_set_data (G_OBJECT (widget), g_intern_static_string ("drag-context"), NULL); + g_object_set_data (G_OBJECT (widget), I_("drag-context"), NULL); g_object_unref (context); gtk_drag_release_ipc_widget (widget); @@ -2124,7 +2125,7 @@ gtk_drag_begin_internal (GtkWidget *widget, info = gtk_drag_get_source_info (context, TRUE); info->ipc_widget = ipc_widget; - g_object_set_data (G_OBJECT (info->ipc_widget), g_intern_static_string ("gtk-info"), info); + g_object_set_data (G_OBJECT (info->ipc_widget), I_("gtk-info"), info); info->widget = gtk_widget_ref (widget); @@ -2324,7 +2325,7 @@ gtk_drag_source_set (GtkWidget *widget, site); g_object_set_data_full (G_OBJECT (widget), - g_intern_static_string ("gtk-site-data"), + I_("gtk-site-data"), site, gtk_drag_source_site_destroy); } @@ -2357,7 +2358,7 @@ gtk_drag_source_unset (GtkWidget *widget) g_signal_handlers_disconnect_by_func (widget, gtk_drag_source_event_cb, site); - g_object_set_data (G_OBJECT (widget), g_intern_static_string ("gtk-site-data"), NULL); + g_object_set_data (G_OBJECT (widget), I_("gtk-site-data"), NULL); } } @@ -3647,7 +3648,7 @@ gtk_drag_source_info_destroy (GtkDragSourceInfo *info) info); gtk_selection_remove_all (info->ipc_widget); - g_object_set_data (G_OBJECT (info->ipc_widget), g_intern_static_string ("gtk-info"), NULL); + g_object_set_data (G_OBJECT (info->ipc_widget), I_("gtk-info"), NULL); source_widgets = g_slist_remove (source_widgets, info->ipc_widget); gtk_drag_release_ipc_widget (info->ipc_widget); diff --git a/gtk/gtkdrawingarea.c b/gtk/gtkdrawingarea.c index bd4b68a62a..992ebcf550 100644 --- a/gtk/gtkdrawingarea.c +++ b/gtk/gtkdrawingarea.c @@ -26,6 +26,7 @@ #include <config.h> #include "gtkdrawingarea.h" +#include "gtkintl.h" #include "gtkalias.h" @@ -58,7 +59,7 @@ gtk_drawing_area_get_type (void) }; drawing_area_type = - g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkDrawingArea"), + g_type_register_static (GTK_TYPE_WIDGET, I_("GtkDrawingArea"), &drawing_area_info, 0); } diff --git a/gtk/gtkeditable.c b/gtk/gtkeditable.c index 53a40f70cc..6a2f6c77ea 100644 --- a/gtk/gtkeditable.c +++ b/gtk/gtkeditable.c @@ -29,6 +29,7 @@ #include "gtkeditable.h" #include "gtkmarshalers.h" +#include "gtkintl.h" #include "gtkalias.h" @@ -49,7 +50,7 @@ gtk_editable_get_type (void) NULL, /* base_finalize */ }; - editable_type = g_type_register_static (G_TYPE_INTERFACE, g_intern_static_string ("GtkEditable"), + editable_type = g_type_register_static (G_TYPE_INTERFACE, I_("GtkEditable"), &editable_info, 0); } @@ -63,7 +64,7 @@ gtk_editable_base_init (gpointer g_class) if (! initialized) { - g_signal_new ("insert_text", + g_signal_new (I_("insert_text"), GTK_TYPE_EDITABLE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkEditableClass, insert_text), @@ -73,7 +74,7 @@ gtk_editable_base_init (gpointer g_class) G_TYPE_STRING, G_TYPE_INT, G_TYPE_POINTER); - g_signal_new ("delete_text", + g_signal_new (I_("delete_text"), GTK_TYPE_EDITABLE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkEditableClass, delete_text), @@ -82,7 +83,7 @@ gtk_editable_base_init (gpointer g_class) G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); - g_signal_new ("changed", + g_signal_new (I_("changed"), GTK_TYPE_EDITABLE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkEditableClass, changed), diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index 9b8be65477..5520e52448 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -390,7 +390,7 @@ gtk_entry_get_type (void) NULL /* interface_data */ }; - entry_type = g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkEntry"), + entry_type = g_type_register_static (GTK_TYPE_WIDGET, I_("GtkEntry"), &entry_info, 0); g_type_add_interface_static (entry_type, @@ -598,7 +598,7 @@ gtk_entry_class_init (GtkEntryClass *class) GTK_PARAM_READWRITE)); signals[POPULATE_POPUP] = - g_signal_new ("populate_popup", + g_signal_new (I_("populate_popup"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkEntryClass, populate_popup), @@ -610,7 +610,7 @@ gtk_entry_class_init (GtkEntryClass *class) /* Action signals */ signals[ACTIVATE] = - g_signal_new ("activate", + g_signal_new (I_("activate"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkEntryClass, activate), @@ -620,7 +620,7 @@ gtk_entry_class_init (GtkEntryClass *class) widget_class->activate_signal = signals[ACTIVATE]; signals[MOVE_CURSOR] = - g_signal_new ("move_cursor", + g_signal_new (I_("move_cursor"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkEntryClass, move_cursor), @@ -632,7 +632,7 @@ gtk_entry_class_init (GtkEntryClass *class) G_TYPE_BOOLEAN); signals[INSERT_AT_CURSOR] = - g_signal_new ("insert_at_cursor", + g_signal_new (I_("insert_at_cursor"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkEntryClass, insert_at_cursor), @@ -642,7 +642,7 @@ gtk_entry_class_init (GtkEntryClass *class) G_TYPE_STRING); signals[DELETE_FROM_CURSOR] = - g_signal_new ("delete_from_cursor", + g_signal_new (I_("delete_from_cursor"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkEntryClass, delete_from_cursor), @@ -653,7 +653,7 @@ gtk_entry_class_init (GtkEntryClass *class) G_TYPE_INT); signals[BACKSPACE] = - g_signal_new ("backspace", + g_signal_new (I_("backspace"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkEntryClass, backspace), @@ -662,7 +662,7 @@ gtk_entry_class_init (GtkEntryClass *class) G_TYPE_NONE, 0); signals[CUT_CLIPBOARD] = - g_signal_new ("cut_clipboard", + g_signal_new (I_("cut_clipboard"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkEntryClass, cut_clipboard), @@ -671,7 +671,7 @@ gtk_entry_class_init (GtkEntryClass *class) G_TYPE_NONE, 0); signals[COPY_CLIPBOARD] = - g_signal_new ("copy_clipboard", + g_signal_new (I_("copy_clipboard"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkEntryClass, copy_clipboard), @@ -680,7 +680,7 @@ gtk_entry_class_init (GtkEntryClass *class) G_TYPE_NONE, 0); signals[PASTE_CLIPBOARD] = - g_signal_new ("paste_clipboard", + g_signal_new (I_("paste_clipboard"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkEntryClass, paste_clipboard), @@ -689,7 +689,7 @@ gtk_entry_class_init (GtkEntryClass *class) G_TYPE_NONE, 0); signals[TOGGLE_OVERWRITE] = - g_signal_new ("toggle_overwrite", + g_signal_new (I_("toggle_overwrite"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkEntryClass, toggle_overwrite), @@ -4465,7 +4465,7 @@ append_action_signal (GtkEntry *entry, { GtkWidget *menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL); - g_object_set_data (G_OBJECT (menuitem), g_intern_static_string ("gtk-signal"), (char *)signal); + g_object_set_data (G_OBJECT (menuitem), I_("gtk-signal"), (char *)signal); g_signal_connect (menuitem, "activate", G_CALLBACK (activate_cb), entry); @@ -5426,7 +5426,7 @@ gtk_entry_set_completion (GtkEntry *entry, if (!completion) { - g_object_set_data (G_OBJECT (entry), g_intern_static_string (GTK_ENTRY_COMPLETION_KEY), NULL); + g_object_set_data (G_OBJECT (entry), I_(GTK_ENTRY_COMPLETION_KEY), NULL); return; } @@ -5435,7 +5435,7 @@ gtk_entry_set_completion (GtkEntry *entry, connect_completion_signals (entry, completion); completion->priv->entry = GTK_WIDGET (entry); - g_object_set_data (G_OBJECT (entry), g_intern_static_string (GTK_ENTRY_COMPLETION_KEY), completion); + g_object_set_data (G_OBJECT (entry), I_(GTK_ENTRY_COMPLETION_KEY), completion); } /** diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c index f2857a7b2e..9b558e8b1b 100644 --- a/gtk/gtkentrycompletion.c +++ b/gtk/gtkentrycompletion.c @@ -171,7 +171,7 @@ gtk_entry_completion_get_type (void) }; entry_completion_type = - g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkEntryCompletion"), + g_type_register_static (G_TYPE_OBJECT, I_("GtkEntryCompletion"), &entry_completion_info, 0); g_type_add_interface_static (entry_completion_type, @@ -216,7 +216,7 @@ gtk_entry_completion_class_init (GtkEntryCompletionClass *klass) * Since: 2.6 */ entry_completion_signals[INSERT_PREFIX] = - g_signal_new ("insert_prefix", + g_signal_new (I_("insert_prefix"), G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkEntryCompletionClass, insert_prefix), @@ -241,7 +241,7 @@ gtk_entry_completion_class_init (GtkEntryCompletionClass *klass) * Since: 2.4 */ entry_completion_signals[MATCH_SELECTED] = - g_signal_new ("match_selected", + g_signal_new (I_("match_selected"), G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkEntryCompletionClass, match_selected), @@ -261,7 +261,7 @@ gtk_entry_completion_class_init (GtkEntryCompletionClass *klass) * Since: 2.4 */ entry_completion_signals[ACTION_ACTIVATED] = - g_signal_new ("action_activated", + g_signal_new (I_("action_activated"), G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkEntryCompletionClass, action_activated), diff --git a/gtk/gtkeventbox.c b/gtk/gtkeventbox.c index a534d7be04..fd7e90cdf7 100644 --- a/gtk/gtkeventbox.c +++ b/gtk/gtkeventbox.c @@ -90,7 +90,7 @@ gtk_event_box_get_type (void) (GInstanceInitFunc) gtk_event_box_init, }; - event_box_type = g_type_register_static (GTK_TYPE_BIN, g_intern_static_string ("GtkEventBox"), + event_box_type = g_type_register_static (GTK_TYPE_BIN, I_("GtkEventBox"), &event_box_info, 0); } diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c index 23cd1fa139..45208679a2 100644 --- a/gtk/gtkexpander.c +++ b/gtk/gtkexpander.c @@ -142,7 +142,7 @@ gtk_expander_get_type (void) }; expander_type = g_type_register_static (GTK_TYPE_BIN, - g_intern_static_string ("GtkExpander"), + I_("GtkExpander"), &expander_info, 0); } @@ -261,7 +261,7 @@ gtk_expander_class_init (GtkExpanderClass *klass) GTK_PARAM_READABLE)); widget_class->activate_signal = - g_signal_new ("activate", + g_signal_new (I_("activate"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkExpanderClass, activate), diff --git a/gtk/gtkfilechooser.c b/gtk/gtkfilechooser.c index c662e43da9..6c3f36880a 100644 --- a/gtk/gtkfilechooser.c +++ b/gtk/gtkfilechooser.c @@ -48,7 +48,7 @@ gtk_file_chooser_get_type (void) }; file_chooser_type = g_type_register_static (G_TYPE_INTERFACE, - g_intern_static_string ("GtkFileChooser"), + I_("GtkFileChooser"), &file_chooser_info, 0); g_type_interface_add_prerequisite (file_chooser_type, GTK_TYPE_WIDGET); @@ -96,7 +96,7 @@ gtk_file_chooser_class_init (gpointer g_iface) * gtk_file_chooser_set_current_folder_uri(), * gtk_file_chooser_get_current_folder_uri(). */ - g_signal_new ("current-folder-changed", + g_signal_new (I_("current-folder-changed"), iface_type, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkFileChooserIface, current_folder_changed), @@ -123,7 +123,7 @@ gtk_file_chooser_class_init (gpointer g_iface) * gtk_file_chooser_unselect_uri(), gtk_file_chooser_get_uri(), * gtk_file_chooser_get_uris(). */ - g_signal_new ("selection-changed", + g_signal_new (I_("selection-changed"), iface_type, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkFileChooserIface, selection_changed), @@ -157,7 +157,7 @@ gtk_file_chooser_class_init (gpointer g_iface) * gtk_file_chooser_get_preview_filename(), * gtk_file_chooser_get_preview_uri(). */ - g_signal_new ("update-preview", + g_signal_new (I_("update-preview"), iface_type, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkFileChooserIface, update_preview), @@ -181,7 +181,7 @@ gtk_file_chooser_class_init (gpointer g_iface) * gtk_file_chooser_get_filenames(), gtk_file_chooser_get_uri(), * gtk_file_chooser_get_uris(). */ - g_signal_new ("file-activated", + g_signal_new (I_("file-activated"), iface_type, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkFileChooserIface, file_activated), @@ -190,7 +190,7 @@ gtk_file_chooser_class_init (gpointer g_iface) G_TYPE_NONE, 0); /* Documented in the docbook files */ - g_signal_new ("confirm-overwrite", + g_signal_new (I_("confirm-overwrite"), iface_type, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkFileChooserIface, confirm_overwrite), diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index 45e4a74c43..49dd51668f 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -584,7 +584,7 @@ _gtk_file_chooser_default_get_type (void) NULL /* interface_data */ }; - file_chooser_default_type = g_type_register_static (GTK_TYPE_VBOX, g_intern_static_string ("GtkFileChooserDefault"), + file_chooser_default_type = g_type_register_static (GTK_TYPE_VBOX, I_("GtkFileChooserDefault"), &file_chooser_default_info, 0); g_type_add_interface_static (file_chooser_default_type, @@ -620,7 +620,7 @@ gtk_file_chooser_default_class_init (GtkFileChooserDefaultClass *class) widget_class->screen_changed = gtk_file_chooser_default_screen_changed; signals[LOCATION_POPUP] = - _gtk_binding_signal_new ("location-popup", + _gtk_binding_signal_new (I_("location-popup"), G_OBJECT_CLASS_TYPE (class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_CALLBACK (location_popup_handler), @@ -628,7 +628,7 @@ gtk_file_chooser_default_class_init (GtkFileChooserDefaultClass *class) _gtk_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); signals[UP_FOLDER] = - _gtk_binding_signal_new ("up-folder", + _gtk_binding_signal_new (I_("up-folder"), G_OBJECT_CLASS_TYPE (class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_CALLBACK (up_folder_handler), @@ -636,7 +636,7 @@ gtk_file_chooser_default_class_init (GtkFileChooserDefaultClass *class) _gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); signals[DOWN_FOLDER] = - _gtk_binding_signal_new ("down-folder", + _gtk_binding_signal_new (I_("down-folder"), G_OBJECT_CLASS_TYPE (class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_CALLBACK (down_folder_handler), @@ -644,7 +644,7 @@ gtk_file_chooser_default_class_init (GtkFileChooserDefaultClass *class) _gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); signals[HOME_FOLDER] = - _gtk_binding_signal_new ("home-folder", + _gtk_binding_signal_new (I_("home-folder"), G_OBJECT_CLASS_TYPE (class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_CALLBACK (home_folder_handler), @@ -3713,7 +3713,7 @@ create_file_list (GtkFileChooserDefault *impl) /* Tree/list view */ impl->browse_files_tree_view = gtk_tree_view_new (); - g_object_set_data (G_OBJECT (impl->browse_files_tree_view), g_intern_static_string ("GtkFileChooserDefault"), impl); + g_object_set_data (G_OBJECT (impl->browse_files_tree_view), I_("GtkFileChooserDefault"), impl); atk_object_set_name (gtk_widget_get_accessible (impl->browse_files_tree_view), _("Files")); gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (impl->browse_files_tree_view), TRUE); diff --git a/gtk/gtkfilechooserdialog.c b/gtk/gtkfilechooserdialog.c index 3377d30d8c..d84f0ba3e3 100644 --- a/gtk/gtkfilechooserdialog.c +++ b/gtk/gtkfilechooserdialog.c @@ -25,6 +25,7 @@ #include "gtkfilechooserembed.h" #include "gtkfilesystem.h" #include "gtktypebuiltins.h" +#include "gtkintl.h" #include "gtkalias.h" #include <stdarg.h> @@ -97,7 +98,7 @@ gtk_file_chooser_dialog_get_type (void) NULL /* interface_data */ }; - file_chooser_dialog_type = g_type_register_static (GTK_TYPE_DIALOG, g_intern_static_string ("GtkFileChooserDialog"), + file_chooser_dialog_type = g_type_register_static (GTK_TYPE_DIALOG, I_("GtkFileChooserDialog"), &file_chooser_dialog_info, 0); g_type_add_interface_static (file_chooser_dialog_type, GTK_TYPE_FILE_CHOOSER, diff --git a/gtk/gtkfilechooserembed.c b/gtk/gtkfilechooserembed.c index 8fc3719809..1f584a3d87 100644 --- a/gtk/gtkfilechooserembed.c +++ b/gtk/gtkfilechooserembed.c @@ -21,6 +21,7 @@ #include <config.h> #include "gtkfilechooserembed.h" #include "gtkmarshalers.h" +#include "gtkintl.h" #include "gtkalias.h" static void gtk_file_chooser_embed_class_init (gpointer g_iface); @@ -76,7 +77,7 @@ _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_CALLBACK (delegate_default_size_changed), receiver); @@ -138,7 +139,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,7 +153,7 @@ 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), diff --git a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c index 02dcd4081d..6894c6c4a7 100644 --- a/gtk/gtkfilechooserentry.c +++ b/gtk/gtkfilechooserentry.c @@ -26,6 +26,7 @@ #include "gtkentry.h" #include "gtkfilechooserentry.h" #include "gtkmain.h" +#include "gtkintl.h" #include "gtkalias.h" typedef struct _GtkFileChooserEntryClass GtkFileChooserEntryClass; @@ -134,7 +135,7 @@ _gtk_file_chooser_entry_get_type (void) }; - file_chooser_entry_type = g_type_register_static (GTK_TYPE_ENTRY, g_intern_static_string ("GtkFileChooserEntry"), + file_chooser_entry_type = g_type_register_static (GTK_TYPE_ENTRY, I_("GtkFileChooserEntry"), &file_chooser_entry_info, 0); g_type_add_interface_static (file_chooser_entry_type, GTK_TYPE_EDITABLE, diff --git a/gtk/gtkfilechooserutils.c b/gtk/gtkfilechooserutils.c index 40bdd1a07f..cbdf713769 100644 --- a/gtk/gtkfilechooserutils.c +++ b/gtk/gtkfilechooserutils.c @@ -24,6 +24,7 @@ #include "gtkfilechooser.h" #include "gtkfilesystem.h" #include "gtktypebuiltins.h" +#include "gtkintl.h" #include "gtkalias.h" static gboolean delegate_set_current_folder (GtkFileChooser *chooser, @@ -168,7 +169,7 @@ _gtk_file_chooser_set_delegate (GtkFileChooser *receiver, g_return_if_fail (GTK_IS_FILE_CHOOSER (receiver)); g_return_if_fail (GTK_IS_FILE_CHOOSER (delegate)); - g_object_set_data (G_OBJECT (receiver), g_intern_static_string ("gtk-file-chooser-delegate"), delegate); + g_object_set_data (G_OBJECT (receiver), I_("gtk-file-chooser-delegate"), delegate); g_signal_connect (delegate, "notify", G_CALLBACK (delegate_notify), receiver); g_signal_connect (delegate, "current-folder-changed", diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c index d6dd6696dc..645b0b0d57 100644 --- a/gtk/gtkfilechooserwidget.c +++ b/gtk/gtkfilechooserwidget.c @@ -24,6 +24,7 @@ #include "gtkfilechooserutils.h" #include "gtktypebuiltins.h" #include "gtkfilechooserembed.h" +#include "gtkintl.h" #include "gtkalias.h" struct _GtkFileChooserWidgetPrivate @@ -87,7 +88,7 @@ gtk_file_chooser_widget_get_type (void) NULL /* interface_data */ }; - file_chooser_widget_type = g_type_register_static (GTK_TYPE_VBOX, g_intern_static_string ("GtkFileChooserWidget"), + file_chooser_widget_type = g_type_register_static (GTK_TYPE_VBOX, I_("GtkFileChooserWidget"), &file_chooser_widget_info, 0); g_type_add_interface_static (file_chooser_widget_type, diff --git a/gtk/gtkfilefilter.c b/gtk/gtkfilefilter.c index e45900f330..80d1ffb744 100644 --- a/gtk/gtkfilefilter.c +++ b/gtk/gtkfilefilter.c @@ -23,6 +23,7 @@ #include "gtkfilefilter.h" #include "gtkobject.h" +#include "gtkintl.h" #include "gtkprivate.h" #include "gtkalias.h" @@ -103,7 +104,7 @@ gtk_file_filter_get_type (void) NULL /* init */ }; - file_filter_type = g_type_register_static (GTK_TYPE_OBJECT, g_intern_static_string ("GtkFileFilter"), + file_filter_type = g_type_register_static (GTK_TYPE_OBJECT, I_("GtkFileFilter"), &file_filter_info, 0); } diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c index 8cfe382b1a..c982ec3369 100644 --- a/gtk/gtkfilesel.c +++ b/gtk/gtkfilesel.c @@ -528,7 +528,7 @@ gtk_file_selection_get_type (void) }; file_selection_type = - g_type_register_static (GTK_TYPE_DIALOG, g_intern_static_string ("GtkFileSelection"), + g_type_register_static (GTK_TYPE_DIALOG, I_("GtkFileSelection"), &filesel_info, 0); } @@ -985,7 +985,7 @@ filenames_dropped (GtkWidget *widget, "Are you sure that you want to select it?"), filename_utf8, hostname); g_free (filename_utf8); - g_object_set_data_full (G_OBJECT (dialog), g_intern_static_string ("gtk-fs-dnd-filename"), g_strdup (filename), g_free); + g_object_set_data_full (G_OBJECT (dialog), I_("gtk-fs-dnd-filename"), g_strdup (filename), g_free); g_signal_connect_data (dialog, "response", (GCallback) dnd_really_drop, diff --git a/gtk/gtkfilesystem.c b/gtk/gtkfilesystem.c index f23d9f3866..268bfad1dd 100644 --- a/gtk/gtkfilesystem.c +++ b/gtk/gtkfilesystem.c @@ -23,6 +23,7 @@ #include "gtkfilesystem.h" #include "gtkicontheme.h" #include "gtkmodules.h" +#include "gtkintl.h" #include "gtkalias.h" #include <string.h> @@ -59,7 +60,7 @@ gtk_file_info_get_type (void) static GType our_type = 0; if (our_type == 0) - our_type = g_boxed_type_register_static (g_intern_static_string ("GtkFileInfo"), + our_type = g_boxed_type_register_static (I_("GtkFileInfo"), (GBoxedCopyFunc) gtk_file_info_copy, (GBoxedFreeFunc) gtk_file_info_free); @@ -269,7 +270,7 @@ gtk_file_system_get_type (void) }; file_system_type = g_type_register_static (G_TYPE_INTERFACE, - g_intern_static_string ("GtkFileSystem"), + I_("GtkFileSystem"), &file_system_info, 0); g_type_interface_add_prerequisite (file_system_type, G_TYPE_OBJECT); @@ -287,14 +288,14 @@ gtk_file_system_base_init (gpointer g_class) { GType iface_type = G_TYPE_FROM_INTERFACE (g_class); - g_signal_new ("volumes-changed", + g_signal_new (I_("volumes-changed"), iface_type, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkFileSystemIface, volumes_changed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - g_signal_new ("bookmarks-changed", + g_signal_new (I_("bookmarks-changed"), iface_type, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkFileSystemIface, bookmarks_changed), @@ -843,7 +844,7 @@ gtk_file_folder_get_type (void) }; file_folder_type = g_type_register_static (G_TYPE_INTERFACE, - g_intern_static_string ("GtkFileFolder"), + I_("GtkFileFolder"), &file_folder_info, 0); g_type_interface_add_prerequisite (file_folder_type, G_TYPE_OBJECT); @@ -861,14 +862,14 @@ gtk_file_folder_base_init (gpointer g_class) { GType iface_type = G_TYPE_FROM_INTERFACE (g_class); - g_signal_new ("deleted", + g_signal_new (I_("deleted"), iface_type, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkFileFolderIface, deleted), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - g_signal_new ("files-added", + g_signal_new (I_("files-added"), iface_type, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkFileFolderIface, files_added), @@ -876,7 +877,7 @@ gtk_file_folder_base_init (gpointer g_class) g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); - g_signal_new ("files-changed", + g_signal_new (I_("files-changed"), iface_type, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkFileFolderIface, files_changed), @@ -884,7 +885,7 @@ gtk_file_folder_base_init (gpointer g_class) g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); - g_signal_new ("files-removed", + g_signal_new (I_("files-removed"), iface_type, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkFileFolderIface, files_removed), @@ -892,7 +893,7 @@ gtk_file_folder_base_init (gpointer g_class) g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); - g_signal_new ("finished-loading", + g_signal_new (I_("finished-loading"), iface_type, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkFileFolderIface, finished_loading), @@ -976,7 +977,7 @@ gtk_file_path_get_type (void) static GType our_type = 0; if (our_type == 0) - our_type = g_boxed_type_register_static (g_intern_static_string ("GtkFilePath"), + our_type = g_boxed_type_register_static (I_("GtkFilePath"), (GBoxedCopyFunc) gtk_file_path_real_copy, (GBoxedFreeFunc) gtk_file_path_real_free); diff --git a/gtk/gtkfilesystemmodel.c b/gtk/gtkfilesystemmodel.c index 7d37afb3df..3dbbe34b1c 100644 --- a/gtk/gtkfilesystemmodel.c +++ b/gtk/gtkfilesystemmodel.c @@ -233,7 +233,7 @@ _gtk_file_system_model_get_type (void) }; file_system_model_type = g_type_register_static (G_TYPE_OBJECT, - g_intern_static_string ("GtkFileSystemModel"), + I_("GtkFileSystemModel"), &file_system_model_info, 0); g_type_add_interface_static (file_system_model_type, GTK_TYPE_TREE_MODEL, @@ -256,7 +256,7 @@ gtk_file_system_model_class_init (GtkFileSystemModelClass *class) gobject_class->finalize = gtk_file_system_model_finalize; file_system_model_signals[FINISHED_LOADING] = - g_signal_new ("finished-loading", + g_signal_new (I_("finished-loading"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkFileSystemModelClass, finished_loading), @@ -1493,7 +1493,7 @@ file_model_node_get_children (GtkFileSystemModel *model, g_signal_connect (node->folder, "files-removed", G_CALLBACK (files_removed_callback), node); - g_object_set_data (G_OBJECT (node->folder), g_intern_static_string ("model-node"), node); + g_object_set_data (G_OBJECT (node->folder), I_("model-node"), node); } if (is_folder && !has_children) diff --git a/gtk/gtkfilesystemunix.c b/gtk/gtkfilesystemunix.c index 1c3abcdeb5..89c22d470d 100644 --- a/gtk/gtkfilesystemunix.c +++ b/gtk/gtkfilesystemunix.c @@ -270,7 +270,7 @@ gtk_file_system_unix_get_type (void) }; file_system_unix_type = g_type_register_static (G_TYPE_OBJECT, - g_intern_static_string ("GtkFileSystemUnix"), + I_("GtkFileSystemUnix"), &file_system_unix_info, 0); g_type_add_interface_static (file_system_unix_type, GTK_TYPE_FILE_SYSTEM, @@ -716,7 +716,7 @@ icon_theme_changed (GtkIconTheme *icon_theme) cache = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify)g_free, (GDestroyNotify)icon_cache_element_free); - g_object_set_data_full (G_OBJECT (icon_theme), g_intern_static_string ("gtk-file-icon-cache"), + g_object_set_data_full (G_OBJECT (icon_theme), I_("gtk-file-icon-cache"), cache, (GDestroyNotify)g_hash_table_destroy); } @@ -735,7 +735,7 @@ get_cached_icon (GtkWidget *widget, (GDestroyNotify)g_free, (GDestroyNotify)icon_cache_element_free); - g_object_set_data_full (G_OBJECT (icon_theme), g_intern_static_string ("gtk-file-icon-cache"), + g_object_set_data_full (G_OBJECT (icon_theme), I_("gtk-file-icon-cache"), cache, (GDestroyNotify)g_hash_table_destroy); g_signal_connect (icon_theme, "changed", G_CALLBACK (icon_theme_changed), NULL); @@ -1746,7 +1746,7 @@ gtk_file_folder_unix_get_type (void) }; file_folder_unix_type = g_type_register_static (G_TYPE_OBJECT, - g_intern_static_string ("GtkFileFolderUnix"), + I_("GtkFileFolderUnix"), &file_folder_unix_info, 0); g_type_add_interface_static (file_folder_unix_type, GTK_TYPE_FILE_FOLDER, diff --git a/gtk/gtkfilesystemwin32.c b/gtk/gtkfilesystemwin32.c index d5c7674a73..523159491d 100644 --- a/gtk/gtkfilesystemwin32.c +++ b/gtk/gtkfilesystemwin32.c @@ -223,7 +223,7 @@ gtk_file_system_win32_get_type (void) }; file_system_win32_type = g_type_register_static (G_TYPE_OBJECT, - g_intern_static_string ("GtkFileSystemWin32"), + I_("GtkFileSystemWin32"), &file_system_win32_info, 0); g_type_add_interface_static (file_system_win32_type, GTK_TYPE_FILE_SYSTEM, @@ -1342,7 +1342,7 @@ gtk_file_folder_win32_get_type (void) }; file_folder_win32_type = g_type_register_static (G_TYPE_OBJECT, - g_intern_static_string ("GtkFileFolderWin32"), + I_("GtkFileFolderWin32"), &file_folder_win32_info, 0); g_type_add_interface_static (file_folder_win32_type, GTK_TYPE_FILE_FOLDER, diff --git a/gtk/gtkfixed.c b/gtk/gtkfixed.c index 0fbcfdfa20..d98cb04a60 100644 --- a/gtk/gtkfixed.c +++ b/gtk/gtkfixed.c @@ -87,7 +87,7 @@ gtk_fixed_get_type (void) (GInstanceInitFunc) gtk_fixed_init, }; - fixed_type = g_type_register_static (GTK_TYPE_CONTAINER, g_intern_static_string ("GtkFixed"), + fixed_type = g_type_register_static (GTK_TYPE_CONTAINER, I_("GtkFixed"), &fixed_info, 0); } diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c index 4e437ed217..c9cd587db3 100644 --- a/gtk/gtkfontbutton.c +++ b/gtk/gtkfontbutton.c @@ -135,7 +135,7 @@ gtk_font_button_get_type (void) }; font_button_type = - g_type_register_static (GTK_TYPE_BUTTON, g_intern_static_string ("GtkFontButton"), + g_type_register_static (GTK_TYPE_BUTTON, I_("GtkFontButton"), &font_button_info, 0); } @@ -266,7 +266,7 @@ gtk_font_button_class_init (GtkFontButtonClass *klass) * * Since: 2.4 */ - font_button_signals[FONT_SET] = g_signal_new ("font-set", + font_button_signals[FONT_SET] = g_signal_new (I_("font-set"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkFontButtonClass, font_set), diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c index 1a752e72da..4b50089500 100644 --- a/gtk/gtkfontsel.c +++ b/gtk/gtkfontsel.c @@ -190,7 +190,7 @@ gtk_font_selection_get_type (void) }; font_selection_type = - g_type_register_static (GTK_TYPE_VBOX, g_intern_static_string ("GtkFontSelection"), + g_type_register_static (GTK_TYPE_VBOX, I_("GtkFontSelection"), &fontsel_type_info, 0); } @@ -1322,7 +1322,7 @@ gtk_font_selection_dialog_get_type (void) }; font_selection_dialog_type = - g_type_register_static (GTK_TYPE_DIALOG, g_intern_static_string ("GtkFontSelectionDialog"), + g_type_register_static (GTK_TYPE_DIALOG, I_("GtkFontSelectionDialog"), &fontsel_diag_info, 0); } diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c index 7dcee079d0..460a53db74 100644 --- a/gtk/gtkframe.c +++ b/gtk/gtkframe.c @@ -99,7 +99,7 @@ gtk_frame_get_type (void) (GInstanceInitFunc) gtk_frame_init, }; - frame_type = g_type_register_static (GTK_TYPE_BIN, g_intern_static_string ("GtkFrame"), + frame_type = g_type_register_static (GTK_TYPE_BIN, I_("GtkFrame"), &frame_info, 0); } diff --git a/gtk/gtkgamma.c b/gtk/gtkgamma.c index 65aba0f6b8..0cb5f2a6b4 100644 --- a/gtk/gtkgamma.c +++ b/gtk/gtkgamma.c @@ -233,7 +233,7 @@ gtk_gamma_curve_get_type (void) (GInstanceInitFunc) gtk_gamma_curve_init, }; - gamma_curve_type = g_type_register_static (GTK_TYPE_VBOX, g_intern_static_string ("GtkGammaCurve"), + gamma_curve_type = g_type_register_static (GTK_TYPE_VBOX, I_("GtkGammaCurve"), &gamma_curve_info, 0); } return gamma_curve_type; @@ -274,7 +274,7 @@ gtk_gamma_curve_init (GtkGammaCurve *curve) for (i = 0; i < 3; ++i) { curve->button[i] = gtk_toggle_button_new (); - g_object_set_data (G_OBJECT (curve->button[i]), g_intern_static_string ("_GtkGammaCurveIndex"), + g_object_set_data (G_OBJECT (curve->button[i]), I_("_GtkGammaCurveIndex"), GINT_TO_POINTER (i)); gtk_container_add (GTK_CONTAINER (vbox), curve->button[i]); g_signal_connect (curve->button[i], "realize", @@ -288,7 +288,7 @@ gtk_gamma_curve_init (GtkGammaCurve *curve) for (i = 3; i < 5; ++i) { curve->button[i] = gtk_button_new (); - g_object_set_data (G_OBJECT (curve->button[i]), g_intern_static_string ("_GtkGammaCurveIndex"), + g_object_set_data (G_OBJECT (curve->button[i]), I_("_GtkGammaCurveIndex"), GINT_TO_POINTER (i)); gtk_container_add (GTK_CONTAINER (vbox), curve->button[i]); g_signal_connect (curve->button[i], "realize", diff --git a/gtk/gtkgc.c b/gtk/gtkgc.c index b53bcaaedf..4073ed384a 100644 --- a/gtk/gtkgc.c +++ b/gtk/gtkgc.c @@ -26,6 +26,7 @@ #include <config.h> #include "gtkgc.h" +#include "gtkintl.h" #include "gtkalias.h" @@ -116,7 +117,7 @@ gtk_gc_get_drawable_ht (GdkScreen *screen) (GEqualFunc) gtk_gc_drawable_equal, NULL, free_gc_drawable); g_object_set_data_full (G_OBJECT (screen), - g_intern_static_string ("gtk-gc-drawable-ht"), ht, + I_("gtk-gc-drawable-ht"), ht, (GDestroyNotify)g_hash_table_destroy); } diff --git a/gtk/gtkhandlebox.c b/gtk/gtkhandlebox.c index 4e506fb12c..884930c9fe 100644 --- a/gtk/gtkhandlebox.c +++ b/gtk/gtkhandlebox.c @@ -170,7 +170,7 @@ gtk_handle_box_get_type (void) (GInstanceInitFunc) gtk_handle_box_init, }; - handle_box_type = g_type_register_static (GTK_TYPE_BIN, g_intern_static_string ("GtkHandleBox"), + handle_box_type = g_type_register_static (GTK_TYPE_BIN, I_("GtkHandleBox"), &handle_box_info, 0); } @@ -257,7 +257,7 @@ gtk_handle_box_class_init (GtkHandleBoxClass *class) class->child_detached = NULL; handle_box_signals[SIGNAL_CHILD_ATTACHED] = - g_signal_new ("child_attached", + g_signal_new (I_("child_attached"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkHandleBoxClass, child_attached), @@ -266,7 +266,7 @@ gtk_handle_box_class_init (GtkHandleBoxClass *class) G_TYPE_NONE, 1, GTK_TYPE_WIDGET); handle_box_signals[SIGNAL_CHILD_DETACHED] = - g_signal_new ("child_detached", + g_signal_new (I_("child_detached"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkHandleBoxClass, child_detached), diff --git a/gtk/gtkhbbox.c b/gtk/gtkhbbox.c index 9469f6c374..3dda89c16f 100644 --- a/gtk/gtkhbbox.c +++ b/gtk/gtkhbbox.c @@ -26,6 +26,7 @@ #include <config.h> #include "gtkhbbox.h" +#include "gtkintl.h" #include "gtkalias.h" @@ -60,7 +61,7 @@ gtk_hbutton_box_get_type (void) }; hbutton_box_type = - g_type_register_static (GTK_TYPE_BUTTON_BOX, g_intern_static_string ("GtkHButtonBox"), + g_type_register_static (GTK_TYPE_BUTTON_BOX, I_("GtkHButtonBox"), &hbutton_box_info, 0); } diff --git a/gtk/gtkhbox.c b/gtk/gtkhbox.c index 3095f95d8c..4c610bee2a 100644 --- a/gtk/gtkhbox.c +++ b/gtk/gtkhbox.c @@ -26,6 +26,7 @@ #include <config.h> #include "gtkhbox.h" +#include "gtkintl.h" #include "gtkalias.h" @@ -57,7 +58,7 @@ gtk_hbox_get_type (void) (GInstanceInitFunc) gtk_hbox_init, }; - hbox_type = g_type_register_static (GTK_TYPE_BOX, g_intern_static_string ("GtkHBox"), + hbox_type = g_type_register_static (GTK_TYPE_BOX, I_("GtkHBox"), &hbox_info, 0); } diff --git a/gtk/gtkhpaned.c b/gtk/gtkhpaned.c index 90ec3b689f..34eb3c0711 100644 --- a/gtk/gtkhpaned.c +++ b/gtk/gtkhpaned.c @@ -26,6 +26,7 @@ #include <config.h> #include "gtkhpaned.h" +#include "gtkintl.h" #include "gtkalias.h" static void gtk_hpaned_class_init (GtkHPanedClass *klass); @@ -57,7 +58,7 @@ gtk_hpaned_get_type (void) (GInstanceInitFunc) gtk_hpaned_init, }; - hpaned_type = g_type_register_static (GTK_TYPE_PANED, g_intern_static_string ("GtkHPaned"), + hpaned_type = g_type_register_static (GTK_TYPE_PANED, I_("GtkHPaned"), &hpaned_info, 0); } diff --git a/gtk/gtkhruler.c b/gtk/gtkhruler.c index f25af42407..2dc5aba9d1 100644 --- a/gtk/gtkhruler.c +++ b/gtk/gtkhruler.c @@ -29,6 +29,7 @@ #include <glib/gprintf.h> #include <string.h> #include "gtkhruler.h" +#include "gtkintl.h" #include "gtkalias.h" @@ -68,7 +69,7 @@ gtk_hruler_get_type (void) (GInstanceInitFunc) gtk_hruler_init, }; - hruler_type = g_type_register_static (GTK_TYPE_RULER, g_intern_static_string ("GtkHRuler"), + hruler_type = g_type_register_static (GTK_TYPE_RULER, I_("GtkHRuler"), &hruler_info, 0); } diff --git a/gtk/gtkhscale.c b/gtk/gtkhscale.c index 1781b2c4e8..597ed8ef10 100644 --- a/gtk/gtkhscale.c +++ b/gtk/gtkhscale.c @@ -63,7 +63,7 @@ gtk_hscale_get_type (void) (GInstanceInitFunc) gtk_hscale_init, }; - hscale_type = g_type_register_static (GTK_TYPE_SCALE, g_intern_static_string ("GtkHScale"), + hscale_type = g_type_register_static (GTK_TYPE_SCALE, I_("GtkHScale"), &hscale_info, 0); } diff --git a/gtk/gtkhscrollbar.c b/gtk/gtkhscrollbar.c index 23147f7f7a..d67f8ad3c6 100644 --- a/gtk/gtkhscrollbar.c +++ b/gtk/gtkhscrollbar.c @@ -55,7 +55,7 @@ gtk_hscrollbar_get_type (void) }; hscrollbar_type = - g_type_register_static (GTK_TYPE_SCROLLBAR, g_intern_static_string ("GtkHScrollbar"), + g_type_register_static (GTK_TYPE_SCROLLBAR, I_("GtkHScrollbar"), &hscrollbar_info, 0); } diff --git a/gtk/gtkhseparator.c b/gtk/gtkhseparator.c index 18c9c37b57..80b6a991f1 100644 --- a/gtk/gtkhseparator.c +++ b/gtk/gtkhseparator.c @@ -26,6 +26,7 @@ #include <config.h> #include "gtkhseparator.h" +#include "gtkintl.h" #include "gtkalias.h" @@ -56,7 +57,7 @@ gtk_hseparator_get_type (void) }; hseparator_type = - g_type_register_static (GTK_TYPE_SEPARATOR, g_intern_static_string ("GtkHSeparator"), + g_type_register_static (GTK_TYPE_SEPARATOR, I_("GtkHSeparator"), &hseparator_info, 0); } diff --git a/gtk/gtkhsv.c b/gtk/gtkhsv.c index a23bbd2f14..3b4a16f1d6 100644 --- a/gtk/gtkhsv.c +++ b/gtk/gtkhsv.c @@ -30,6 +30,7 @@ #include "gtkbindings.h" #include "gtkcontainer.h" #include "gtkmarshalers.h" +#include "gtkintl.h" #include "gtkalias.h" /* @@ -144,7 +145,7 @@ gtk_hsv_get_type (void) (GInstanceInitFunc) gtk_hsv_init, }; - hsv_type = g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkHSV"), + hsv_type = g_type_register_static (GTK_TYPE_WIDGET, I_("GtkHSV"), &hsv_info, 0); } @@ -184,7 +185,7 @@ gtk_hsv_class_init (GtkHSVClass *class) hsv_class->move = gtk_hsv_move; hsv_signals[CHANGED] = - g_signal_new ("changed", + g_signal_new (I_("changed"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkHSVClass, changed), @@ -193,7 +194,7 @@ gtk_hsv_class_init (GtkHSVClass *class) G_TYPE_NONE, 0); hsv_signals[MOVE] = - g_signal_new ("move", + g_signal_new (I_("move"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkHSVClass, move), diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c index f600284ccb..26ee7dc1f3 100644 --- a/gtk/gtkiconfactory.c +++ b/gtk/gtkiconfactory.c @@ -119,7 +119,7 @@ gtk_icon_factory_get_type (void) }; icon_factory_type = - g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkIconFactory"), + g_type_register_static (G_TYPE_OBJECT, I_("GtkIconFactory"), &icon_factory_info, 0); } @@ -1537,7 +1537,7 @@ gtk_icon_set_get_type (void) static GType our_type = 0; if (our_type == 0) - our_type = g_boxed_type_register_static (g_intern_static_string ("GtkIconSet"), + our_type = g_boxed_type_register_static (I_("GtkIconSet"), (GBoxedCopyFunc) gtk_icon_set_ref, (GBoxedFreeFunc) gtk_icon_set_unref); diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c index 299b02900c..3dcc0b8bea 100644 --- a/gtk/gtkicontheme.c +++ b/gtk/gtkicontheme.c @@ -256,7 +256,7 @@ gtk_icon_theme_get_type (void) (GInstanceInitFunc) gtk_icon_theme_init, }; - type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkIconTheme"), &info, 0); + type = g_type_register_static (G_TYPE_OBJECT, I_("GtkIconTheme"), &info, 0); } return type; @@ -339,7 +339,7 @@ gtk_icon_theme_get_for_screen (GdkScreen *screen) priv = icon_theme->priv; priv->is_screen_singleton = TRUE; - g_object_set_data (G_OBJECT (screen), g_intern_static_string ("gtk-icon-theme"), icon_theme); + g_object_set_data (G_OBJECT (screen), I_("gtk-icon-theme"), icon_theme); } return icon_theme; @@ -362,7 +362,7 @@ gtk_icon_theme_class_init (GtkIconThemeClass *klass) * that a change has occurred in the contents of the current * icon theme. **/ - signal_changed = g_signal_new ("changed", + signal_changed = g_signal_new (I_("changed"), G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkIconThemeClass, changed), @@ -389,7 +389,7 @@ display_closed (GdkDisplay *display, if (was_screen_singleton) { - g_object_set_data (G_OBJECT (screen), g_intern_static_string ("gtk-icon-theme"), NULL); + g_object_set_data (G_OBJECT (screen), I_("gtk-icon-theme"), NULL); priv->is_screen_singleton = FALSE; } @@ -2265,7 +2265,7 @@ gtk_icon_info_get_type (void) static GType our_type = 0; if (our_type == 0) - our_type = g_boxed_type_register_static (g_intern_static_string ("GtkIconInfo"), + our_type = g_boxed_type_register_static (I_("GtkIconInfo"), (GBoxedCopyFunc) gtk_icon_info_copy, (GBoxedFreeFunc) gtk_icon_info_free); diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c index 6d1b962d57..bc88d13dbf 100644 --- a/gtk/gtkiconview.c +++ b/gtk/gtkiconview.c @@ -730,7 +730,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass) /* Signals */ widget_class->set_scroll_adjustments_signal = - g_signal_new ("set_scroll_adjustments", + g_signal_new (I_("set_scroll_adjustments"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkIconViewClass, set_scroll_adjustments), @@ -740,7 +740,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass) GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT); icon_view_signals[ITEM_ACTIVATED] = - g_signal_new ("item_activated", + g_signal_new (I_("item_activated"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkIconViewClass, item_activated), @@ -750,7 +750,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass) GTK_TYPE_TREE_PATH); icon_view_signals[SELECTION_CHANGED] = - g_signal_new ("selection_changed", + g_signal_new (I_("selection_changed"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkIconViewClass, selection_changed), @@ -759,7 +759,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass) G_TYPE_NONE, 0); icon_view_signals[SELECT_ALL] = - g_signal_new ("select_all", + g_signal_new (I_("select_all"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkIconViewClass, select_all), @@ -768,7 +768,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass) G_TYPE_NONE, 0); icon_view_signals[UNSELECT_ALL] = - g_signal_new ("unselect_all", + g_signal_new (I_("unselect_all"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkIconViewClass, unselect_all), @@ -777,7 +777,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass) G_TYPE_NONE, 0); icon_view_signals[SELECT_CURSOR_ITEM] = - g_signal_new ("select_cursor_item", + g_signal_new (I_("select_cursor_item"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkIconViewClass, select_cursor_item), @@ -786,7 +786,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass) G_TYPE_NONE, 0); icon_view_signals[TOGGLE_CURSOR_ITEM] = - g_signal_new ("toggle_cursor_item", + g_signal_new (I_("toggle_cursor_item"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkIconViewClass, toggle_cursor_item), @@ -795,7 +795,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass) G_TYPE_NONE, 0); icon_view_signals[ACTIVATE_CURSOR_ITEM] = - g_signal_new ("activate_cursor_item", + g_signal_new (I_("activate_cursor_item"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkIconViewClass, activate_cursor_item), @@ -804,7 +804,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass) G_TYPE_BOOLEAN, 0); icon_view_signals[MOVE_CURSOR] = - g_signal_new ("move_cursor", + g_signal_new (I_("move_cursor"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkIconViewClass, move_cursor), @@ -815,14 +815,21 @@ gtk_icon_view_class_init (GtkIconViewClass *klass) G_TYPE_INT); /* Key bindings */ - gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK, "select_all", 0); - gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "unselect_all", 0); - gtk_binding_entry_add_signal (binding_set, GDK_space, GDK_CONTROL_MASK, "toggle_cursor_item", 0); - - gtk_binding_entry_add_signal (binding_set, GDK_space, 0, "activate_cursor_item", 0); - gtk_binding_entry_add_signal (binding_set, GDK_Return, 0, "activate_cursor_item", 0); - gtk_binding_entry_add_signal (binding_set, GDK_ISO_Enter, 0, "activate_cursor_item", 0); - gtk_binding_entry_add_signal (binding_set, GDK_KP_Enter, 0, "activate_cursor_item", 0); + gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK, + "select_all", 0); + gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK | GDK_SHIFT_MASK, + "unselect_all", 0); + gtk_binding_entry_add_signal (binding_set, GDK_space, GDK_CONTROL_MASK, + "toggle_cursor_item", 0); + + gtk_binding_entry_add_signal (binding_set, GDK_space, 0, + "activate_cursor_item", 0); + gtk_binding_entry_add_signal (binding_set, GDK_Return, 0, + "activate_cursor_item", 0); + gtk_binding_entry_add_signal (binding_set, GDK_ISO_Enter, 0, + "activate_cursor_item", 0); + gtk_binding_entry_add_signal (binding_set, GDK_KP_Enter, 0, + "activate_cursor_item", 0); gtk_icon_view_add_move_binding (binding_set, GDK_Up, 0, GTK_MOVEMENT_DISPLAY_LINES, -1); @@ -3411,7 +3418,7 @@ gtk_icon_view_add_move_binding (GtkBindingSet *binding_set, { gtk_binding_entry_add_signal (binding_set, keyval, modmask, - "move_cursor", 2, + I_("move_cursor"), 2, G_TYPE_ENUM, step, G_TYPE_INT, count); @@ -5579,7 +5586,7 @@ set_status_pending (GdkDragContext *context, GdkDragAction suggested_action) { g_object_set_data (G_OBJECT (context), - g_intern_static_string ("gtk-icon-view-status-pending"), + I_("gtk-icon-view-status-pending"), GINT_TO_POINTER (suggested_action)); } @@ -5627,12 +5634,12 @@ set_source_row (GdkDragContext *context, { if (source_row) g_object_set_data_full (G_OBJECT (context), - g_intern_static_string ("gtk-icon-view-source-row"), + I_("gtk-icon-view-source-row"), gtk_tree_row_reference_new (model, source_row), (GDestroyNotify) gtk_tree_row_reference_free); else g_object_set_data_full (G_OBJECT (context), - g_intern_static_string ("gtk-icon-view-source-row"), + I_("gtk-icon-view-source-row"), NULL, NULL); } @@ -5677,7 +5684,7 @@ set_dest_row (GdkDragContext *context, if (!dest_row) { g_object_set_data_full (G_OBJECT (context), - g_intern_static_string ("gtk-icon-view-dest-row"), + I_("gtk-icon-view-dest-row"), NULL, NULL); return; } @@ -5688,7 +5695,7 @@ set_dest_row (GdkDragContext *context, dr->empty_view_drop = empty_view_drop; dr->drop_append_mode = drop_append_mode; g_object_set_data_full (G_OBJECT (context), - g_intern_static_string ("gtk-icon-view-dest-row"), + I_("gtk-icon-view-dest-row"), dr, (GDestroyNotify) dest_row_free); } @@ -8058,7 +8065,7 @@ gtk_icon_view_item_accessible_get_type (void) }; type = g_type_register_static (ATK_TYPE_OBJECT, - g_intern_static_string ("GtkIconViewItemAccessible"), &tinfo, 0); + I_("GtkIconViewItemAccessible"), &tinfo, 0); g_type_add_interface_static (type, ATK_TYPE_COMPONENT, &atk_component_info); g_type_add_interface_static (type, ATK_TYPE_ACTION, diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c index 902dadb313..37be14a667 100644 --- a/gtk/gtkimage.c +++ b/gtk/gtkimage.c @@ -122,7 +122,7 @@ gtk_image_get_type (void) (GInstanceInitFunc) gtk_image_init, }; - image_type = g_type_register_static (GTK_TYPE_MISC, g_intern_static_string ("GtkImage"), + image_type = g_type_register_static (GTK_TYPE_MISC, I_("GtkImage"), &image_info, 0); } diff --git a/gtk/gtkimagemenuitem.c b/gtk/gtkimagemenuitem.c index 8e75ca9082..7e62c6f4a2 100644 --- a/gtk/gtkimagemenuitem.c +++ b/gtk/gtkimagemenuitem.c @@ -93,7 +93,7 @@ gtk_image_menu_item_get_type (void) }; image_menu_item_type = - g_type_register_static (GTK_TYPE_MENU_ITEM, g_intern_static_string ("GtkImageMenuItem"), + g_type_register_static (GTK_TYPE_MENU_ITEM, I_("GtkImageMenuItem"), &image_menu_item_info, 0); } @@ -650,7 +650,7 @@ gtk_image_menu_item_screen_changed (GtkWidget *widget, g_signal_connect (settings, "notify::gtk-menu-images", G_CALLBACK (gtk_image_menu_item_setting_changed), 0); g_object_set_data (G_OBJECT (settings), - g_intern_static_string ("gtk-image-menu-item-connection"), + I_("gtk-image-menu-item-connection"), GUINT_TO_POINTER (show_image_connection)); show_image_change_notify (GTK_IMAGE_MENU_ITEM (widget)); diff --git a/gtk/gtkimcontext.c b/gtk/gtkimcontext.c index 8a0d50428e..43662003f3 100644 --- a/gtk/gtkimcontext.c +++ b/gtk/gtkimcontext.c @@ -22,6 +22,7 @@ #include "gtkimcontext.h" #include "gtkmain.h" /* For _gtk_boolean_handled_accumulator */ #include "gtkmarshalers.h" +#include "gtkintl.h" #include "gtkalias.h" enum { @@ -75,7 +76,7 @@ gtk_im_context_get_type (void) }; im_context_type = - g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkIMContext"), + g_type_register_static (G_TYPE_OBJECT, I_("GtkIMContext"), &im_context_info, G_TYPE_FLAG_ABSTRACT); } @@ -91,7 +92,7 @@ gtk_im_context_class_init (GtkIMContextClass *klass) klass->set_surrounding = gtk_im_context_real_set_surrounding; im_context_signals[PREEDIT_START] = - g_signal_new ("preedit_start", + g_signal_new (I_("preedit_start"), G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkIMContextClass, preedit_start), @@ -100,7 +101,7 @@ gtk_im_context_class_init (GtkIMContextClass *klass) G_TYPE_NONE, 0); im_context_signals[PREEDIT_END] = - g_signal_new ("preedit_end", + g_signal_new (I_("preedit_end"), G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkIMContextClass, preedit_end), @@ -109,7 +110,7 @@ gtk_im_context_class_init (GtkIMContextClass *klass) G_TYPE_NONE, 0); im_context_signals[PREEDIT_CHANGED] = - g_signal_new ("preedit_changed", + g_signal_new (I_("preedit_changed"), G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkIMContextClass, preedit_changed), @@ -118,7 +119,7 @@ gtk_im_context_class_init (GtkIMContextClass *klass) G_TYPE_NONE, 0); im_context_signals[COMMIT] = - g_signal_new ("commit", + g_signal_new (I_("commit"), G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkIMContextClass, commit), @@ -128,7 +129,7 @@ gtk_im_context_class_init (GtkIMContextClass *klass) G_TYPE_STRING); im_context_signals[RETRIEVE_SURROUNDING] = - g_signal_new ("retrieve_surrounding", + g_signal_new (I_("retrieve_surrounding"), G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkIMContextClass, retrieve_surrounding), @@ -136,7 +137,7 @@ gtk_im_context_class_init (GtkIMContextClass *klass) _gtk_marshal_BOOLEAN__VOID, G_TYPE_BOOLEAN, 0); im_context_signals[DELETE_SURROUNDING] = - g_signal_new ("delete_surrounding", + g_signal_new (I_("delete_surrounding"), G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkIMContextClass, delete_surrounding), @@ -209,7 +210,7 @@ gtk_im_context_real_get_surrounding (GtkIMContext *context, if (!info) { info = &local_info; - g_object_set_data (G_OBJECT (context), g_intern_static_string ("gtk-im-surrounding-info"), info); + g_object_set_data (G_OBJECT (context), I_("gtk-im-surrounding-info"), info); info_is_local = TRUE; } @@ -231,7 +232,7 @@ gtk_im_context_real_get_surrounding (GtkIMContext *context, if (info_is_local) { g_free (info->text); - g_object_set_data (G_OBJECT (context), g_intern_static_string ("gtk-im-surrounding-info"), NULL); + g_object_set_data (G_OBJECT (context), I_("gtk-im-surrounding-info"), NULL); } return result; diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c index 05c5841287..26f0d4dd18 100644 --- a/gtk/gtkimcontextsimple.c +++ b/gtk/gtkimcontextsimple.c @@ -23,6 +23,7 @@ #include <gdk/gdkkeysyms.h> #include "gtkaccelgroup.h" #include "gtkimcontextsimple.h" +#include "gtkintl.h" #include "gtkalias.h" typedef struct _GtkComposeTable GtkComposeTable; @@ -962,7 +963,7 @@ gtk_im_context_simple_get_type (void) }; im_context_simple_type = - g_type_register_static (GTK_TYPE_IM_CONTEXT, g_intern_static_string ("GtkIMContextSimple"), + g_type_register_static (GTK_TYPE_IM_CONTEXT, I_("GtkIMContextSimple"), &im_context_simple_info, 0); } diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c index 26ace6d6e9..977ff4bfa5 100644 --- a/gtk/gtkimmodule.c +++ b/gtk/gtkimmodule.c @@ -188,7 +188,7 @@ gtk_im_module_get_type (void) }; im_module_type = - g_type_register_static (G_TYPE_TYPE_MODULE, g_intern_static_string ("GtkIMModule"), + g_type_register_static (G_TYPE_TYPE_MODULE, I_("GtkIMModule"), &im_module_info, 0); } diff --git a/gtk/gtkimmulticontext.c b/gtk/gtkimmulticontext.c index 96934f9d97..b1062af9e3 100644 --- a/gtk/gtkimmulticontext.c +++ b/gtk/gtkimmulticontext.c @@ -111,7 +111,7 @@ gtk_im_multicontext_get_type (void) }; im_multicontext_type = - g_type_register_static (GTK_TYPE_IM_CONTEXT, g_intern_static_string ("GtkIMMulticontext"), + g_type_register_static (GTK_TYPE_IM_CONTEXT, I_("GtkIMMulticontext"), &im_multicontext_info, 0); } @@ -555,7 +555,7 @@ gtk_im_multicontext_append_menuitems (GtkIMMulticontext *context, group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem)); - g_object_set_data (G_OBJECT (menuitem), g_intern_static_string ("gtk-context-id"), + g_object_set_data (G_OBJECT (menuitem), I_("gtk-context-id"), (char *)contexts[i]->context_id); g_signal_connect (menuitem, "activate", G_CALLBACK (activate_cb), context); diff --git a/gtk/gtkinputdialog.c b/gtk/gtkinputdialog.c index e0b63f6eec..447a0798a3 100644 --- a/gtk/gtkinputdialog.c +++ b/gtk/gtkinputdialog.c @@ -143,7 +143,7 @@ gtk_input_dialog_get_type (void) }; input_dialog_type = - g_type_register_static (GTK_TYPE_DIALOG, g_intern_static_string ("GtkInputDialog"), + g_type_register_static (GTK_TYPE_DIALOG, I_("GtkInputDialog"), &input_dialog_info, 0); } @@ -199,7 +199,7 @@ gtk_input_dialog_class_init (GtkInputDialogClass *klass) klass->disable_device = NULL; input_dialog_signals[ENABLE_DEVICE] = - g_signal_new ("enable_device", + g_signal_new (I_("enable_device"), G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkInputDialogClass, enable_device), @@ -209,7 +209,7 @@ gtk_input_dialog_class_init (GtkInputDialogClass *klass) GDK_TYPE_DEVICE); input_dialog_signals[DISABLE_DEVICE] = - g_signal_new ("disable_device", + g_signal_new (I_("disable_device"), G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkInputDialogClass, disable_device), diff --git a/gtk/gtkintl.h b/gtk/gtkintl.h index d29723bb92..3e03c69ce9 100644 --- a/gtk/gtkintl.h +++ b/gtk/gtkintl.h @@ -10,4 +10,7 @@ #define P_(String) (String) #endif +/* not really I18N-related, but also a string marker macro */ +#define I_(string) g_intern_static_string (string) + #endif diff --git a/gtk/gtkinvisible.c b/gtk/gtkinvisible.c index 08fbbc6363..954e9b1f4a 100644 --- a/gtk/gtkinvisible.c +++ b/gtk/gtkinvisible.c @@ -81,7 +81,7 @@ gtk_invisible_get_type (void) (GInstanceInitFunc) gtk_invisible_init, }; - invisible_type = g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkInvisible"), + invisible_type = g_type_register_static (GTK_TYPE_WIDGET, I_("GtkInvisible"), &invisible_info, 0); } diff --git a/gtk/gtkitem.c b/gtk/gtkitem.c index 34193e7e39..38a47580f6 100644 --- a/gtk/gtkitem.c +++ b/gtk/gtkitem.c @@ -27,6 +27,7 @@ #include <config.h> #include "gtkitem.h" #include "gtkmarshalers.h" +#include "gtkintl.h" #include "gtkalias.h" @@ -71,7 +72,7 @@ gtk_item_get_type (void) NULL, /* value_table */ }; - item_type = g_type_register_static (GTK_TYPE_BIN, g_intern_static_string ("GtkItem"), + item_type = g_type_register_static (GTK_TYPE_BIN, I_("GtkItem"), &item_info, G_TYPE_FLAG_ABSTRACT); } @@ -96,7 +97,7 @@ gtk_item_class_init (GtkItemClass *class) class->toggle = NULL; item_signals[SELECT] = - g_signal_new ("select", + g_signal_new (I_("select"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkItemClass, select), @@ -104,7 +105,7 @@ gtk_item_class_init (GtkItemClass *class) _gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); item_signals[DESELECT] = - g_signal_new ("deselect", + g_signal_new (I_("deselect"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkItemClass, deselect), @@ -112,7 +113,7 @@ gtk_item_class_init (GtkItemClass *class) _gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); item_signals[TOGGLE] = - g_signal_new ("toggle", + g_signal_new (I_("toggle"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkItemClass, toggle), diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c index 21c0c06fe5..4aac44d5e1 100644 --- a/gtk/gtkitemfactory.c +++ b/gtk/gtkitemfactory.c @@ -43,6 +43,7 @@ #include "gtk/gtkimage.h" #include "gtk/gtkstock.h" #include "gtk/gtkiconfactory.h" +#include "gtkintl.h" #include <string.h> #include <fcntl.h> #ifdef HAVE_UNISTD_H @@ -126,7 +127,7 @@ gtk_item_factory_get_type (void) }; item_factory_type = - g_type_register_static (GTK_TYPE_OBJECT, g_intern_static_string ("GtkItemFactory"), + g_type_register_static (GTK_TYPE_OBJECT, I_("GtkItemFactory"), &item_factory_info, 0); } diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 71c8aa16df..5fb3beeb32 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -218,7 +218,7 @@ gtk_label_get_type (void) (GInstanceInitFunc) gtk_label_init, }; - label_type = g_type_register_static (GTK_TYPE_MISC, g_intern_static_string ("GtkLabel"), + label_type = g_type_register_static (GTK_TYPE_MISC, I_("GtkLabel"), &label_info, 0); } @@ -286,7 +286,7 @@ gtk_label_class_init (GtkLabelClass *class) class->copy_clipboard = gtk_label_copy_clipboard; signals[MOVE_CURSOR] = - g_signal_new ("move_cursor", + g_signal_new (I_("move_cursor"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkLabelClass, move_cursor), @@ -298,7 +298,7 @@ gtk_label_class_init (GtkLabelClass *class) G_TYPE_BOOLEAN); signals[COPY_CLIPBOARD] = - g_signal_new ("copy_clipboard", + g_signal_new (I_("copy_clipboard"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkLabelClass, copy_clipboard), @@ -307,7 +307,7 @@ gtk_label_class_init (GtkLabelClass *class) G_TYPE_NONE, 0); signals[POPULATE_POPUP] = - g_signal_new ("populate_popup", + g_signal_new (I_("populate_popup"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkLabelClass, populate_popup), @@ -919,7 +919,7 @@ gtk_label_setup_mnemonic (GtkLabel *label, } done: - g_object_set_data (G_OBJECT (label), g_intern_static_string ("gtk-mnemonic-menu"), mnemonic_menu); + g_object_set_data (G_OBJECT (label), I_("gtk-mnemonic-menu"), mnemonic_menu); } static void @@ -1749,7 +1749,7 @@ get_label_wrap_width (GtkLabel *label) if (!wrap_width) { wrap_width = g_new0 (LabelWrapWidth, 1); - g_object_set_data_full (G_OBJECT (style), g_intern_static_string ("gtk-label-wrap-width"), + g_object_set_data_full (G_OBJECT (style), I_("gtk-label-wrap-width"), wrap_width, label_wrap_width_free); } @@ -3889,7 +3889,7 @@ append_action_signal (GtkLabel *label, { GtkWidget *menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL); - g_object_set_data (G_OBJECT (menuitem), g_intern_static_string ("gtk-signal"), (char *)signal); + g_object_set_data (G_OBJECT (menuitem), I_("gtk-signal"), (char *)signal); g_signal_connect (menuitem, "activate", G_CALLBACK (activate_cb), label); diff --git a/gtk/gtklayout.c b/gtk/gtklayout.c index 5cdfd15313..52b1689d36 100644 --- a/gtk/gtklayout.c +++ b/gtk/gtklayout.c @@ -581,7 +581,7 @@ gtk_layout_get_type (void) (GInstanceInitFunc) gtk_layout_init, }; - layout_type = g_type_register_static (GTK_TYPE_CONTAINER, g_intern_static_string ("GtkLayout"), + layout_type = g_type_register_static (GTK_TYPE_CONTAINER, I_("GtkLayout"), &layout_info, 0); } @@ -678,7 +678,7 @@ gtk_layout_class_init (GtkLayoutClass *class) class->set_scroll_adjustments = gtk_layout_set_adjustments; widget_class->set_scroll_adjustments_signal = - g_signal_new ("set_scroll_adjustments", + g_signal_new (I_("set_scroll_adjustments"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkLayoutClass, set_scroll_adjustments), diff --git a/gtk/gtklist.c b/gtk/gtklist.c index 1fb46a5bc3..a1b8be585f 100644 --- a/gtk/gtklist.c +++ b/gtk/gtklist.c @@ -35,6 +35,7 @@ #include "gtksignal.h" #include "gtklabel.h" #include "gtkmarshalers.h" +#include "gtkintl.h" #include "gtkalias.h" enum { @@ -194,7 +195,7 @@ gtk_list_get_type (void) (GtkClassInitFunc) NULL, }; - g_intern_static_string ("GtkList"); + I_("GtkList"); list_type = gtk_type_unique (GTK_TYPE_CONTAINER, &list_info); } @@ -246,14 +247,14 @@ gtk_list_class_init (GtkListClass *class) class->unselect_child = gtk_real_list_unselect_child; list_signals[SELECTION_CHANGED] = - gtk_signal_new ("selection_changed", + gtk_signal_new (I_("selection_changed"), GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkListClass, selection_changed), _gtk_marshal_VOID__VOID, GTK_TYPE_NONE, 0); list_signals[SELECT_CHILD] = - gtk_signal_new ("select_child", + gtk_signal_new (I_("select_child"), GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkListClass, select_child), @@ -261,7 +262,7 @@ gtk_list_class_init (GtkListClass *class) GTK_TYPE_NONE, 1, GTK_TYPE_WIDGET); list_signals[UNSELECT_CHILD] = - gtk_signal_new ("unselect_child", + gtk_signal_new (I_("unselect_child"), GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkListClass, unselect_child), diff --git a/gtk/gtklistitem.c b/gtk/gtklistitem.c index 1c841950da..4d3de9f7a6 100644 --- a/gtk/gtklistitem.c +++ b/gtk/gtklistitem.c @@ -33,6 +33,7 @@ #include "gtklist.h" #include "gtkmarshalers.h" #include "gtksignal.h" +#include "gtkintl.h" #include <gdk/gdkkeysyms.h> #include "gtkalias.h" @@ -93,7 +94,7 @@ gtk_list_item_get_type (void) (GtkClassInitFunc) NULL, }; - g_intern_static_string ("GtkListItem"); + I_("GtkListItem"); list_item_type = gtk_type_unique (gtk_item_get_type (), &list_item_info); } @@ -137,56 +138,56 @@ gtk_list_item_class_init (GtkListItemClass *class) class->toggle_add_mode = NULL; list_item_signals[TOGGLE_FOCUS_ROW] = - gtk_signal_new ("toggle_focus_row", + gtk_signal_new (I_("toggle_focus_row"), GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkListItemClass, toggle_focus_row), _gtk_marshal_VOID__VOID, GTK_TYPE_NONE, 0); list_item_signals[SELECT_ALL] = - gtk_signal_new ("select_all", + gtk_signal_new (I_("select_all"), GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkListItemClass, select_all), _gtk_marshal_VOID__VOID, GTK_TYPE_NONE, 0); list_item_signals[UNSELECT_ALL] = - gtk_signal_new ("unselect_all", + gtk_signal_new (I_("unselect_all"), GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkListItemClass, unselect_all), _gtk_marshal_VOID__VOID, GTK_TYPE_NONE, 0); list_item_signals[UNDO_SELECTION] = - gtk_signal_new ("undo_selection", + gtk_signal_new (I_("undo_selection"), GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkListItemClass, undo_selection), _gtk_marshal_VOID__VOID, GTK_TYPE_NONE, 0); list_item_signals[START_SELECTION] = - gtk_signal_new ("start_selection", + gtk_signal_new (I_("start_selection"), GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkListItemClass, start_selection), _gtk_marshal_VOID__VOID, GTK_TYPE_NONE, 0); list_item_signals[END_SELECTION] = - gtk_signal_new ("end_selection", + gtk_signal_new (I_("end_selection"), GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkListItemClass, end_selection), _gtk_marshal_VOID__VOID, GTK_TYPE_NONE, 0); list_item_signals[TOGGLE_ADD_MODE] = - gtk_signal_new ("toggle_add_mode", + gtk_signal_new (I_("toggle_add_mode"), GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkListItemClass, toggle_add_mode), _gtk_marshal_VOID__VOID, GTK_TYPE_NONE, 0); list_item_signals[EXTEND_SELECTION] = - gtk_signal_new ("extend_selection", + gtk_signal_new (I_("extend_selection"), GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkListItemClass, extend_selection), @@ -194,14 +195,14 @@ gtk_list_item_class_init (GtkListItemClass *class) GTK_TYPE_NONE, 3, GTK_TYPE_SCROLL_TYPE, GTK_TYPE_FLOAT, GTK_TYPE_BOOL); list_item_signals[SCROLL_VERTICAL] = - gtk_signal_new ("scroll_vertical", + gtk_signal_new (I_("scroll_vertical"), GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkListItemClass, scroll_vertical), _gtk_marshal_VOID__ENUM_FLOAT, GTK_TYPE_NONE, 2, GTK_TYPE_SCROLL_TYPE, GTK_TYPE_FLOAT); list_item_signals[SCROLL_HORIZONTAL] = - gtk_signal_new ("scroll_horizontal", + gtk_signal_new (I_("scroll_horizontal"), GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkListItemClass, scroll_horizontal), diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c index 2e64b2e7bb..29d28fbc3b 100644 --- a/gtk/gtkliststore.c +++ b/gtk/gtkliststore.c @@ -25,6 +25,7 @@ #include "gtktreedatalist.h" #include "gtktreednd.h" #include "gtksequence.h" +#include "gtkintl.h" #include "gtkalias.h" #define GTK_LIST_STORE_IS_SORTED(list) (GTK_LIST_STORE (list)->sort_column_id != GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID) @@ -166,7 +167,7 @@ gtk_list_store_get_type (void) NULL }; - list_store_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkListStore"), + list_store_type = g_type_register_static (G_TYPE_OBJECT, I_("GtkListStore"), &list_store_info, 0); g_type_add_interface_static (list_store_type, diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index 3ca1ab3797..1761f4848f 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -294,7 +294,7 @@ gtk_menu_get_type (void) (GInstanceInitFunc) gtk_menu_init, }; - menu_type = g_type_register_static (GTK_TYPE_MENU_SHELL, g_intern_static_string ("GtkMenu"), + menu_type = g_type_register_static (GTK_TYPE_MENU_SHELL, I_("GtkMenu"), &menu_info, 0); } @@ -319,7 +319,7 @@ get_attach_info (GtkWidget *child) if (!ai) { ai = g_new0 (AttachInfo, 1); - g_object_set_data_full (object, g_intern_static_string (ATTACH_INFO_KEY), ai, g_free); + g_object_set_data_full (object, I_(ATTACH_INFO_KEY), ai, g_free); } return ai; @@ -517,7 +517,7 @@ gtk_menu_class_init (GtkMenuClass *class) menu_shell_class->move_current = gtk_menu_move_current; menu_signals[MOVE_SCROLL] = - _gtk_binding_signal_new ("move_scroll", + _gtk_binding_signal_new (I_("move_scroll"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_CALLBACK (gtk_menu_real_move_scroll), @@ -612,7 +612,7 @@ gtk_menu_class_init (GtkMenuClass *class) binding_set = gtk_binding_set_by_class (class); gtk_binding_entry_add_signal (binding_set, GDK_Up, 0, - "move_current", 1, + I_("move_current"), 1, GTK_TYPE_MENU_DIRECTION_TYPE, GTK_MENU_DIR_PREV); gtk_binding_entry_add_signal (binding_set, @@ -1053,13 +1053,13 @@ gtk_menu_attach_to_widget (GtkMenu *menu, attach_widget_screen_changed (attach_widget, NULL, menu); data->detacher = detacher; - g_object_set_data (G_OBJECT (menu), g_intern_static_string (attach_data_key), data); + g_object_set_data (G_OBJECT (menu), I_(attach_data_key), data); list = g_object_steal_data (G_OBJECT (attach_widget), ATTACHED_MENUS); if (!g_list_find (list, menu)) { list = g_list_prepend (list, menu); } - g_object_set_data_full (G_OBJECT (attach_widget), g_intern_static_string (ATTACHED_MENUS), list, (GtkDestroyNotify) g_list_free); + g_object_set_data_full (G_OBJECT (attach_widget), I_(ATTACHED_MENUS), list, (GtkDestroyNotify) g_list_free); if (GTK_WIDGET_STATE (menu) != GTK_STATE_NORMAL) gtk_widget_set_state (GTK_WIDGET (menu), GTK_STATE_NORMAL); @@ -1101,7 +1101,7 @@ gtk_menu_detach (GtkMenu *menu) g_warning ("gtk_menu_detach(): menu is not attached"); return; } - g_object_set_data (G_OBJECT (menu), g_intern_static_string (attach_data_key), NULL); + g_object_set_data (G_OBJECT (menu), I_(attach_data_key), NULL); g_signal_handlers_disconnect_by_func (data->attach_widget, (gpointer) attach_widget_screen_changed, @@ -1111,9 +1111,9 @@ gtk_menu_detach (GtkMenu *menu) list = g_object_steal_data (G_OBJECT (data->attach_widget), ATTACHED_MENUS); list = g_list_remove (list, menu); if (list) - g_object_set_data_full (G_OBJECT (data->attach_widget), g_intern_static_string (ATTACHED_MENUS), list, (GtkDestroyNotify) g_list_free); + g_object_set_data_full (G_OBJECT (data->attach_widget), I_(ATTACHED_MENUS), list, (GtkDestroyNotify) g_list_free); else - g_object_set_data (G_OBJECT (data->attach_widget), g_intern_static_string (ATTACHED_MENUS), NULL); + g_object_set_data (G_OBJECT (data->attach_widget), I_(ATTACHED_MENUS), NULL); if (GTK_WIDGET_REALIZED (menu)) gtk_widget_unrealize (GTK_WIDGET (menu)); @@ -1148,7 +1148,7 @@ gtk_menu_remove (GtkContainer *container, } GTK_CONTAINER_CLASS (parent_class)->remove (container, widget); - g_object_set_data (G_OBJECT (widget), g_intern_static_string (ATTACH_INFO_KEY), NULL); + g_object_set_data (G_OBJECT (widget), I_(ATTACH_INFO_KEY), NULL); menu_queue_resize (menu); } @@ -1935,10 +1935,10 @@ gtk_menu_set_title (GtkMenu *menu, g_return_if_fail (GTK_IS_MENU (menu)); if (title) - g_object_set_data_full (G_OBJECT (menu), g_intern_static_string ("gtk-menu-title"), + g_object_set_data_full (G_OBJECT (menu), I_("gtk-menu-title"), g_strdup (title), (GtkDestroyNotify) g_free); else - g_object_set_data (G_OBJECT (menu), g_intern_static_string ("gtk-menu-title"), NULL); + g_object_set_data (G_OBJECT (menu), I_("gtk-menu-title"), NULL); gtk_menu_update_title (menu); g_object_notify (G_OBJECT (menu), "tearoff-title"); @@ -2121,7 +2121,7 @@ menu_grab_transfer_window_get (GtkMenu *menu) gdk_window_show (window); - g_object_set_data (G_OBJECT (menu), g_intern_static_string ("gtk-menu-transfer-window"), window); + g_object_set_data (G_OBJECT (menu), I_("gtk-menu-transfer-window"), window); } return window; @@ -2135,7 +2135,7 @@ menu_grab_transfer_window_destroy (GtkMenu *menu) { gdk_window_set_user_data (window, NULL); gdk_window_destroy (window); - g_object_set_data (G_OBJECT (menu), g_intern_static_string ("gtk-menu-transfer-window"), NULL); + g_object_set_data (G_OBJECT (menu), I_("gtk-menu-transfer-window"), NULL); } } @@ -3965,7 +3965,7 @@ gtk_menu_set_screen (GtkMenu *menu, g_return_if_fail (GTK_IS_MENU (menu)); g_return_if_fail (!screen || GDK_IS_SCREEN (screen)); - g_object_set_data (G_OBJECT (menu), g_intern_static_string ("gtk-menu-explicit-screen"), screen); + g_object_set_data (G_OBJECT (menu), I_("gtk-menu-explicit-screen"), screen); if (screen) { diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c index 8e9aedc977..bc63b056d8 100644 --- a/gtk/gtkmenubar.c +++ b/gtk/gtkmenubar.c @@ -109,7 +109,7 @@ gtk_menu_bar_get_type (void) NULL, /* instance_init */ }; - menu_bar_type = g_type_register_static (GTK_TYPE_MENU_SHELL, g_intern_static_string ("GtkMenuBar"), + menu_bar_type = g_type_register_static (GTK_TYPE_MENU_SHELL, I_("GtkMenuBar"), &menu_bar_info, 0); } @@ -608,7 +608,7 @@ static void set_menu_bars (GtkWindow *window, GList *menubars) { - g_object_set_data (G_OBJECT (window), g_intern_static_string ("gtk-menu-bar-list"), menubars); + g_object_set_data (G_OBJECT (window), I_("gtk-menu-bar-list"), menubars); } static gboolean diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c index 0cca9f5674..9f9b2a05e7 100644 --- a/gtk/gtkmenuitem.c +++ b/gtk/gtkmenuitem.c @@ -37,6 +37,7 @@ #include "gtkmenuitem.h" #include "gtkseparatormenuitem.h" #include "gtkprivate.h" +#include "gtkintl.h" #include "gtkalias.h" #define MENU_ITEM_CLASS(w) GTK_MENU_ITEM_CLASS (GTK_OBJECT (w)->klass) @@ -119,7 +120,7 @@ gtk_menu_item_get_type (void) (GInstanceInitFunc) gtk_menu_item_init, }; - menu_item_type = g_type_register_static (GTK_TYPE_ITEM, g_intern_static_string ("GtkMenuItem"), + menu_item_type = g_type_register_static (GTK_TYPE_ITEM, I_("GtkMenuItem"), &menu_item_info, 0); } @@ -167,7 +168,7 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass) klass->hide_on_activate = TRUE; menu_item_signals[ACTIVATE] = - g_signal_new ("activate", + g_signal_new (I_("activate"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkMenuItemClass, activate), @@ -177,7 +178,7 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass) widget_class->activate_signal = menu_item_signals[ACTIVATE]; menu_item_signals[ACTIVATE_ITEM] = - g_signal_new ("activate_item", + g_signal_new (I_("activate_item"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkMenuItemClass, activate_item), @@ -186,7 +187,7 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass) G_TYPE_NONE, 0); menu_item_signals[TOGGLE_SIZE_REQUEST] = - g_signal_new ("toggle_size_request", + g_signal_new (I_("toggle_size_request"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkMenuItemClass, toggle_size_request), @@ -196,7 +197,7 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass) G_TYPE_POINTER); menu_item_signals[TOGGLE_SIZE_ALLOCATE] = - g_signal_new ("toggle_size_allocate", + g_signal_new (I_("toggle_size_allocate"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkMenuItemClass, toggle_size_allocate), diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c index ac6a0d7fd0..bce558672a 100644 --- a/gtk/gtkmenushell.c +++ b/gtk/gtkmenushell.c @@ -227,7 +227,7 @@ gtk_menu_shell_get_type (void) }; menu_shell_type = - g_type_register_static (GTK_TYPE_CONTAINER, g_intern_static_string ("GtkMenuShell"), + g_type_register_static (GTK_TYPE_CONTAINER, I_("GtkMenuShell"), &menu_shell_info, G_TYPE_FLAG_ABSTRACT); } @@ -277,7 +277,7 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass) klass->insert = gtk_menu_shell_real_insert; menu_shell_signals[DEACTIVATE] = - g_signal_new ("deactivate", + g_signal_new (I_("deactivate"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkMenuShellClass, deactivate), @@ -285,7 +285,7 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass) _gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); menu_shell_signals[SELECTION_DONE] = - g_signal_new ("selection-done", + g_signal_new (I_("selection-done"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkMenuShellClass, selection_done), @@ -293,7 +293,7 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass) _gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); menu_shell_signals[MOVE_CURRENT] = - g_signal_new ("move_current", + g_signal_new (I_("move_current"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkMenuShellClass, move_current), @@ -302,7 +302,7 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass) G_TYPE_NONE, 1, GTK_TYPE_MENU_DIRECTION_TYPE); menu_shell_signals[ACTIVATE_CURRENT] = - g_signal_new ("activate_current", + g_signal_new (I_("activate_current"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkMenuShellClass, activate_current), @@ -311,7 +311,7 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass) G_TYPE_NONE, 1, G_TYPE_BOOLEAN); menu_shell_signals[CANCEL] = - g_signal_new ("cancel", + g_signal_new (I_("cancel"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkMenuShellClass, cancel), @@ -319,7 +319,7 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass) _gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); menu_shell_signals[CYCLE_FOCUS] = - _gtk_binding_signal_new ("cycle_focus", + _gtk_binding_signal_new (I_("cycle_focus"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_CALLBACK (gtk_real_menu_shell_cycle_focus), diff --git a/gtk/gtkmenutoolbutton.c b/gtk/gtkmenutoolbutton.c index 84833e051a..d44f8bc50d 100644 --- a/gtk/gtkmenutoolbutton.c +++ b/gtk/gtkmenutoolbutton.c @@ -88,7 +88,7 @@ gtk_menu_tool_button_get_type (void) }; type = g_type_register_static (GTK_TYPE_TOOL_BUTTON, - g_intern_static_string ("GtkMenuToolButton"), + I_("GtkMenuToolButton"), &info, 0); } @@ -256,7 +256,7 @@ gtk_menu_tool_button_class_init (GtkMenuToolButtonClass *klass) toolitem_class->toolbar_reconfigured = gtk_menu_tool_button_toolbar_reconfigured; signals[SHOW_MENU] = - g_signal_new ("show-menu", + g_signal_new (I_("show-menu"), G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkMenuToolButtonClass, show_menu), diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c index 81890256a7..fb75bdfbcb 100644 --- a/gtk/gtkmessagedialog.c +++ b/gtk/gtkmessagedialog.c @@ -98,7 +98,7 @@ gtk_message_dialog_get_type (void) (GInstanceInitFunc) gtk_message_dialog_init, }; - dialog_type = g_type_register_static (GTK_TYPE_DIALOG, g_intern_static_string ("GtkMessageDialog"), + dialog_type = g_type_register_static (GTK_TYPE_DIALOG, I_("GtkMessageDialog"), &dialog_info, 0); } diff --git a/gtk/gtkmisc.c b/gtk/gtkmisc.c index 24268f2b85..7a22c14974 100644 --- a/gtk/gtkmisc.c +++ b/gtk/gtkmisc.c @@ -74,7 +74,7 @@ gtk_misc_get_type (void) NULL, /* value_table */ }; - misc_type = g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkMisc"), + misc_type = g_type_register_static (GTK_TYPE_WIDGET, I_("GtkMisc"), &misc_info, G_TYPE_FLAG_ABSTRACT); } diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c index ff4ff921eb..33020f72fb 100644 --- a/gtk/gtkmodules.c +++ b/gtk/gtkmodules.c @@ -26,6 +26,7 @@ #include "gtksettings.h" #include "gtkdebug.h" #include "gtkprivate.h" /* GTK_LIBDIR */ +#include "gtkintl.h" #include <gmodule.h> #include <pango/pango-utils.h> /* For pango_split_file_list */ @@ -428,7 +429,7 @@ display_closed_cb (GdkDisplay *display, settings = gtk_settings_get_for_screen (screen); g_object_set_data_full (G_OBJECT (settings), - g_intern_static_string ("gtk-modules"), + I_("gtk-modules"), NULL, NULL); } } @@ -535,7 +536,7 @@ _gtk_modules_settings_changed (GtkSettings *settings, new_modules = load_modules (modules); g_object_set_data_full (G_OBJECT (settings), - g_intern_static_string ("gtk-modules"), + I_("gtk-modules"), new_modules, settings_destroy_notify); } diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index 057c34f8ee..422bc75e97 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -314,7 +314,7 @@ gtk_notebook_get_type (void) (GInstanceInitFunc) gtk_notebook_init, }; - notebook_type = g_type_register_static (GTK_TYPE_CONTAINER, g_intern_static_string ("GtkNotebook"), + notebook_type = g_type_register_static (GTK_TYPE_CONTAINER, I_("GtkNotebook"), ¬ebook_info, 0); } @@ -589,7 +589,7 @@ gtk_notebook_class_init (GtkNotebookClass *class) GTK_PARAM_READABLE)); notebook_signals[SWITCH_PAGE] = - g_signal_new ("switch_page", + g_signal_new (I_("switch_page"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkNotebookClass, switch_page), @@ -599,7 +599,7 @@ gtk_notebook_class_init (GtkNotebookClass *class) G_TYPE_POINTER, G_TYPE_UINT); notebook_signals[FOCUS_TAB] = - g_signal_new ("focus_tab", + g_signal_new (I_("focus_tab"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkNotebookClass, focus_tab), @@ -608,7 +608,7 @@ gtk_notebook_class_init (GtkNotebookClass *class) G_TYPE_BOOLEAN, 1, GTK_TYPE_NOTEBOOK_TAB); notebook_signals[SELECT_PAGE] = - g_signal_new ("select_page", + g_signal_new (I_("select_page"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkNotebookClass, select_page), @@ -617,7 +617,7 @@ gtk_notebook_class_init (GtkNotebookClass *class) G_TYPE_BOOLEAN, 1, G_TYPE_BOOLEAN); notebook_signals[CHANGE_CURRENT_PAGE] = - g_signal_new ("change_current_page", + g_signal_new (I_("change_current_page"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkNotebookClass, change_current_page), @@ -626,7 +626,7 @@ gtk_notebook_class_init (GtkNotebookClass *class) G_TYPE_NONE, 1, G_TYPE_INT); notebook_signals[MOVE_FOCUS_OUT] = - g_signal_new ("move_focus_out", + g_signal_new (I_("move_focus_out"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkNotebookClass, move_focus_out), diff --git a/gtk/gtkobject.c b/gtk/gtkobject.c index 6c5e18ab6e..e5df6f8043 100644 --- a/gtk/gtkobject.c +++ b/gtk/gtkobject.c @@ -29,6 +29,7 @@ #include <string.h> #include <stdio.h> #include "gtkobject.h" +#include "gtkintl.h" #include "gtkmarshalers.h" #include "gtksignal.h" #include "gtkprivate.h" @@ -95,7 +96,7 @@ gtk_object_get_type (void) NULL, /* value_table */ }; - object_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkObject"), + object_type = g_type_register_static (G_TYPE_OBJECT, I_("GtkObject"), &object_info, G_TYPE_FLAG_ABSTRACT); } @@ -329,11 +330,12 @@ gtk_object_class_init (GtkObjectClass *class) g_object_class_install_property (gobject_class, PROP_USER_DATA, - g_param_spec_pointer ("user-data", "User Data", - "Anonymous User Data Pointer", + g_param_spec_pointer ("user-data", + P_("User Data"), + P_("Anonymous User Data Pointer"), GTK_PARAM_READWRITE)); object_signals[DESTROY] = - g_signal_new ("destroy", + g_signal_new (I_("destroy"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_CLEANUP | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS, G_STRUCT_OFFSET (GtkObjectClass, destroy), @@ -422,7 +424,7 @@ gtk_object_set_property (GObject *object, switch (property_id) { case PROP_USER_DATA: - g_object_set_data (G_OBJECT (object), g_intern_static_string ("user_data"), g_value_get_pointer (value)); + g_object_set_data (G_OBJECT (object), I_("user_data"), g_value_get_pointer (value)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); diff --git a/gtk/gtkoldeditable.c b/gtk/gtkoldeditable.c index 690a623d61..77c5c2546e 100644 --- a/gtk/gtkoldeditable.c +++ b/gtk/gtkoldeditable.c @@ -36,6 +36,7 @@ #include "gtkmarshalers.h" #include "gtkselection.h" #include "gtksignal.h" +#include "gtkintl.h" #include "gtkalias.h" #define MIN_EDITABLE_WIDTH 150 @@ -158,7 +159,7 @@ gtk_old_editable_get_type (void) NULL /* interface_data */ }; - old_editable_type = g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkOldEditable"), + old_editable_type = g_type_register_static (GTK_TYPE_WIDGET, I_("GtkOldEditable"), &old_editable_info, G_TYPE_FLAG_ABSTRACT); g_type_add_interface_static (old_editable_type, GTK_TYPE_EDITABLE, @@ -209,7 +210,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class) class->set_position = NULL; editable_signals[ACTIVATE] = - gtk_signal_new ("activate", + gtk_signal_new (I_("activate"), GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkOldEditableClass, activate), @@ -218,7 +219,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class) widget_class->activate_signal = editable_signals[ACTIVATE]; editable_signals[SET_EDITABLE] = - gtk_signal_new ("set-editable", + gtk_signal_new (I_("set-editable"), GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkOldEditableClass, set_editable), @@ -227,7 +228,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class) GTK_TYPE_BOOL); editable_signals[MOVE_CURSOR] = - gtk_signal_new ("move_cursor", + gtk_signal_new (I_("move_cursor"), GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkOldEditableClass, move_cursor), @@ -237,7 +238,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class) GTK_TYPE_INT); editable_signals[MOVE_WORD] = - gtk_signal_new ("move_word", + gtk_signal_new (I_("move_word"), GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkOldEditableClass, move_word), @@ -246,7 +247,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class) GTK_TYPE_INT); editable_signals[MOVE_PAGE] = - gtk_signal_new ("move_page", + gtk_signal_new (I_("move_page"), GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkOldEditableClass, move_page), @@ -256,7 +257,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class) GTK_TYPE_INT); editable_signals[MOVE_TO_ROW] = - gtk_signal_new ("move_to_row", + gtk_signal_new (I_("move_to_row"), GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkOldEditableClass, move_to_row), @@ -265,7 +266,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class) GTK_TYPE_INT); editable_signals[MOVE_TO_COLUMN] = - gtk_signal_new ("move_to_column", + gtk_signal_new (I_("move_to_column"), GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkOldEditableClass, move_to_column), @@ -274,7 +275,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class) GTK_TYPE_INT); editable_signals[KILL_CHAR] = - gtk_signal_new ("kill_char", + gtk_signal_new (I_("kill_char"), GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkOldEditableClass, kill_char), @@ -283,7 +284,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class) GTK_TYPE_INT); editable_signals[KILL_WORD] = - gtk_signal_new ("kill_word", + gtk_signal_new (I_("kill_word"), GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkOldEditableClass, kill_word), @@ -292,7 +293,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class) GTK_TYPE_INT); editable_signals[KILL_LINE] = - gtk_signal_new ("kill_line", + gtk_signal_new (I_("kill_line"), GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkOldEditableClass, kill_line), @@ -301,7 +302,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class) GTK_TYPE_INT); editable_signals[CUT_CLIPBOARD] = - gtk_signal_new ("cut_clipboard", + gtk_signal_new (I_("cut_clipboard"), GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkOldEditableClass, cut_clipboard), @@ -309,7 +310,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class) GTK_TYPE_NONE, 0); editable_signals[COPY_CLIPBOARD] = - gtk_signal_new ("copy_clipboard", + gtk_signal_new (I_("copy_clipboard"), GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkOldEditableClass, copy_clipboard), @@ -317,7 +318,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class) GTK_TYPE_NONE, 0); editable_signals[PASTE_CLIPBOARD] = - gtk_signal_new ("paste_clipboard", + gtk_signal_new (I_("paste_clipboard"), GTK_RUN_LAST | GTK_RUN_ACTION, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkOldEditableClass, paste_clipboard), diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c index f386434ac0..ffcf99c3d2 100644 --- a/gtk/gtkoptionmenu.c +++ b/gtk/gtkoptionmenu.c @@ -141,7 +141,7 @@ gtk_option_menu_get_type (void) }; option_menu_type = - g_type_register_static (GTK_TYPE_BUTTON, g_intern_static_string ("GtkOptionMenu"), + g_type_register_static (GTK_TYPE_BUTTON, I_("GtkOptionMenu"), &option_menu_info, 0); } @@ -166,7 +166,7 @@ gtk_option_menu_class_init (GtkOptionMenuClass *class) parent_class = g_type_class_peek_parent (class); signals[CHANGED] = - g_signal_new ("changed", + g_signal_new (I_("changed"), G_OBJECT_CLASS_TYPE (class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkOptionMenuClass, changed), diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c index f4e711fb94..630c61f876 100644 --- a/gtk/gtkpaned.c +++ b/gtk/gtkpaned.c @@ -161,7 +161,7 @@ gtk_paned_get_type (void) NULL, /* value_table */ }; - paned_type = g_type_register_static (GTK_TYPE_CONTAINER, g_intern_static_string ("GtkPaned"), + paned_type = g_type_register_static (GTK_TYPE_CONTAINER, I_("GtkPaned"), &paned_info, G_TYPE_FLAG_ABSTRACT); } @@ -333,7 +333,7 @@ gtk_paned_class_init (GtkPanedClass *class) GTK_PARAM_READWRITE)); signals [CYCLE_CHILD_FOCUS] = - g_signal_new ("cycle_child_focus", + g_signal_new (I_("cycle_child_focus"), G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkPanedClass, cycle_child_focus), @@ -343,7 +343,7 @@ gtk_paned_class_init (GtkPanedClass *class) G_TYPE_BOOLEAN); signals [TOGGLE_HANDLE_FOCUS] = - g_signal_new ("toggle_handle_focus", + g_signal_new (I_("toggle_handle_focus"), G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkPanedClass, toggle_handle_focus), @@ -352,7 +352,7 @@ gtk_paned_class_init (GtkPanedClass *class) G_TYPE_BOOLEAN, 0); signals[MOVE_HANDLE] = - g_signal_new ("move_handle", + g_signal_new (I_("move_handle"), G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkPanedClass, move_handle), @@ -362,7 +362,7 @@ gtk_paned_class_init (GtkPanedClass *class) GTK_TYPE_SCROLL_TYPE); signals [CYCLE_HANDLE_FOCUS] = - g_signal_new ("cycle_handle_focus", + g_signal_new (I_("cycle_handle_focus"), G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkPanedClass, cycle_handle_focus), @@ -372,7 +372,7 @@ gtk_paned_class_init (GtkPanedClass *class) G_TYPE_BOOLEAN); signals [ACCEPT_POSITION] = - g_signal_new ("accept_position", + g_signal_new (I_("accept_position"), G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkPanedClass, accept_position), @@ -381,7 +381,7 @@ gtk_paned_class_init (GtkPanedClass *class) G_TYPE_BOOLEAN, 0); signals [CANCEL_POSITION] = - g_signal_new ("cancel_position", + g_signal_new (I_("cancel_position"), G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkPanedClass, cancel_position), diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c index bccf797f89..468b650599 100644 --- a/gtk/gtkpathbar.c +++ b/gtk/gtkpathbar.c @@ -185,7 +185,7 @@ gtk_path_bar_class_init (GtkPathBarClass *path_bar_class) /* container_class->child_type = gtk_path_bar_child_type;*/ path_bar_signals [PATH_CLICKED] = - g_signal_new ("path-clicked", + g_signal_new (I_("path-clicked"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkPathBarClass, path_clicked), diff --git a/gtk/gtkpixmap.c b/gtk/gtkpixmap.c index 2d92298ccf..e8c4b37976 100644 --- a/gtk/gtkpixmap.c +++ b/gtk/gtkpixmap.c @@ -34,6 +34,7 @@ #include <math.h> #include "gtkcontainer.h" #include "gtkpixmap.h" +#include "gtkintl.h" #include "gtkalias.h" @@ -65,7 +66,7 @@ gtk_pixmap_get_type (void) (GtkClassInitFunc) NULL, }; - g_intern_static_string ("GtkPixmap"); + I_("GtkPixmap"); pixmap_type = gtk_type_unique (GTK_TYPE_MISC, &pixmap_info); } diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c index 3c557c9f5b..4b6271c329 100644 --- a/gtk/gtkplug.c +++ b/gtk/gtkplug.c @@ -28,6 +28,7 @@ #include "gtkmain.h" #include "gtkmarshalers.h" #include "gtkplug.h" +#include "gtkintl.h" #include "gtkprivate.h" #include "gtkplugprivate.h" @@ -91,7 +92,7 @@ gtk_plug_get_type (void) (GInstanceInitFunc) gtk_plug_init, }; - plug_type = g_type_register_static (GTK_TYPE_WINDOW, g_intern_static_string ("GtkPlug"), + plug_type = g_type_register_static (GTK_TYPE_WINDOW, I_("GtkPlug"), &plug_info, 0); } @@ -131,7 +132,7 @@ gtk_plug_class_init (GtkPlugClass *class) window_class->keys_changed = gtk_plug_keys_changed; plug_signals[EMBEDDED] = - g_signal_new ("embedded", + g_signal_new (I_("embedded"), G_OBJECT_CLASS_TYPE (class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkPlugClass, embedded), diff --git a/gtk/gtkpreview.c b/gtk/gtkpreview.c index bfd9379584..66a83c0dee 100644 --- a/gtk/gtkpreview.c +++ b/gtk/gtkpreview.c @@ -94,7 +94,7 @@ gtk_preview_get_type (void) (GtkClassInitFunc) NULL, }; - g_intern_static_string ("GtkPreview"); + I_("GtkPreview"); preview_type = gtk_type_unique (GTK_TYPE_WIDGET, &preview_info); } diff --git a/gtk/gtkprogress.c b/gtk/gtkprogress.c index 4fa9b415e8..b0ba79b8e4 100644 --- a/gtk/gtkprogress.c +++ b/gtk/gtkprogress.c @@ -92,7 +92,7 @@ gtk_progress_get_type (void) (GInstanceInitFunc) gtk_progress_init, }; - progress_type = g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkProgress"), + progress_type = g_type_register_static (GTK_TYPE_WIDGET, I_("GtkProgress"), &progress_info, 0); } diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c index 452cfa2221..55679451c0 100644 --- a/gtk/gtkprogressbar.c +++ b/gtk/gtkprogressbar.c @@ -112,7 +112,7 @@ gtk_progress_bar_get_type (void) }; progress_bar_type = - g_type_register_static (GTK_TYPE_PROGRESS, g_intern_static_string ("GtkProgressBar"), + g_type_register_static (GTK_TYPE_PROGRESS, I_("GtkProgressBar"), &progress_bar_info, 0); } diff --git a/gtk/gtkradioaction.c b/gtk/gtkradioaction.c index 92c3173efc..b2f60b46c5 100644 --- a/gtk/gtkradioaction.c +++ b/gtk/gtkradioaction.c @@ -96,7 +96,7 @@ gtk_radio_action_get_type (void) }; type = g_type_register_static (GTK_TYPE_TOGGLE_ACTION, - g_intern_static_string ("GtkRadioAction"), + I_("GtkRadioAction"), &type_info, 0); } return type; @@ -171,7 +171,7 @@ gtk_radio_action_class_init (GtkRadioActionClass *klass) * Since: 2.4 */ radio_action_signals[CHANGED] = - g_signal_new ("changed", + g_signal_new (I_("changed"), G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE, G_STRUCT_OFFSET (GtkRadioActionClass, changed), NULL, NULL, diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c index 16c31bf15b..61c8dada47 100644 --- a/gtk/gtkradiobutton.c +++ b/gtk/gtkradiobutton.c @@ -81,7 +81,7 @@ gtk_radio_button_get_type (void) }; radio_button_type = - g_type_register_static (GTK_TYPE_CHECK_BUTTON, g_intern_static_string ("GtkRadioButton"), + g_type_register_static (GTK_TYPE_CHECK_BUTTON, I_("GtkRadioButton"), &radio_button_info, 0); } @@ -138,7 +138,7 @@ gtk_radio_button_class_init (GtkRadioButtonClass *class) * * Since: 2.4 */ - group_changed_signal = g_signal_new ("group-changed", + group_changed_signal = g_signal_new (I_("group-changed"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkRadioButtonClass, group_changed), diff --git a/gtk/gtkradiomenuitem.c b/gtk/gtkradiomenuitem.c index 9d12cda4be..7a9b82fe09 100644 --- a/gtk/gtkradiomenuitem.c +++ b/gtk/gtkradiomenuitem.c @@ -77,7 +77,7 @@ gtk_radio_menu_item_get_type (void) }; radio_menu_item_type = - g_type_register_static (GTK_TYPE_CHECK_MENU_ITEM, g_intern_static_string ("GtkRadioMenuItem"), + g_type_register_static (GTK_TYPE_CHECK_MENU_ITEM, I_("GtkRadioMenuItem"), &radio_menu_item_info, 0); } @@ -397,7 +397,7 @@ gtk_radio_menu_item_class_init (GtkRadioMenuItemClass *klass) * * Since: 2.4 */ - group_changed_signal = g_signal_new ("group-changed", + group_changed_signal = g_signal_new (I_("group-changed"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkRadioMenuItemClass, group_changed), diff --git a/gtk/gtkradiotoolbutton.c b/gtk/gtkradiotoolbutton.c index 9b91bb982b..4bf5f3eb3e 100644 --- a/gtk/gtkradiotoolbutton.c +++ b/gtk/gtkradiotoolbutton.c @@ -60,7 +60,7 @@ gtk_radio_tool_button_get_type (void) }; type = g_type_register_static (GTK_TYPE_TOGGLE_TOOL_BUTTON, - g_intern_static_string ("GtkRadioToolButton"), &type_info, 0); + I_("GtkRadioToolButton"), &type_info, 0); } return type; } diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c index c9d2d8e382..6330ffe900 100644 --- a/gtk/gtkrange.c +++ b/gtk/gtkrange.c @@ -208,7 +208,7 @@ gtk_range_get_type (void) NULL, /* value_table */ }; - range_type = g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkRange"), + range_type = g_type_register_static (GTK_TYPE_WIDGET, I_("GtkRange"), &range_info, G_TYPE_FLAG_ABSTRACT); } @@ -258,7 +258,7 @@ gtk_range_class_init (GtkRangeClass *class) class->stepper_detail = "stepper"; signals[VALUE_CHANGED] = - g_signal_new ("value_changed", + g_signal_new (I_("value_changed"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkRangeClass, value_changed), @@ -267,7 +267,7 @@ gtk_range_class_init (GtkRangeClass *class) G_TYPE_NONE, 0); signals[ADJUST_BOUNDS] = - g_signal_new ("adjust_bounds", + g_signal_new (I_("adjust_bounds"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkRangeClass, adjust_bounds), @@ -277,7 +277,7 @@ gtk_range_class_init (GtkRangeClass *class) G_TYPE_DOUBLE); signals[MOVE_SLIDER] = - g_signal_new ("move_slider", + g_signal_new (I_("move_slider"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkRangeClass, move_slider), @@ -313,7 +313,7 @@ gtk_range_class_init (GtkRangeClass *class) * Since: 2.6 */ signals[CHANGE_VALUE] = - g_signal_new ("change_value", + g_signal_new (I_("change_value"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkRangeClass, change_value), diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c index 1c779e163f..b4117b6d59 100644 --- a/gtk/gtkrc.c +++ b/gtk/gtkrc.c @@ -945,7 +945,7 @@ gtk_rc_style_get_type (void) (GInstanceInitFunc) gtk_rc_style_init, }; - rc_style_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkRcStyle"), + rc_style_type = g_type_register_static (G_TYPE_OBJECT, I_("GtkRcStyle"), &rc_style_info, 0); } diff --git a/gtk/gtkruler.c b/gtk/gtkruler.c index 894f8bef32..625b7787f3 100644 --- a/gtk/gtkruler.c +++ b/gtk/gtkruler.c @@ -87,7 +87,7 @@ gtk_ruler_get_type (void) (GInstanceInitFunc) gtk_ruler_init, }; - ruler_type = g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkRuler"), + ruler_type = g_type_register_static (GTK_TYPE_WIDGET, I_("GtkRuler"), &ruler_info, 0); } diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c index 9454cbebdf..85f745460b 100644 --- a/gtk/gtkscale.c +++ b/gtk/gtkscale.c @@ -105,7 +105,7 @@ gtk_scale_get_type (void) NULL, /* value_table */ }; - scale_type = g_type_register_static (GTK_TYPE_RANGE, g_intern_static_string ("GtkScale"), + scale_type = g_type_register_static (GTK_TYPE_RANGE, I_("GtkScale"), &scale_info, G_TYPE_FLAG_ABSTRACT); } @@ -129,9 +129,9 @@ single_string_accumulator (GSignalInvocationHint *ihint, } -#define add_slider_binding(binding_set, keyval, mask, scroll) \ - gtk_binding_entry_add_signal (binding_set, keyval, mask, \ - "move_slider", 1, \ +#define add_slider_binding(binding_set, keyval, mask, scroll) \ + gtk_binding_entry_add_signal (binding_set, keyval, mask, \ + I_("move_slider"), 1, \ GTK_TYPE_SCROLL_TYPE, scroll) static void @@ -158,7 +158,7 @@ gtk_scale_class_init (GtkScaleClass *class) range_class->get_range_border = gtk_scale_get_range_border; signals[FORMAT_VALUE] = - g_signal_new ("format_value", + g_signal_new (I_("format_value"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkScaleClass, format_value), diff --git a/gtk/gtkscrollbar.c b/gtk/gtkscrollbar.c index cfb71c2b94..1cb611160f 100644 --- a/gtk/gtkscrollbar.c +++ b/gtk/gtkscrollbar.c @@ -60,7 +60,7 @@ gtk_scrollbar_get_type (void) }; scrollbar_type = - g_type_register_static (GTK_TYPE_RANGE, g_intern_static_string ("GtkScrollbar"), + g_type_register_static (GTK_TYPE_RANGE, I_("GtkScrollbar"), &scrollbar_info, G_TYPE_FLAG_ABSTRACT); } diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c index ab98e20466..7eafb767a6 100644 --- a/gtk/gtkscrolledwindow.c +++ b/gtk/gtkscrolledwindow.c @@ -158,7 +158,7 @@ gtk_scrolled_window_get_type (void) }; scrolled_window_type = - g_type_register_static (GTK_TYPE_BIN, g_intern_static_string ("GtkScrolledWindow"), + g_type_register_static (GTK_TYPE_BIN, I_("GtkScrolledWindow"), &scrolled_window_info, 0); } @@ -291,7 +291,7 @@ gtk_scrolled_window_class_init (GtkScrolledWindowClass *class) GTK_PARAM_READABLE)); signals[SCROLL_CHILD] = - g_signal_new ("scroll_child", + g_signal_new (I_("scroll_child"), G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkScrolledWindowClass, scroll_child), @@ -301,7 +301,7 @@ gtk_scrolled_window_class_init (GtkScrolledWindowClass *class) GTK_TYPE_SCROLL_TYPE, G_TYPE_BOOLEAN); signals[MOVE_FOCUS_OUT] = - g_signal_new ("move_focus_out", + g_signal_new (I_("move_focus_out"), G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkScrolledWindowClass, move_focus_out), diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c index 739ff38c00..78d257a497 100644 --- a/gtk/gtkselection.c +++ b/gtk/gtkselection.c @@ -58,6 +58,7 @@ #include "gtkmain.h" #include "gtkselection.h" +#include "gtkintl.h" #include "gdk-pixbuf/gdk-pixbuf.h" #ifdef GDK_WINDOWING_X11 @@ -682,7 +683,7 @@ gtk_selection_target_list_get (GtkWidget *widget, sellist->list = gtk_target_list_new (NULL, 0); lists = g_list_prepend (lists, sellist); - g_object_set_data (G_OBJECT (widget), g_intern_static_string (gtk_selection_handler_key), lists); + g_object_set_data (G_OBJECT (widget), I_(gtk_selection_handler_key), lists); return sellist->list; } @@ -708,7 +709,7 @@ gtk_selection_target_list_remove (GtkWidget *widget) } g_list_free (lists); - g_object_set_data (G_OBJECT (widget), g_intern_static_string (gtk_selection_handler_key), NULL); + g_object_set_data (G_OBJECT (widget), I_(gtk_selection_handler_key), NULL); } /** @@ -748,7 +749,7 @@ gtk_selection_clear_targets (GtkWidget *widget, tmp_list = tmp_list->next; } - g_object_set_data (G_OBJECT (widget), g_intern_static_string (gtk_selection_handler_key), lists); + g_object_set_data (G_OBJECT (widget), I_(gtk_selection_handler_key), lists); } /** @@ -2746,7 +2747,7 @@ gtk_selection_data_get_type (void) static GType our_type = 0; if (our_type == 0) - our_type = g_boxed_type_register_static (g_intern_static_string ("GtkSelectionData"), + our_type = g_boxed_type_register_static (I_("GtkSelectionData"), (GBoxedCopyFunc) gtk_selection_data_copy, (GBoxedFreeFunc) gtk_selection_data_free); diff --git a/gtk/gtkseparator.c b/gtk/gtkseparator.c index dc5bf86268..e2ddc59057 100644 --- a/gtk/gtkseparator.c +++ b/gtk/gtkseparator.c @@ -26,6 +26,7 @@ #include <config.h> #include "gtkseparator.h" +#include "gtkintl.h" #include "gtkalias.h" @@ -55,7 +56,7 @@ gtk_separator_get_type (void) }; separator_type = - g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkSeparator"), + g_type_register_static (GTK_TYPE_WIDGET, I_("GtkSeparator"), &separator_info, G_TYPE_FLAG_ABSTRACT); } diff --git a/gtk/gtkseparatortoolitem.c b/gtk/gtkseparatortoolitem.c index dbb942d02a..fc3d267e2e 100644 --- a/gtk/gtkseparatortoolitem.c +++ b/gtk/gtkseparatortoolitem.c @@ -88,7 +88,7 @@ gtk_separator_tool_item_get_type (void) }; type = g_type_register_static (GTK_TYPE_TOOL_ITEM, - g_intern_static_string ("GtkSeparatorToolItem"), &type_info, 0); + I_("GtkSeparatorToolItem"), &type_info, 0); } return type; } diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c index af3b741737..9322211ded 100644 --- a/gtk/gtksettings.c +++ b/gtk/gtksettings.c @@ -137,7 +137,7 @@ gtk_settings_get_type (void) (GInstanceInitFunc) gtk_settings_init, }; - settings_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkSettings"), + settings_type = g_type_register_static (G_TYPE_OBJECT, I_("GtkSettings"), &settings_info, 0); } @@ -426,7 +426,7 @@ gtk_settings_get_for_screen (GdkScreen *screen) { settings = g_object_new (GTK_TYPE_SETTINGS, NULL); settings->screen = screen; - g_object_set_data (G_OBJECT (screen), g_intern_static_string ("gtk-settings"), settings); + g_object_set_data (G_OBJECT (screen), I_("gtk-settings"), settings); gtk_rc_reparse_all_for_settings (settings, TRUE); settings_update_double_click (settings); diff --git a/gtk/gtksizegroup.c b/gtk/gtksizegroup.c index 0b9b77fea6..1f87a2240f 100644 --- a/gtk/gtksizegroup.c +++ b/gtk/gtksizegroup.c @@ -322,7 +322,7 @@ gtk_size_group_get_type (void) (GInstanceInitFunc) gtk_size_group_init, }; - size_group_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkSizeGroup"), + size_group_type = g_type_register_static (G_TYPE_OBJECT, I_("GtkSizeGroup"), &size_group_info, 0); } diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c index 74e219d74e..f89cc393f4 100644 --- a/gtk/gtksocket.c +++ b/gtk/gtksocket.c @@ -37,6 +37,7 @@ #include "gtksocket.h" #include "gtksocketprivate.h" #include "gtkdnd.h" +#include "gtkintl.h" #include "gtkalias.h" @@ -138,7 +139,7 @@ gtk_socket_get_type (void) (GInstanceInitFunc) gtk_socket_init, }; - socket_type = g_type_register_static (GTK_TYPE_CONTAINER, g_intern_static_string ("GtkSocket"), + socket_type = g_type_register_static (GTK_TYPE_CONTAINER, I_("GtkSocket"), &socket_info, 0); } @@ -192,7 +193,7 @@ gtk_socket_class_init (GtkSocketClass *class) container_class->forall = gtk_socket_forall; socket_signals[PLUG_ADDED] = - g_signal_new ("plug_added", + g_signal_new (I_("plug_added"), G_OBJECT_CLASS_TYPE (class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkSocketClass, plug_added), @@ -200,7 +201,7 @@ gtk_socket_class_init (GtkSocketClass *class) _gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); socket_signals[PLUG_REMOVED] = - g_signal_new ("plug_removed", + g_signal_new (I_("plug_removed"), G_OBJECT_CLASS_TYPE (class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkSocketClass, plug_removed), @@ -225,7 +226,7 @@ gtk_socket_init (GtkSocket *socket) socket->active = FALSE; socket->accel_group = gtk_accel_group_new (); - g_object_set_data (G_OBJECT (socket->accel_group), g_intern_static_string ("gtk-socket"), socket); + g_object_set_data (G_OBJECT (socket->accel_group), I_("gtk-socket"), socket); } /** diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c index b65877c455..2c62c04aa2 100644 --- a/gtk/gtkspinbutton.c +++ b/gtk/gtkspinbutton.c @@ -176,7 +176,7 @@ gtk_spin_button_get_type (void) }; spin_button_type = - g_type_register_static (GTK_TYPE_ENTRY, g_intern_static_string ("GtkSpinButton"), + g_type_register_static (GTK_TYPE_ENTRY, I_("GtkSpinButton"), &spin_button_info, 0); g_type_add_interface_static (spin_button_type, @@ -317,7 +317,7 @@ gtk_spin_button_class_init (GtkSpinButtonClass *class) GTK_PARAM_READABLE), gtk_rc_property_parse_enum); spinbutton_signals[INPUT] = - g_signal_new ("input", + g_signal_new (I_("input"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkSpinButtonClass, input), @@ -327,7 +327,7 @@ gtk_spin_button_class_init (GtkSpinButtonClass *class) G_TYPE_POINTER); spinbutton_signals[OUTPUT] = - g_signal_new ("output", + g_signal_new (I_("output"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkSpinButtonClass, output), @@ -336,7 +336,7 @@ gtk_spin_button_class_init (GtkSpinButtonClass *class) G_TYPE_BOOLEAN, 0); spinbutton_signals[VALUE_CHANGED] = - g_signal_new ("value_changed", + g_signal_new (I_("value_changed"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkSpinButtonClass, value_changed), @@ -346,7 +346,7 @@ gtk_spin_button_class_init (GtkSpinButtonClass *class) /* Action signals */ spinbutton_signals[CHANGE_VALUE] = - g_signal_new ("change_value", + g_signal_new (I_("change_value"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkSpinButtonClass, change_value), diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c index e07b7b8007..bfed9505cf 100644 --- a/gtk/gtkstatusbar.c +++ b/gtk/gtkstatusbar.c @@ -117,7 +117,7 @@ gtk_statusbar_get_type (void) (GInstanceInitFunc) gtk_statusbar_init, }; - statusbar_type = g_type_register_static (GTK_TYPE_HBOX, g_intern_static_string ("GtkStatusbar"), + statusbar_type = g_type_register_static (GTK_TYPE_HBOX, I_("GtkStatusbar"), &statusbar_info, 0); } @@ -180,7 +180,7 @@ gtk_statusbar_class_init (GtkStatusbarClass *class) TRUE, GTK_PARAM_READWRITE)); statusbar_signals[SIGNAL_TEXT_PUSHED] = - g_signal_new ("text_pushed", + g_signal_new (I_("text_pushed"), G_OBJECT_CLASS_TYPE (class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkStatusbarClass, text_pushed), @@ -190,7 +190,7 @@ gtk_statusbar_class_init (GtkStatusbarClass *class) G_TYPE_UINT, G_TYPE_STRING); statusbar_signals[SIGNAL_TEXT_POPPED] = - g_signal_new ("text_popped", + g_signal_new (I_("text_popped"), G_OBJECT_CLASS_TYPE (class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkStatusbarClass, text_popped), diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c index d1f48458bd..30f0f78e82 100755 --- a/gtk/gtkstatusicon.c +++ b/gtk/gtkstatusicon.c @@ -197,7 +197,7 @@ gtk_status_icon_class_init (GtkStatusIconClass *class) * Since: 2.10 */ status_icon_signals [ACTIVATE_SIGNAL] = - g_signal_new ("activate", + g_signal_new (I_("activate"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkStatusIconClass, activate), @@ -225,7 +225,7 @@ gtk_status_icon_class_init (GtkStatusIconClass *class) * Since: 2.10 */ status_icon_signals [POPUP_MENU_SIGNAL] = - g_signal_new ("popup-menu", + g_signal_new (I_("popup-menu"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkStatusIconClass, popup_menu), @@ -248,7 +248,7 @@ gtk_status_icon_class_init (GtkStatusIconClass *class) * Since: 2.10 */ status_icon_signals [SIZE_CHANGED_SIGNAL] = - g_signal_new ("size-changed", + g_signal_new (I_("size-changed"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkStatusIconClass, size_changed), diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c index 85b08f0989..d5cddc7f33 100644 --- a/gtk/gtkstyle.c +++ b/gtk/gtkstyle.c @@ -37,6 +37,7 @@ #include "gtkthemes.h" #include "gtkiconfactory.h" #include "gtksettings.h" /* _gtk_settings_parse_convert() */ +#include "gtkintl.h" #include "gtkalias.h" #define LIGHTNESS_MULT 1.3 @@ -376,7 +377,7 @@ gtk_style_get_type (void) (GInstanceInitFunc) gtk_style_init, }; - style_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkStyle"), + style_type = g_type_register_static (G_TYPE_OBJECT, I_("GtkStyle"), &style_info, 0); } @@ -545,7 +546,7 @@ gtk_style_class_init (GtkStyleClass *klass) * * Since: 2.4 */ - realize_signal = g_signal_new ("realize", + realize_signal = g_signal_new (I_("realize"), G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkStyleClass, realize), @@ -563,7 +564,7 @@ gtk_style_class_init (GtkStyleClass *klass) * * Since: 2.4 */ - unrealize_signal = g_signal_new ("unrealize", + unrealize_signal = g_signal_new (I_("unrealize"), G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkStyleClass, unrealize), @@ -6402,7 +6403,7 @@ gtk_border_get_type (void) static GType our_type = 0; if (our_type == 0) - our_type = g_boxed_type_register_static (g_intern_static_string ("GtkBorder"), + our_type = g_boxed_type_register_static (I_("GtkBorder"), (GBoxedCopyFunc) gtk_border_copy, (GBoxedFreeFunc) gtk_border_free); @@ -6541,7 +6542,7 @@ style_unrealize_cursor_gcs (GtkStyle *style) gtk_gc_release (cursor_info->secondary_gc); g_free (cursor_info); - g_object_set_data (G_OBJECT (style), g_intern_static_string ("gtk-style-cursor-info"), NULL); + g_object_set_data (G_OBJECT (style), I_("gtk-style-cursor-info"), NULL); } } @@ -6579,7 +6580,7 @@ get_insertion_cursor_gc (GtkWidget *widget, if (!cursor_info) { cursor_info = g_new (CursorInfo, 1); - g_object_set_data (G_OBJECT (widget->style), g_intern_static_string ("gtk-style-cursor-info"), cursor_info); + g_object_set_data (G_OBJECT (widget->style), I_("gtk-style-cursor-info"), cursor_info); cursor_info->primary_gc = NULL; cursor_info->secondary_gc = NULL; cursor_info->for_type = G_TYPE_INVALID; diff --git a/gtk/gtktable.c b/gtk/gtktable.c index 9c4a250d09..2ab0054df8 100644 --- a/gtk/gtktable.c +++ b/gtk/gtktable.c @@ -123,7 +123,7 @@ gtk_table_get_type (void) (GInstanceInitFunc) gtk_table_init, }; - table_type = g_type_register_static (GTK_TYPE_CONTAINER, g_intern_static_string ("GtkTable"), + table_type = g_type_register_static (GTK_TYPE_CONTAINER, I_("GtkTable"), &table_info, 0); } diff --git a/gtk/gtktearoffmenuitem.c b/gtk/gtktearoffmenuitem.c index 4d47284045..1c61856e57 100644 --- a/gtk/gtktearoffmenuitem.c +++ b/gtk/gtktearoffmenuitem.c @@ -28,6 +28,7 @@ #include "gtkmenu.h" #include "gtktearoffmenuitem.h" +#include "gtkintl.h" #include "gtkalias.h" #define ARROW_SIZE 10 @@ -65,7 +66,7 @@ gtk_tearoff_menu_item_get_type (void) }; tearoff_menu_item_type = - g_type_register_static (GTK_TYPE_MENU_ITEM, g_intern_static_string ("GtkTearoffMenuItem"), + g_type_register_static (GTK_TYPE_MENU_ITEM, I_("GtkTearoffMenuItem"), &tearoff_menu_item_info, 0); } diff --git a/gtk/gtktext.c b/gtk/gtktext.c index 14902669fb..8ad8463d4a 100644 --- a/gtk/gtktext.c +++ b/gtk/gtktext.c @@ -540,7 +540,7 @@ gtk_text_get_type (void) NULL /* interface_data */ }; - g_intern_static_string ("GtkText"); + I_("GtkText"); text_type = gtk_type_unique (GTK_TYPE_OLD_EDITABLE, &text_info); g_type_add_interface_static (text_type, GTK_TYPE_EDITABLE, @@ -634,7 +634,7 @@ gtk_text_class_init (GtkTextClass *class) GTK_PARAM_READWRITE)); widget_class->set_scroll_adjustments_signal = - gtk_signal_new ("set_scroll_adjustments", + gtk_signal_new (I_("set_scroll_adjustments"), GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkTextClass, set_scroll_adjustments), diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c index 29a41cb0e7..149fbe981b 100644 --- a/gtk/gtktextbuffer.c +++ b/gtk/gtktextbuffer.c @@ -155,7 +155,7 @@ gtk_text_buffer_get_type (void) (GInstanceInitFunc) gtk_text_buffer_init }; - our_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkTextBuffer"), + our_type = g_type_register_static (G_TYPE_OBJECT, I_("GtkTextBuffer"), &our_info, 0); } @@ -209,7 +209,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass) GTK_PARAM_READWRITE)); signals[INSERT_TEXT] = - g_signal_new ("insert_text", + g_signal_new (I_("insert_text"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTextBufferClass, insert_text), @@ -222,7 +222,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass) G_TYPE_INT); signals[INSERT_PIXBUF] = - g_signal_new ("insert_pixbuf", + g_signal_new (I_("insert_pixbuf"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTextBufferClass, insert_pixbuf), @@ -234,7 +234,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass) GDK_TYPE_PIXBUF); signals[INSERT_CHILD_ANCHOR] = - g_signal_new ("insert_child_anchor", + g_signal_new (I_("insert_child_anchor"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTextBufferClass, insert_child_anchor), @@ -259,7 +259,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass) * those don't have access to the deleted text. */ signals[DELETE_RANGE] = - g_signal_new ("delete_range", + g_signal_new (I_("delete_range"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTextBufferClass, delete_range), @@ -271,7 +271,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass) GTK_TYPE_TEXT_ITER | G_SIGNAL_TYPE_STATIC_SCOPE); signals[CHANGED] = - g_signal_new ("changed", + g_signal_new (I_("changed"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTextBufferClass, changed), @@ -281,7 +281,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass) 0); signals[MODIFIED_CHANGED] = - g_signal_new ("modified_changed", + g_signal_new (I_("modified_changed"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTextBufferClass, modified_changed), @@ -291,7 +291,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass) 0); signals[MARK_SET] = - g_signal_new ("mark_set", + g_signal_new (I_("mark_set"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTextBufferClass, mark_set), @@ -303,7 +303,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass) GTK_TYPE_TEXT_MARK); signals[MARK_DELETED] = - g_signal_new ("mark_deleted", + g_signal_new (I_("mark_deleted"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTextBufferClass, mark_deleted), @@ -314,7 +314,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass) GTK_TYPE_TEXT_MARK); signals[APPLY_TAG] = - g_signal_new ("apply_tag", + g_signal_new (I_("apply_tag"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTextBufferClass, apply_tag), @@ -327,7 +327,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass) GTK_TYPE_TEXT_ITER); signals[REMOVE_TAG] = - g_signal_new ("remove_tag", + g_signal_new (I_("remove_tag"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTextBufferClass, remove_tag), @@ -340,7 +340,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass) GTK_TYPE_TEXT_ITER); signals[BEGIN_USER_ACTION] = - g_signal_new ("begin_user_action", + g_signal_new (I_("begin_user_action"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTextBufferClass, begin_user_action), @@ -350,7 +350,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass) 0); signals[END_USER_ACTION] = - g_signal_new ("end_user_action", + g_signal_new (I_("end_user_action"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTextBufferClass, end_user_action), @@ -2811,7 +2811,7 @@ create_clipboard_contents_buffer (GtkTextBuffer *buffer) contents = gtk_text_buffer_new (gtk_text_buffer_get_tag_table (buffer)); - g_object_set_data (G_OBJECT (contents), g_intern_static_string ("gtk-text-buffer-clipboard"), GINT_TO_POINTER (1)); + g_object_set_data (G_OBJECT (contents), I_("gtk-text-buffer-clipboard"), GINT_TO_POINTER (1)); return contents; } diff --git a/gtk/gtktextchild.c b/gtk/gtktextchild.c index 7f7c73d240..05a1a3c7e3 100644 --- a/gtk/gtktextchild.c +++ b/gtk/gtktextchild.c @@ -52,6 +52,7 @@ #include "gtktextchild.h" #include "gtktextbtree.h" #include "gtktextlayout.h" +#include "gtkintl.h" #include "gtkalias.h" #define CHECK_IN_BUFFER(anchor) \ @@ -299,7 +300,7 @@ _gtk_anchored_child_set_layout (GtkWidget *child, GtkTextLayout *layout) { g_object_set_data (G_OBJECT (child), - g_intern_static_string ("gtk-text-child-anchor-layout"), + I_("gtk-text-child-anchor-layout"), layout); } @@ -329,7 +330,7 @@ gtk_text_child_anchor_get_type (void) (GInstanceInitFunc) gtk_text_child_anchor_init, }; - object_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkTextChildAnchor"), + object_type = g_type_register_static (G_TYPE_OBJECT, I_("GtkTextChildAnchor"), &object_info, 0); } diff --git a/gtk/gtktextdisplay.c b/gtk/gtktextdisplay.c index 47be831749..0a16785add 100644 --- a/gtk/gtktextdisplay.c +++ b/gtk/gtktextdisplay.c @@ -77,6 +77,7 @@ #define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API #include <config.h> #include "gtktextdisplay.h" +#include "gtkintl.h" #include "gtkalias.h" /* DO NOT go putting private headers in here. This file should only * use the semi-public headers, as with gtktextview.c. @@ -651,7 +652,7 @@ on_renderer_display_closed (GdkDisplay *display, g_signal_handlers_disconnect_by_func (text_renderer->screen, (gpointer)on_renderer_display_closed, text_renderer); - g_object_set_data (G_OBJECT (text_renderer->screen), g_intern_static_string ("gtk-text-renderer"), NULL); + g_object_set_data (G_OBJECT (text_renderer->screen), I_("gtk-text-renderer"), NULL); } static GtkTextRenderer * @@ -667,7 +668,7 @@ get_text_renderer (GdkScreen *screen) text_renderer = g_object_new (GTK_TYPE_TEXT_RENDERER, "screen", screen, NULL); text_renderer->screen = screen; - g_object_set_data_full (G_OBJECT (screen), g_intern_static_string ("gtk-text-renderer"), text_renderer, + g_object_set_data_full (G_OBJECT (screen), I_("gtk-text-renderer"), text_renderer, (GDestroyNotify)g_object_unref); g_signal_connect (gdk_screen_get_display (screen), "closed", diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c index b2335274f6..85598c95b7 100644 --- a/gtk/gtktextlayout.c +++ b/gtk/gtktextlayout.c @@ -82,6 +82,7 @@ #include "gtktextlayout.h" #include "gtktextbtree.h" #include "gtktextiterprivate.h" +#include "gtkintl.h" #include "gtkalias.h" #include <stdlib.h> @@ -184,7 +185,7 @@ gtk_text_layout_get_type (void) (GInstanceInitFunc) gtk_text_layout_init }; - our_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkTextLayout"), + our_type = g_type_register_static (G_TYPE_OBJECT, I_("GtkTextLayout"), &our_info, 0); } @@ -205,7 +206,7 @@ gtk_text_layout_class_init (GtkTextLayoutClass *klass) klass->free_line_data = gtk_text_layout_real_free_line_data; signals[INVALIDATED] = - g_signal_new ("invalidated", + g_signal_new (I_("invalidated"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTextLayoutClass, invalidated), @@ -215,7 +216,7 @@ gtk_text_layout_class_init (GtkTextLayoutClass *klass) 0); signals[CHANGED] = - g_signal_new ("changed", + g_signal_new (I_("changed"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTextLayoutClass, changed), @@ -228,7 +229,7 @@ gtk_text_layout_class_init (GtkTextLayoutClass *klass) G_TYPE_INT); signals[ALLOCATE_CHILD] = - g_signal_new ("allocate_child", + g_signal_new (I_("allocate_child"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTextLayoutClass, allocate_child), diff --git a/gtk/gtktextmark.c b/gtk/gtktextmark.c index a6d7a04c6d..260cc44d1d 100644 --- a/gtk/gtktextmark.c +++ b/gtk/gtktextmark.c @@ -50,6 +50,7 @@ #define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API #include <config.h> #include "gtktextbtree.h" +#include "gtkintl.h" #include "gtkalias.h" static void gtk_text_mark_init (GtkTextMark *mark); @@ -79,7 +80,7 @@ gtk_text_mark_get_type (void) (GInstanceInitFunc) gtk_text_mark_init, }; - object_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkTextMark"), + object_type = g_type_register_static (G_TYPE_OBJECT, I_("GtkTextMark"), &object_info, 0); } diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c index ac942269cc..99d831f433 100644 --- a/gtk/gtktexttag.c +++ b/gtk/gtktexttag.c @@ -175,7 +175,7 @@ gtk_text_tag_get_type (void) (GInstanceInitFunc) gtk_text_tag_init }; - our_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkTextTag"), + our_type = g_type_register_static (G_TYPE_OBJECT, I_("GtkTextTag"), &our_info, 0); } @@ -665,7 +665,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass) P_("Whether this tag affects the paragraph background color")); signals[EVENT] = - g_signal_new ("event", + g_signal_new (I_("event"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTextTagClass, event), @@ -1971,7 +1971,7 @@ gtk_text_attributes_get_type (void) static GType our_type = 0; if (our_type == 0) - our_type = g_boxed_type_register_static (g_intern_static_string ("GtkTextAttributes"), + our_type = g_boxed_type_register_static (I_("GtkTextAttributes"), (GBoxedCopyFunc) gtk_text_attributes_ref, (GBoxedFreeFunc) gtk_text_attributes_unref); diff --git a/gtk/gtktexttagtable.c b/gtk/gtktexttagtable.c index 1dd1c18f64..8d22070e2b 100644 --- a/gtk/gtktexttagtable.c +++ b/gtk/gtktexttagtable.c @@ -28,6 +28,7 @@ #include "gtktexttagtable.h" #include "gtkmarshalers.h" #include "gtktextbuffer.h" /* just for the lame notify_will_remove_tag hack */ +#include "gtkintl.h" #include "gtkalias.h" #include <stdlib.h> @@ -78,7 +79,7 @@ gtk_text_tag_table_get_type (void) (GInstanceInitFunc) gtk_text_tag_table_init }; - our_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkTextTagTable"), + our_type = g_type_register_static (G_TYPE_OBJECT, I_("GtkTextTagTable"), &our_info, 0); } @@ -98,7 +99,7 @@ gtk_text_tag_table_class_init (GtkTextTagTableClass *klass) object_class->finalize = gtk_text_tag_table_finalize; signals[TAG_CHANGED] = - g_signal_new ("tag_changed", + g_signal_new (I_("tag_changed"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTextTagTableClass, tag_changed), @@ -110,7 +111,7 @@ gtk_text_tag_table_class_init (GtkTextTagTableClass *klass) G_TYPE_BOOLEAN); signals[TAG_ADDED] = - g_signal_new ("tag_added", + g_signal_new (I_("tag_added"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTextTagTableClass, tag_added), @@ -121,7 +122,7 @@ gtk_text_tag_table_class_init (GtkTextTagTableClass *klass) GTK_TYPE_TEXT_TAG); signals[TAG_REMOVED] = - g_signal_new ("tag_removed", + g_signal_new (I_("tag_removed"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTextTagTableClass, tag_removed), diff --git a/gtk/gtktextutil.c b/gtk/gtktextutil.c index 440e30be09..7552a8cb8c 100644 --- a/gtk/gtktextutil.c +++ b/gtk/gtktextutil.c @@ -110,7 +110,7 @@ _gtk_text_util_append_special_char_menuitems (GtkMenuShell *menushe info->data = data; menuitem = gtk_menu_item_new_with_mnemonic (_(bidi_menu_entries[i].label)); - g_object_set_data (G_OBJECT (menuitem), g_intern_static_string ("gtk-unicode-menu-entry"), + g_object_set_data (G_OBJECT (menuitem), I_("gtk-unicode-menu-entry"), (gpointer)&bidi_menu_entries[i]); g_signal_connect_data (menuitem, "activate", diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index d950170415..6f5aa59202 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -441,7 +441,7 @@ gtk_text_view_get_type (void) (GInstanceInitFunc) gtk_text_view_init, }; - our_type = g_type_register_static (GTK_TYPE_CONTAINER, g_intern_static_string ("GtkTextView"), + our_type = g_type_register_static (GTK_TYPE_CONTAINER, I_("GtkTextView"), &our_info, 0); } @@ -698,7 +698,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass) * */ signals[MOVE_CURSOR] = - g_signal_new ("move_cursor", + g_signal_new (I_("move_cursor"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkTextViewClass, move_cursor), @@ -710,7 +710,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass) G_TYPE_BOOLEAN); signals[PAGE_HORIZONTALLY] = - g_signal_new ("page_horizontally", + g_signal_new (I_("page_horizontally"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkTextViewClass, page_horizontally), @@ -721,7 +721,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass) G_TYPE_BOOLEAN); signals[MOVE_VIEWPORT] = - _gtk_binding_signal_new ("move_viewport", + _gtk_binding_signal_new (I_("move_viewport"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_CALLBACK (gtk_text_view_move_viewport), @@ -732,7 +732,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass) G_TYPE_INT); signals[SET_ANCHOR] = - g_signal_new ("set_anchor", + g_signal_new (I_("set_anchor"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkTextViewClass, set_anchor), @@ -741,7 +741,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass) G_TYPE_NONE, 0); signals[INSERT_AT_CURSOR] = - g_signal_new ("insert_at_cursor", + g_signal_new (I_("insert_at_cursor"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkTextViewClass, insert_at_cursor), @@ -751,7 +751,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass) G_TYPE_STRING); signals[DELETE_FROM_CURSOR] = - g_signal_new ("delete_from_cursor", + g_signal_new (I_("delete_from_cursor"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkTextViewClass, delete_from_cursor), @@ -762,7 +762,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass) G_TYPE_INT); signals[BACKSPACE] = - g_signal_new ("backspace", + g_signal_new (I_("backspace"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkTextViewClass, backspace), @@ -771,7 +771,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass) G_TYPE_NONE, 0); signals[CUT_CLIPBOARD] = - g_signal_new ("cut_clipboard", + g_signal_new (I_("cut_clipboard"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkTextViewClass, cut_clipboard), @@ -780,7 +780,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass) G_TYPE_NONE, 0); signals[COPY_CLIPBOARD] = - g_signal_new ("copy_clipboard", + g_signal_new (I_("copy_clipboard"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkTextViewClass, copy_clipboard), @@ -789,7 +789,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass) G_TYPE_NONE, 0); signals[PASTE_CLIPBOARD] = - g_signal_new ("paste_clipboard", + g_signal_new (I_("paste_clipboard"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkTextViewClass, paste_clipboard), @@ -798,7 +798,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass) G_TYPE_NONE, 0); signals[TOGGLE_OVERWRITE] = - g_signal_new ("toggle_overwrite", + g_signal_new (I_("toggle_overwrite"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkTextViewClass, toggle_overwrite), @@ -807,7 +807,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass) G_TYPE_NONE, 0); signals[MOVE_FOCUS] = - g_signal_new ("move_focus", + g_signal_new (I_("move_focus"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkTextViewClass, move_focus), @@ -817,7 +817,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass) GTK_TYPE_DIRECTION_TYPE); signals[SET_SCROLL_ADJUSTMENTS] = - g_signal_new ("set_scroll_adjustments", + g_signal_new (I_("set_scroll_adjustments"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkTextViewClass, set_scroll_adjustments), @@ -829,7 +829,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass) widget_class->set_scroll_adjustments_signal = signals[SET_SCROLL_ADJUSTMENTS]; signals[POPULATE_POPUP] = - g_signal_new ("populate_popup", + g_signal_new (I_("populate_popup"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTextViewClass, populate_popup), @@ -839,7 +839,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass) GTK_TYPE_MENU); signals[SELECT_ALL] = - _gtk_binding_signal_new ("select_all", + _gtk_binding_signal_new (I_("select_all"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_CALLBACK (gtk_text_view_select_all), @@ -6899,7 +6899,7 @@ append_action_signal (GtkTextView *text_view, { GtkWidget *menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL); - g_object_set_data (G_OBJECT (menuitem), g_intern_static_string ("gtk-signal"), (char *)signal); + g_object_set_data (G_OBJECT (menuitem), I_("gtk-signal"), (char *)signal); g_signal_connect (menuitem, "activate", G_CALLBACK (activate_cb), text_view); @@ -8087,7 +8087,7 @@ text_view_child_new_anchored (GtkWidget *child, g_object_ref (vc->anchor); g_object_set_data (G_OBJECT (child), - g_intern_static_string ("gtk-text-view-child"), + I_("gtk-text-view-child"), vc); gtk_text_child_anchor_register_child (anchor, child, layout); @@ -8118,7 +8118,7 @@ text_view_child_new_window (GtkWidget *child, vc->y = y; g_object_set_data (G_OBJECT (child), - g_intern_static_string ("gtk-text-view-child"), + I_("gtk-text-view-child"), vc); return vc; @@ -8128,7 +8128,7 @@ static void text_view_child_free (GtkTextViewChild *child) { g_object_set_data (G_OBJECT (child->widget), - g_intern_static_string ("gtk-text-view-child"), NULL); + I_("gtk-text-view-child"), NULL); if (child->anchor) { diff --git a/gtk/gtkthemes.c b/gtk/gtkthemes.c index 141791df4d..1e5e0cc5ae 100644 --- a/gtk/gtkthemes.c +++ b/gtk/gtkthemes.c @@ -150,7 +150,7 @@ gtk_theme_engine_get_type (void) }; theme_engine_type = - g_type_register_static (G_TYPE_TYPE_MODULE, g_intern_static_string ("GtkThemeEngine"), + g_type_register_static (G_TYPE_TYPE_MODULE, I_("GtkThemeEngine"), &theme_engine_info, 0); } diff --git a/gtk/gtktipsquery.c b/gtk/gtktipsquery.c index 4563fe813c..042365d890 100644 --- a/gtk/gtktipsquery.c +++ b/gtk/gtktipsquery.c @@ -105,7 +105,7 @@ gtk_tips_query_get_type (void) (GtkClassInitFunc) NULL, }; - g_intern_static_string ("GtkTipsQuery"); + I_("GtkTipsQuery"); tips_query_type = gtk_type_unique (gtk_label_get_type (), &tips_query_info); } @@ -141,21 +141,21 @@ gtk_tips_query_class_init (GtkTipsQueryClass *class) gtk_object_add_arg_type ("GtkTipsQuery::label-no-tip", GTK_TYPE_STRING, GTK_ARG_READWRITE | G_PARAM_STATIC_NAME, ARG_LABEL_NO_TIP); tips_query_signals[SIGNAL_START_QUERY] = - gtk_signal_new ("start_query", + gtk_signal_new (I_("start_query"), GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkTipsQueryClass, start_query), _gtk_marshal_VOID__VOID, GTK_TYPE_NONE, 0); tips_query_signals[SIGNAL_STOP_QUERY] = - gtk_signal_new ("stop_query", + gtk_signal_new (I_("stop_query"), GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkTipsQueryClass, stop_query), _gtk_marshal_VOID__VOID, GTK_TYPE_NONE, 0); tips_query_signals[SIGNAL_WIDGET_ENTERED] = - gtk_signal_new ("widget_entered", + gtk_signal_new (I_("widget_entered"), GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkTipsQueryClass, widget_entered), @@ -165,7 +165,7 @@ gtk_tips_query_class_init (GtkTipsQueryClass *class) GTK_TYPE_STRING, GTK_TYPE_STRING); tips_query_signals[SIGNAL_WIDGET_SELECTED] = - g_signal_new ("widget_selected", + g_signal_new (I_("widget_selected"), G_TYPE_FROM_CLASS(object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET(GtkTipsQueryClass, widget_selected), diff --git a/gtk/gtktoggleaction.c b/gtk/gtktoggleaction.c index 7c6a00415e..547157ed90 100644 --- a/gtk/gtktoggleaction.c +++ b/gtk/gtktoggleaction.c @@ -75,7 +75,7 @@ gtk_toggle_action_get_type (void) }; type = g_type_register_static (GTK_TYPE_ACTION, - g_intern_static_string ("GtkToggleAction"), + I_("GtkToggleAction"), &type_info, 0); } return type; @@ -134,7 +134,7 @@ gtk_toggle_action_class_init (GtkToggleActionClass *klass) GTK_PARAM_READWRITE)); action_signals[TOGGLED] = - g_signal_new ("toggled", + g_signal_new (I_("toggled"), G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkToggleActionClass, toggled), diff --git a/gtk/gtktogglebutton.c b/gtk/gtktogglebutton.c index 46fa079da8..a850f3d5b4 100644 --- a/gtk/gtktogglebutton.c +++ b/gtk/gtktogglebutton.c @@ -93,7 +93,7 @@ gtk_toggle_button_get_type (void) }; toggle_button_type = - g_type_register_static (GTK_TYPE_BUTTON, g_intern_static_string ("GtkToggleButton"), + g_type_register_static (GTK_TYPE_BUTTON, I_("GtkToggleButton"), &toggle_button_info, 0); } @@ -154,7 +154,7 @@ gtk_toggle_button_class_init (GtkToggleButtonClass *class) GTK_PARAM_READWRITE)); toggle_button_signals[TOGGLED] = - g_signal_new ("toggled", + g_signal_new (I_("toggled"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkToggleButtonClass, toggled), diff --git a/gtk/gtktoggletoolbutton.c b/gtk/gtktoggletoolbutton.c index cabae8800c..740ea1934a 100644 --- a/gtk/gtktoggletoolbutton.c +++ b/gtk/gtktoggletoolbutton.c @@ -93,7 +93,7 @@ gtk_toggle_tool_button_get_type (void) }; type = g_type_register_static (GTK_TYPE_TOOL_BUTTON, - g_intern_static_string ("GtkToggleToolButton"), &type_info, 0); + I_("GtkToggleToolButton"), &type_info, 0); } return type; } @@ -140,7 +140,7 @@ gtk_toggle_tool_button_class_init (GtkToggleToolButtonClass *klass) * Emitted whenever the toggle tool button changes state. **/ toggle_signals[TOGGLED] = - g_signal_new ("toggled", + g_signal_new (I_("toggled"), G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkToggleToolButtonClass, toggled), diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index 0807732299..8a60d46149 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -324,7 +324,7 @@ gtk_toolbar_get_type (void) }; type = g_type_register_static (GTK_TYPE_CONTAINER, - g_intern_static_string ("GtkToolbar"), + I_("GtkToolbar"), &type_info, 0); } @@ -412,7 +412,7 @@ gtk_toolbar_class_init (GtkToolbarClass *klass) * Emitted when the orientation of the toolbar changes. */ toolbar_signals[ORIENTATION_CHANGED] = - g_signal_new ("orientation-changed", + g_signal_new (I_("orientation-changed"), G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkToolbarClass, orientation_changed), @@ -428,7 +428,7 @@ gtk_toolbar_class_init (GtkToolbarClass *klass) * Emitted when the style of the toolbar changes. */ toolbar_signals[STYLE_CHANGED] = - g_signal_new ("style-changed", + g_signal_new (I_("style-changed"), G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkToolbarClass, style_changed), @@ -455,7 +455,7 @@ gtk_toolbar_class_init (GtkToolbarClass *klass) * Return value: return %TRUE if the signal was handled, %FALSE if not */ toolbar_signals[POPUP_CONTEXT_MENU] = - g_signal_new ("popup_context_menu", + g_signal_new (I_("popup_context_menu"), G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkToolbarClass, popup_context_menu), @@ -475,7 +475,7 @@ gtk_toolbar_class_init (GtkToolbarClass *klass) * Return value: %TRUE if the signal was handled, %FALSE if not */ toolbar_signals[MOVE_FOCUS] = - _gtk_binding_signal_new ("move_focus", + _gtk_binding_signal_new (I_("move_focus"), G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_CALLBACK (gtk_toolbar_move_focus), @@ -494,7 +494,7 @@ gtk_toolbar_class_init (GtkToolbarClass *klass) * Return value: %TRUE if the signal was handled, %FALSE if not */ toolbar_signals[FOCUS_HOME_OR_END] = - _gtk_binding_signal_new ("focus_home_or_end", + _gtk_binding_signal_new (I_("focus_home_or_end"), G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_CALLBACK (gtk_toolbar_focus_home_or_end), diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c index 4fb6c1d424..8d53c83ba5 100644 --- a/gtk/gtktoolbutton.c +++ b/gtk/gtktoolbutton.c @@ -116,7 +116,7 @@ gtk_tool_button_get_type (void) }; type = g_type_register_static (GTK_TYPE_TOOL_ITEM, - g_intern_static_string ("GtkToolButton"), + I_("GtkToolButton"), &type_info, 0); } return type; @@ -242,7 +242,7 @@ gtk_tool_button_class_init (GtkToolButtonClass *klass) * or activated with the keyboard. **/ toolbutton_signals[CLICKED] = - g_signal_new ("clicked", + g_signal_new (I_("clicked"), G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkToolButtonClass, clicked), diff --git a/gtk/gtktoolitem.c b/gtk/gtktoolitem.c index 83deeb9ab0..35407444a2 100644 --- a/gtk/gtktoolitem.c +++ b/gtk/gtktoolitem.c @@ -122,7 +122,7 @@ gtk_tool_item_get_type (void) }; type = g_type_register_static (GTK_TYPE_BIN, - g_intern_static_string ("GtkToolItem"), + I_("GtkToolItem"), &type_info, 0); } return type; @@ -206,7 +206,7 @@ gtk_tool_item_class_init (GtkToolItemClass *klass) * Return value: %TRUE if the signal was handled, %FALSE if not **/ toolitem_signals[CREATE_MENU_PROXY] = - g_signal_new ("create_menu_proxy", + g_signal_new (I_("create_menu_proxy"), G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkToolItemClass, create_menu_proxy), @@ -231,7 +231,7 @@ gtk_tool_item_class_init (GtkToolItemClass *klass) * themselves accordingly. **/ toolitem_signals[TOOLBAR_RECONFIGURED] = - g_signal_new ("toolbar_reconfigured", + g_signal_new (I_("toolbar_reconfigured"), G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkToolItemClass, toolbar_reconfigured), @@ -252,7 +252,7 @@ gtk_tool_item_class_init (GtkToolItemClass *klass) * Return value: %TRUE if the signal was handled, %FALSE if not **/ toolitem_signals[SET_TOOLTIP] = - g_signal_new ("set_tooltip", + g_signal_new (I_("set_tooltip"), G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkToolItemClass, set_tooltip), diff --git a/gtk/gtktooltips.c b/gtk/gtktooltips.c index 12a2761dc7..484d34335b 100644 --- a/gtk/gtktooltips.c +++ b/gtk/gtktooltips.c @@ -37,6 +37,7 @@ #include "gtkwindow.h" #include "gtkstyle.h" #include "gtktooltips.h" +#include "gtkintl.h" #include "gtkalias.h" @@ -92,7 +93,7 @@ gtk_tooltips_get_type (void) (GInstanceInitFunc) gtk_tooltips_init, }; - tooltips_type = g_type_register_static (GTK_TYPE_OBJECT, g_intern_static_string ("GtkTooltips"), + tooltips_type = g_type_register_static (GTK_TYPE_OBJECT, I_("GtkTooltips"), &tooltips_info, 0); } @@ -148,7 +149,7 @@ gtk_tooltips_destroy_data (GtkTooltipsData *tooltipsdata) gtk_tooltips_widget_remove, tooltipsdata); - g_object_set_data (G_OBJECT (tooltipsdata->widget), g_intern_static_string (tooltips_data_key), NULL); + g_object_set_data (G_OBJECT (tooltipsdata->widget), I_(tooltips_data_key), NULL); g_object_unref (tooltipsdata->widget); g_free (tooltipsdata); } @@ -361,7 +362,7 @@ gtk_tooltips_set_tip (GtkTooltips *tooltips, G_CALLBACK (gtk_tooltips_event_handler), tooltipsdata); - g_object_set_data (G_OBJECT (widget), g_intern_static_string (tooltips_data_key), + g_object_set_data (G_OBJECT (widget), I_(tooltips_data_key), tooltipsdata); g_signal_connect (widget, "unmap", @@ -415,7 +416,7 @@ gtk_tooltips_draw_tips (GtkTooltips *tooltips) style = tooltips->tip_window->style; widget = tooltips->active_tips_data->widget; - g_object_set_data (G_OBJECT (tooltips->tip_window), g_intern_static_string (tooltips_info_key), + g_object_set_data (G_OBJECT (tooltips->tip_window), I_(tooltips_info_key), tooltips); keyboard_mode = get_keyboard_mode (widget); @@ -588,7 +589,7 @@ start_keyboard_mode (GtkWidget *widget) { GtkWidget *focus = GTK_WINDOW (toplevel)->focus_widget; - g_object_set_data (G_OBJECT (toplevel), g_intern_static_string ("gtk-tooltips-keyboard-mode"), GUINT_TO_POINTER (TRUE)); + g_object_set_data (G_OBJECT (toplevel), I_("gtk-tooltips-keyboard-mode"), GUINT_TO_POINTER (TRUE)); if (focus) gtk_tooltips_show_tip (focus); @@ -605,7 +606,7 @@ stop_keyboard_mode (GtkWidget *widget) if (focus) gtk_tooltips_hide_tip (focus); - g_object_set_data (G_OBJECT (toplevel), g_intern_static_string ("gtk-tooltips-keyboard-mode"), GUINT_TO_POINTER (FALSE)); + g_object_set_data (G_OBJECT (toplevel), I_("gtk-tooltips-keyboard-mode"), GUINT_TO_POINTER (FALSE)); } } diff --git a/gtk/gtktree.c b/gtk/gtktree.c index 79276dbbb8..c123c0deb1 100644 --- a/gtk/gtktree.c +++ b/gtk/gtktree.c @@ -35,6 +35,7 @@ #define GTK_ENABLE_BROKEN #include "gtktree.h" #include "gtktreeitem.h" +#include "gtkintl.h" #include "gtkalias.h" enum { @@ -98,7 +99,7 @@ gtk_tree_get_type (void) (GtkClassInitFunc) NULL, }; - g_intern_static_string ("GtkTree"); + I_("GtkTree"); tree_type = gtk_type_unique (gtk_container_get_type (), &tree_info); } @@ -142,14 +143,14 @@ gtk_tree_class_init (GtkTreeClass *class) class->unselect_child = gtk_real_tree_unselect_child; tree_signals[SELECTION_CHANGED] = - gtk_signal_new ("selection_changed", + gtk_signal_new (I_("selection_changed"), GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkTreeClass, selection_changed), _gtk_marshal_VOID__VOID, GTK_TYPE_NONE, 0); tree_signals[SELECT_CHILD] = - gtk_signal_new ("select_child", + gtk_signal_new (I_("select_child"), GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkTreeClass, select_child), @@ -157,7 +158,7 @@ gtk_tree_class_init (GtkTreeClass *class) GTK_TYPE_NONE, 1, GTK_TYPE_WIDGET); tree_signals[UNSELECT_CHILD] = - gtk_signal_new ("unselect_child", + gtk_signal_new (I_("unselect_child"), GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkTreeClass, unselect_child), diff --git a/gtk/gtktreednd.c b/gtk/gtktreednd.c index 2431c950a2..4e5c2715d6 100644 --- a/gtk/gtktreednd.c +++ b/gtk/gtktreednd.c @@ -20,6 +20,7 @@ #include <config.h> #include <string.h> #include "gtktreednd.h" +#include "gtkintl.h" #include "gtkalias.h" GType @@ -42,7 +43,7 @@ gtk_tree_drag_source_get_type (void) NULL }; - our_type = g_type_register_static (G_TYPE_INTERFACE, g_intern_static_string ("GtkTreeDragSource"), + our_type = g_type_register_static (G_TYPE_INTERFACE, I_("GtkTreeDragSource"), &our_info, 0); } @@ -70,7 +71,7 @@ gtk_tree_drag_dest_get_type (void) NULL }; - our_type = g_type_register_static (G_TYPE_INTERFACE, g_intern_static_string ("GtkTreeDragDest"), &our_info, 0); + our_type = g_type_register_static (G_TYPE_INTERFACE, I_("GtkTreeDragDest"), &our_info, 0); } return our_type; diff --git a/gtk/gtktreeitem.c b/gtk/gtktreeitem.c index e944a7c4a6..2b824d7bea 100644 --- a/gtk/gtktreeitem.c +++ b/gtk/gtktreeitem.c @@ -36,6 +36,7 @@ #define GTK_ENABLE_BROKEN #include "gtktree.h" #include "gtktreeitem.h" +#include "gtkintl.h" #include "gtkalias.h" #include "tree_plus.xpm" @@ -118,7 +119,7 @@ gtk_tree_item_get_type (void) (GtkClassInitFunc) NULL, }; - g_intern_static_string ("GtkTreeItem"); + I_("GtkTreeItem"); tree_item_type = gtk_type_unique (gtk_item_get_type (), &tree_item_info); } @@ -160,14 +161,14 @@ gtk_tree_item_class_init (GtkTreeItemClass *class) class->collapse = gtk_real_tree_item_collapse; tree_item_signals[EXPAND_TREE] = - gtk_signal_new ("expand", + gtk_signal_new (I_("expand"), GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkTreeItemClass, expand), _gtk_marshal_VOID__VOID, GTK_TYPE_NONE, 0); tree_item_signals[COLLAPSE_TREE] = - gtk_signal_new ("collapse", + gtk_signal_new (I_("collapse"), GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkTreeItemClass, collapse), diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c index 967793aaad..58e0988005 100644 --- a/gtk/gtktreemodel.c +++ b/gtk/gtktreemodel.c @@ -27,6 +27,7 @@ #include "gtktreeview.h" #include "gtktreeprivate.h" #include "gtkmarshalers.h" +#include "gtkintl.h" #include "gtkalias.h" @@ -115,7 +116,7 @@ gtk_tree_model_get_type (void) }; tree_model_type = - g_type_register_static (G_TYPE_INTERFACE, g_intern_static_string ("GtkTreeModel"), + g_type_register_static (G_TYPE_INTERFACE, I_("GtkTreeModel"), &tree_model_info, 0); g_type_interface_add_prerequisite (tree_model_type, G_TYPE_OBJECT); @@ -146,7 +147,7 @@ gtk_tree_model_base_init (gpointer g_class) rows_reordered_params[2] = G_TYPE_POINTER; tree_model_signals[ROW_CHANGED] = - g_signal_new ("row_changed", + g_signal_new (I_("row_changed"), GTK_TYPE_TREE_MODEL, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTreeModelIface, row_changed), @@ -171,7 +172,7 @@ gtk_tree_model_base_init (gpointer g_class) closure = g_closure_new_simple (sizeof (GClosure), NULL); g_closure_set_marshal (closure, row_inserted_marshal); tree_model_signals[ROW_INSERTED] = - g_signal_newv ("row_inserted", + g_signal_newv (I_("row_inserted"), GTK_TYPE_TREE_MODEL, G_SIGNAL_RUN_FIRST, closure, @@ -181,7 +182,7 @@ gtk_tree_model_base_init (gpointer g_class) row_inserted_params); tree_model_signals[ROW_HAS_CHILD_TOGGLED] = - g_signal_new ("row_has_child_toggled", + g_signal_new (I_("row_has_child_toggled"), GTK_TYPE_TREE_MODEL, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTreeModelIface, row_has_child_toggled), @@ -194,7 +195,7 @@ gtk_tree_model_base_init (gpointer g_class) closure = g_closure_new_simple (sizeof (GClosure), NULL); g_closure_set_marshal (closure, row_deleted_marshal); tree_model_signals[ROW_DELETED] = - g_signal_newv ("row_deleted", + g_signal_newv (I_("row_deleted"), GTK_TYPE_TREE_MODEL, G_SIGNAL_RUN_FIRST, closure, @@ -206,7 +207,7 @@ gtk_tree_model_base_init (gpointer g_class) closure = g_closure_new_simple (sizeof (GClosure), NULL); g_closure_set_marshal (closure, rows_reordered_marshal); tree_model_signals[ROWS_REORDERED] = - g_signal_newv ("rows_reordered", + g_signal_newv (I_("rows_reordered"), GTK_TYPE_TREE_MODEL, G_SIGNAL_RUN_FIRST, closure, @@ -599,7 +600,7 @@ gtk_tree_path_get_type (void) static GType our_type = 0; if (our_type == 0) - our_type = g_boxed_type_register_static (g_intern_static_string ("GtkTreePath"), + our_type = g_boxed_type_register_static (I_("GtkTreePath"), (GBoxedCopyFunc) gtk_tree_path_copy, (GBoxedFreeFunc) gtk_tree_path_free); @@ -827,7 +828,7 @@ gtk_tree_iter_get_type (void) static GType our_type = 0; if (our_type == 0) - our_type = g_boxed_type_register_static (g_intern_static_string ("GtkTreeIter"), + our_type = g_boxed_type_register_static (I_("GtkTreeIter"), (GBoxedCopyFunc) gtk_tree_iter_copy, (GBoxedFreeFunc) gtk_tree_iter_free); @@ -1577,7 +1578,7 @@ gtk_tree_row_reference_get_type (void) static GType our_type = 0; if (our_type == 0) - our_type = g_boxed_type_register_static (g_intern_static_string ("GtkTreeRowReference"), + our_type = g_boxed_type_register_static (I_("GtkTreeRowReference"), (GBoxedCopyFunc) gtk_tree_row_reference_copy, (GBoxedFreeFunc) gtk_tree_row_reference_free); @@ -1913,7 +1914,7 @@ gtk_tree_row_reference_new_proxy (GObject *proxy, refs->list = NULL; g_object_set_data_full (G_OBJECT (proxy), - g_intern_static_string (ROW_REF_DATA_STRING), + I_(ROW_REF_DATA_STRING), refs, release_row_references); } @@ -2027,7 +2028,7 @@ gtk_tree_row_reference_free (GtkTreeRowReference *reference) if (refs->list == NULL) { g_object_set_data (G_OBJECT (reference->proxy), - g_intern_static_string (ROW_REF_DATA_STRING), + I_(ROW_REF_DATA_STRING), NULL); } diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c index fd9241279a..6576519cc4 100644 --- a/gtk/gtktreemodelfilter.c +++ b/gtk/gtktreemodelfilter.c @@ -280,7 +280,7 @@ gtk_tree_model_filter_get_type (void) }; tree_model_filter_type = g_type_register_static (G_TYPE_OBJECT, - g_intern_static_string ("GtkTreeModelFilter"), + I_("GtkTreeModelFilter"), &tree_model_filter_info, 0); g_type_add_interface_static (tree_model_filter_type, diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c index 86c1456481..ac32fc4110 100644 --- a/gtk/gtktreemodelsort.c +++ b/gtk/gtktreemodelsort.c @@ -282,7 +282,7 @@ gtk_tree_model_sort_get_type (void) }; tree_model_sort_type = - g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkTreeModelSort"), + g_type_register_static (G_TYPE_OBJECT, I_("GtkTreeModelSort"), &tree_model_sort_info, 0); g_type_add_interface_static (tree_model_sort_type, diff --git a/gtk/gtktreeselection.c b/gtk/gtktreeselection.c index a269a1e0af..a004b6c4df 100644 --- a/gtk/gtktreeselection.c +++ b/gtk/gtktreeselection.c @@ -23,6 +23,7 @@ #include "gtktreeprivate.h" #include "gtkrbtree.h" #include "gtkmarshalers.h" +#include "gtkintl.h" #include "gtkalias.h" static void gtk_tree_selection_init (GtkTreeSelection *selection); @@ -66,7 +67,7 @@ gtk_tree_selection_get_type (void) }; selection_type = - g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkTreeSelection"), + g_type_register_static (G_TYPE_OBJECT, I_("GtkTreeSelection"), &selection_info, 0); } @@ -85,7 +86,7 @@ gtk_tree_selection_class_init (GtkTreeSelectionClass *class) class->changed = NULL; tree_selection_signals[CHANGED] = - g_signal_new ("changed", + g_signal_new (I_("changed"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkTreeSelectionClass, changed), diff --git a/gtk/gtktreesortable.c b/gtk/gtktreesortable.c index 5a17598971..d72ef22b53 100644 --- a/gtk/gtktreesortable.c +++ b/gtk/gtktreesortable.c @@ -21,6 +21,7 @@ #include <config.h> #include "gtktreesortable.h" #include "gtkmarshalers.h" +#include "gtkintl.h" #include "gtkalias.h" static void gtk_tree_sortable_base_init (gpointer g_class); @@ -46,7 +47,7 @@ gtk_tree_sortable_get_type (void) }; tree_sortable_type = - g_type_register_static (G_TYPE_INTERFACE, g_intern_static_string ("GtkTreeSortable"), + g_type_register_static (G_TYPE_INTERFACE, I_("GtkTreeSortable"), &tree_sortable_info, 0); g_type_interface_add_prerequisite (tree_sortable_type, GTK_TYPE_TREE_MODEL); @@ -62,7 +63,7 @@ gtk_tree_sortable_base_init (gpointer g_class) if (! initialized) { - g_signal_new ("sort_column_changed", + g_signal_new (I_("sort_column_changed"), GTK_TYPE_TREE_SORTABLE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTreeSortableIface, sort_column_changed), diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c index 65516895df..ca96914421 100644 --- a/gtk/gtktreestore.c +++ b/gtk/gtktreestore.c @@ -24,6 +24,7 @@ #include "gtktreestore.h" #include "gtktreedatalist.h" #include "gtktreednd.h" +#include "gtkintl.h" #include "gtkalias.h" #define G_NODE(node) ((GNode *)node) @@ -185,7 +186,7 @@ gtk_tree_store_get_type (void) NULL }; - tree_store_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkTreeStore"), + tree_store_type = g_type_register_static (G_TYPE_OBJECT, I_("GtkTreeStore"), &tree_store_info, 0); g_type_add_interface_static (tree_store_type, diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index f92feee66c..3c9bdb0ad2 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -484,7 +484,7 @@ gtk_tree_view_get_type (void) }; tree_view_type = - g_type_register_static (GTK_TYPE_CONTAINER, g_intern_static_string ("GtkTreeView"), + g_type_register_static (GTK_TYPE_CONTAINER, I_("GtkTreeView"), &tree_view_info, 0); } @@ -768,7 +768,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) /* Signals */ widget_class->set_scroll_adjustments_signal = - g_signal_new ("set_scroll_adjustments", + g_signal_new (I_("set_scroll_adjustments"), G_TYPE_FROM_CLASS (o_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkTreeViewClass, set_scroll_adjustments), @@ -779,7 +779,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) GTK_TYPE_ADJUSTMENT); tree_view_signals[ROW_ACTIVATED] = - g_signal_new ("row_activated", + g_signal_new (I_("row_activated"), G_TYPE_FROM_CLASS (o_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkTreeViewClass, row_activated), @@ -790,7 +790,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) GTK_TYPE_TREE_VIEW_COLUMN); tree_view_signals[TEST_EXPAND_ROW] = - g_signal_new ("test_expand_row", + g_signal_new (I_("test_expand_row"), G_TYPE_FROM_CLASS (o_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTreeViewClass, test_expand_row), @@ -801,7 +801,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) GTK_TYPE_TREE_PATH); tree_view_signals[TEST_COLLAPSE_ROW] = - g_signal_new ("test_collapse_row", + g_signal_new (I_("test_collapse_row"), G_TYPE_FROM_CLASS (o_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTreeViewClass, test_collapse_row), @@ -812,7 +812,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) GTK_TYPE_TREE_PATH); tree_view_signals[ROW_EXPANDED] = - g_signal_new ("row_expanded", + g_signal_new (I_("row_expanded"), G_TYPE_FROM_CLASS (o_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTreeViewClass, row_expanded), @@ -823,7 +823,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) GTK_TYPE_TREE_PATH); tree_view_signals[ROW_COLLAPSED] = - g_signal_new ("row_collapsed", + g_signal_new (I_("row_collapsed"), G_TYPE_FROM_CLASS (o_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTreeViewClass, row_collapsed), @@ -834,7 +834,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) GTK_TYPE_TREE_PATH); tree_view_signals[COLUMNS_CHANGED] = - g_signal_new ("columns_changed", + g_signal_new (I_("columns_changed"), G_TYPE_FROM_CLASS (o_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTreeViewClass, columns_changed), @@ -843,7 +843,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) G_TYPE_NONE, 0); tree_view_signals[CURSOR_CHANGED] = - g_signal_new ("cursor_changed", + g_signal_new (I_("cursor_changed"), G_TYPE_FROM_CLASS (o_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTreeViewClass, cursor_changed), @@ -852,7 +852,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) G_TYPE_NONE, 0); tree_view_signals[MOVE_CURSOR] = - g_signal_new ("move_cursor", + g_signal_new (I_("move_cursor"), G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkTreeViewClass, move_cursor), @@ -863,7 +863,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) G_TYPE_INT); tree_view_signals[SELECT_ALL] = - g_signal_new ("select_all", + g_signal_new (I_("select_all"), G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkTreeViewClass, select_all), @@ -872,7 +872,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) G_TYPE_BOOLEAN, 0); tree_view_signals[UNSELECT_ALL] = - g_signal_new ("unselect_all", + g_signal_new (I_("unselect_all"), G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkTreeViewClass, unselect_all), @@ -881,7 +881,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) G_TYPE_BOOLEAN, 0); tree_view_signals[SELECT_CURSOR_ROW] = - g_signal_new ("select_cursor_row", + g_signal_new (I_("select_cursor_row"), G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkTreeViewClass, select_cursor_row), @@ -891,7 +891,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) G_TYPE_BOOLEAN); tree_view_signals[TOGGLE_CURSOR_ROW] = - g_signal_new ("toggle_cursor_row", + g_signal_new (I_("toggle_cursor_row"), G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkTreeViewClass, toggle_cursor_row), @@ -900,7 +900,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) G_TYPE_BOOLEAN, 0); tree_view_signals[EXPAND_COLLAPSE_CURSOR_ROW] = - g_signal_new ("expand_collapse_cursor_row", + g_signal_new (I_("expand_collapse_cursor_row"), G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkTreeViewClass, expand_collapse_cursor_row), @@ -912,7 +912,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) G_TYPE_BOOLEAN); tree_view_signals[SELECT_CURSOR_PARENT] = - g_signal_new ("select_cursor_parent", + g_signal_new (I_("select_cursor_parent"), G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkTreeViewClass, select_cursor_parent), @@ -921,7 +921,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) G_TYPE_BOOLEAN, 0); tree_view_signals[START_INTERACTIVE_SEARCH] = - g_signal_new ("start_interactive_search", + g_signal_new (I_("start_interactive_search"), G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkTreeViewClass, start_interactive_search), @@ -5491,7 +5491,7 @@ set_source_row (GdkDragContext *context, GtkTreePath *source_row) { g_object_set_data_full (G_OBJECT (context), - g_intern_static_string ("gtk-tree-view-source-row"), + I_("gtk-tree-view-source-row"), source_row ? gtk_tree_row_reference_new (model, source_row) : NULL, (GDestroyNotify) (source_row ? gtk_tree_row_reference_free : NULL)); } @@ -5539,7 +5539,7 @@ set_dest_row (GdkDragContext *context, if (!dest_row) { - g_object_set_data_full (G_OBJECT (context), g_intern_static_string ("gtk-tree-view-dest-row"), + g_object_set_data_full (G_OBJECT (context), I_("gtk-tree-view-dest-row"), NULL, NULL); return; } @@ -5551,7 +5551,7 @@ set_dest_row (GdkDragContext *context, dr->empty_view_drop = empty_view_drop; dr->drop_append_mode = drop_append_mode; - g_object_set_data_full (G_OBJECT (context), g_intern_static_string ("gtk-tree-view-dest-row"), + g_object_set_data_full (G_OBJECT (context), I_("gtk-tree-view-dest-row"), dr, (GDestroyNotify) dest_row_free); } @@ -5594,7 +5594,7 @@ set_status_pending (GdkDragContext *context, GdkDragAction suggested_action) { g_object_set_data (G_OBJECT (context), - g_intern_static_string ("gtk-tree-view-status-pending"), + I_("gtk-tree-view-status-pending"), GINT_TO_POINTER (suggested_action)); } @@ -5649,7 +5649,7 @@ ensure_info (GtkTreeView *tree_view) di = g_new0 (TreeViewDragInfo, 1); g_object_set_data_full (G_OBJECT (tree_view), - g_intern_static_string ("gtk-tree-view-drag-info"), + I_("gtk-tree-view-drag-info"), di, (GDestroyNotify) destroy_info); } @@ -5660,7 +5660,7 @@ ensure_info (GtkTreeView *tree_view) static void remove_info (GtkTreeView *tree_view) { - g_object_set_data (G_OBJECT (tree_view), g_intern_static_string ("gtk-tree-view-drag-info"), NULL); + g_object_set_data (G_OBJECT (tree_view), I_("gtk-tree-view-drag-info"), NULL); } #if 0 diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c index a4ddc42ac4..08d2c28752 100644 --- a/gtk/gtktreeviewcolumn.c +++ b/gtk/gtktreeviewcolumn.c @@ -185,7 +185,7 @@ gtk_tree_view_column_get_type (void) }; tree_column_type = - g_type_register_static (GTK_TYPE_OBJECT, g_intern_static_string ("GtkTreeViewColumn"), + g_type_register_static (GTK_TYPE_OBJECT, I_("GtkTreeViewColumn"), &tree_column_info, 0); g_type_add_interface_static (tree_column_type, @@ -212,7 +212,7 @@ gtk_tree_view_column_class_init (GtkTreeViewColumnClass *class) object_class->get_property = gtk_tree_view_column_get_property; tree_column_signals[CLICKED] = - g_signal_new ("clicked", + g_signal_new (I_("clicked"), G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTreeViewColumnClass, clicked), diff --git a/gtk/gtktypeutils.c b/gtk/gtktypeutils.c index 5937cd47e8..71159a9a68 100644 --- a/gtk/gtktypeutils.c +++ b/gtk/gtktypeutils.c @@ -31,6 +31,7 @@ #include "gtktypeutils.h" #include "gtkobject.h" +#include "gtkintl.h" #include "gtkalias.h" @@ -132,7 +133,7 @@ gtk_identifier_get_type (void) if (our_type == 0) { GTypeInfo tinfo = { 0, }; - our_type = g_type_register_static (G_TYPE_STRING, "GtkIdentifier", &tinfo, 0); + our_type = g_type_register_static (G_TYPE_STRING, I_("GtkIdentifier"), &tinfo, 0); } return our_type; diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c index 957f1cd361..edf2dd8f7b 100644 --- a/gtk/gtkuimanager.c +++ b/gtk/gtkuimanager.c @@ -190,7 +190,7 @@ gtk_ui_manager_get_type (void) }; type = g_type_register_static (G_TYPE_OBJECT, - g_intern_static_string ("GtkUIManager"), + I_("GtkUIManager"), &type_info, 0); } return type; @@ -255,7 +255,7 @@ gtk_ui_manager_class_init (GtkUIManagerClass *klass) * Since: 2.4 */ ui_manager_signals[ADD_WIDGET] = - g_signal_new ("add_widget", + g_signal_new (I_("add_widget"), G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE, G_STRUCT_OFFSET (GtkUIManagerClass, add_widget), @@ -274,7 +274,7 @@ gtk_ui_manager_class_init (GtkUIManagerClass *klass) * Since: 2.4 */ ui_manager_signals[ACTIONS_CHANGED] = - g_signal_new ("actions_changed", + g_signal_new (I_("actions_changed"), G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE, G_STRUCT_OFFSET (GtkUIManagerClass, actions_changed), @@ -298,7 +298,7 @@ gtk_ui_manager_class_init (GtkUIManagerClass *klass) * Since: 2.4 */ ui_manager_signals[CONNECT_PROXY] = - g_signal_new ("connect_proxy", + g_signal_new (I_("connect_proxy"), G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE, G_STRUCT_OFFSET (GtkUIManagerClass, connect_proxy), @@ -320,7 +320,7 @@ gtk_ui_manager_class_init (GtkUIManagerClass *klass) * Since: 2.4 */ ui_manager_signals[DISCONNECT_PROXY] = - g_signal_new ("disconnect_proxy", + g_signal_new (I_("disconnect_proxy"), G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE, G_STRUCT_OFFSET (GtkUIManagerClass, disconnect_proxy), @@ -344,7 +344,7 @@ gtk_ui_manager_class_init (GtkUIManagerClass *klass) * Since: 2.4 */ ui_manager_signals[PRE_ACTIVATE] = - g_signal_new ("pre_activate", + g_signal_new (I_("pre_activate"), G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE, G_STRUCT_OFFSET (GtkUIManagerClass, pre_activate), @@ -367,7 +367,7 @@ gtk_ui_manager_class_init (GtkUIManagerClass *klass) * Since: 2.4 */ ui_manager_signals[POST_ACTIVATE] = - g_signal_new ("post_activate", + g_signal_new (I_("post_activate"), G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE, G_STRUCT_OFFSET (GtkUIManagerClass, post_activate), @@ -2271,7 +2271,7 @@ update_node (GtkUIManager *self, gtk_menu_shell_append (GTK_MENU_SHELL (menu), tearoff); filler = gtk_menu_item_new_with_label (_("Empty")); g_object_set_data (G_OBJECT (filler), - g_intern_static_string ("gtk-empty-menu-item"), + I_("gtk-empty-menu-item"), GINT_TO_POINTER (TRUE)); gtk_widget_set_sensitive (filler, FALSE); gtk_widget_set_no_show_all (filler, TRUE); @@ -2371,7 +2371,7 @@ update_node (GtkUIManager *self, g_object_ref (info->proxy); gtk_object_sink (GTK_OBJECT (info->proxy)); g_object_set_data (G_OBJECT (info->proxy), - g_intern_static_string ("gtk-separator-mode"), + I_("gtk-separator-mode"), GINT_TO_POINTER (SEPARATOR_MODE_HIDDEN)); gtk_widget_set_no_show_all (info->proxy, TRUE); gtk_menu_shell_insert (GTK_MENU_SHELL (menushell), @@ -2381,7 +2381,7 @@ update_node (GtkUIManager *self, g_object_ref (info->extra); gtk_object_sink (GTK_OBJECT (info->extra)); g_object_set_data (G_OBJECT (info->extra), - g_intern_static_string ("gtk-separator-mode"), + I_("gtk-separator-mode"), GINT_TO_POINTER (SEPARATOR_MODE_HIDDEN)); gtk_widget_set_no_show_all (info->extra, TRUE); gtk_menu_shell_insert (GTK_MENU_SHELL (menushell), @@ -2424,7 +2424,7 @@ update_node (GtkUIManager *self, g_object_ref (info->proxy); gtk_object_sink (GTK_OBJECT (info->proxy)); g_object_set_data (G_OBJECT (info->proxy), - g_intern_static_string ("gtk-separator-mode"), + I_("gtk-separator-mode"), GINT_TO_POINTER (SEPARATOR_MODE_HIDDEN)); gtk_widget_set_no_show_all (info->proxy, TRUE); @@ -2434,7 +2434,7 @@ update_node (GtkUIManager *self, g_object_ref (info->extra); gtk_object_sink (GTK_OBJECT (info->extra)); g_object_set_data (G_OBJECT (info->extra), - g_intern_static_string ("gtk-separator-mode"), + I_("gtk-separator-mode"), GINT_TO_POINTER (SEPARATOR_MODE_HIDDEN)); gtk_widget_set_no_show_all (info->extra, TRUE); } @@ -2574,7 +2574,7 @@ update_node (GtkUIManager *self, separator_mode = SEPARATOR_MODE_SMART; g_object_set_data (G_OBJECT (info->proxy), - g_intern_static_string ("gtk-separator-mode"), + I_("gtk-separator-mode"), GINT_TO_POINTER (separator_mode)); gtk_widget_show (info->proxy); } @@ -2599,7 +2599,7 @@ update_node (GtkUIManager *self, gtk_object_sink (GTK_OBJECT (info->proxy)); gtk_widget_set_no_show_all (info->proxy, TRUE); g_object_set_data (G_OBJECT (info->proxy), - g_intern_static_string ("gtk-separator-mode"), + I_("gtk-separator-mode"), GINT_TO_POINTER (SEPARATOR_MODE_SMART)); gtk_menu_shell_insert (GTK_MENU_SHELL (menushell), info->proxy, pos); diff --git a/gtk/gtkvbbox.c b/gtk/gtkvbbox.c index 0eb9b7e3e0..be718e7f30 100644 --- a/gtk/gtkvbbox.c +++ b/gtk/gtkvbbox.c @@ -26,6 +26,7 @@ #include <config.h> #include "gtkvbbox.h" +#include "gtkintl.h" #include "gtkalias.h" @@ -60,7 +61,7 @@ gtk_vbutton_box_get_type (void) }; vbutton_box_type = - g_type_register_static (GTK_TYPE_BUTTON_BOX, g_intern_static_string ("GtkVButtonBox"), + g_type_register_static (GTK_TYPE_BUTTON_BOX, I_("GtkVButtonBox"), &vbutton_box_info, 0); } diff --git a/gtk/gtkvbox.c b/gtk/gtkvbox.c index 43a0ab431c..f10890bdd1 100644 --- a/gtk/gtkvbox.c +++ b/gtk/gtkvbox.c @@ -26,6 +26,7 @@ #include <config.h> #include "gtkvbox.h" +#include "gtkintl.h" #include "gtkalias.h" @@ -57,7 +58,7 @@ gtk_vbox_get_type (void) (GInstanceInitFunc) gtk_vbox_init, }; - vbox_type = g_type_register_static (GTK_TYPE_BOX, g_intern_static_string ("GtkVBox"), + vbox_type = g_type_register_static (GTK_TYPE_BOX, I_("GtkVBox"), &vbox_info, 0); } diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c index e88144c152..fd987b3dec 100644 --- a/gtk/gtkviewport.c +++ b/gtk/gtkviewport.c @@ -93,7 +93,7 @@ gtk_viewport_get_type (void) (GInstanceInitFunc) gtk_viewport_init, }; - viewport_type = g_type_register_static (GTK_TYPE_BIN, g_intern_static_string ("GtkViewport"), + viewport_type = g_type_register_static (GTK_TYPE_BIN, I_("GtkViewport"), &viewport_info, 0); } @@ -157,7 +157,7 @@ gtk_viewport_class_init (GtkViewportClass *class) GTK_PARAM_READWRITE)); widget_class->set_scroll_adjustments_signal = - g_signal_new ("set_scroll_adjustments", + g_signal_new (I_("set_scroll_adjustments"), G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkViewportClass, set_scroll_adjustments), diff --git a/gtk/gtkvpaned.c b/gtk/gtkvpaned.c index 25a1de7d3b..e00fc616ac 100644 --- a/gtk/gtkvpaned.c +++ b/gtk/gtkvpaned.c @@ -26,6 +26,7 @@ #include <config.h> #include "gtkvpaned.h" +#include "gtkintl.h" #include "gtkalias.h" static void gtk_vpaned_class_init (GtkVPanedClass *klass); @@ -57,7 +58,7 @@ gtk_vpaned_get_type (void) (GInstanceInitFunc) gtk_vpaned_init, }; - vpaned_type = g_type_register_static (GTK_TYPE_PANED, g_intern_static_string ("GtkVPaned"), + vpaned_type = g_type_register_static (GTK_TYPE_PANED, I_("GtkVPaned"), &vpaned_info, 0); } diff --git a/gtk/gtkvruler.c b/gtk/gtkvruler.c index 0115aa7f91..eb910ab03e 100644 --- a/gtk/gtkvruler.c +++ b/gtk/gtkvruler.c @@ -28,6 +28,7 @@ #include <math.h> #include <string.h> #include "gtkvruler.h" +#include "gtkintl.h" #include "gtkalias.h" #include <glib/gprintf.h> @@ -69,7 +70,7 @@ gtk_vruler_get_type (void) (GInstanceInitFunc) gtk_vruler_init, }; - vruler_type = g_type_register_static (GTK_TYPE_RULER, g_intern_static_string ("GtkVRuler"), + vruler_type = g_type_register_static (GTK_TYPE_RULER, I_("GtkVRuler"), &vruler_info, 0); } diff --git a/gtk/gtkvscale.c b/gtk/gtkvscale.c index a512b816c1..da92e7ef77 100644 --- a/gtk/gtkvscale.c +++ b/gtk/gtkvscale.c @@ -65,7 +65,7 @@ gtk_vscale_get_type (void) (GInstanceInitFunc) gtk_vscale_init, }; - vscale_type = g_type_register_static (GTK_TYPE_SCALE, g_intern_static_string ("GtkVScale"), + vscale_type = g_type_register_static (GTK_TYPE_SCALE, I_("GtkVScale"), &vscale_info, 0); } diff --git a/gtk/gtkvscrollbar.c b/gtk/gtkvscrollbar.c index 6004af619e..071fc1f3fa 100644 --- a/gtk/gtkvscrollbar.c +++ b/gtk/gtkvscrollbar.c @@ -55,7 +55,7 @@ gtk_vscrollbar_get_type (void) }; vscrollbar_type = - g_type_register_static (GTK_TYPE_SCROLLBAR, g_intern_static_string ("GtkVScrollbar"), + g_type_register_static (GTK_TYPE_SCROLLBAR, I_("GtkVScrollbar"), &vscrollbar_info, 0); } diff --git a/gtk/gtkvseparator.c b/gtk/gtkvseparator.c index 1b90e86e9f..bbf517780d 100644 --- a/gtk/gtkvseparator.c +++ b/gtk/gtkvseparator.c @@ -26,6 +26,7 @@ #include <config.h> #include "gtkvseparator.h" +#include "gtkintl.h" #include "gtkalias.h" @@ -56,7 +57,7 @@ gtk_vseparator_get_type (void) }; vseparator_type = - g_type_register_static (GTK_TYPE_SEPARATOR, g_intern_static_string ("GtkVSeparator"), + g_type_register_static (GTK_TYPE_SEPARATOR, I_("GtkVSeparator"), &vseparator_info, 0); } diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 241277f3e2..94b1300936 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -288,7 +288,7 @@ gtk_widget_get_type (void) NULL /* interface data */ }; - widget_type = g_type_register_static (GTK_TYPE_OBJECT, g_intern_static_string ("GtkWidget"), + widget_type = g_type_register_static (GTK_TYPE_OBJECT, I_("GtkWidget"), &widget_info, G_TYPE_FLAG_ABSTRACT); g_type_add_interface_static (widget_type, ATK_TYPE_IMPLEMENTOR, @@ -543,7 +543,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) FALSE, GTK_PARAM_READWRITE)); widget_signals[SHOW] = - g_signal_new ("show", + g_signal_new (I_("show"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkWidgetClass, show), @@ -551,7 +551,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) _gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); widget_signals[HIDE] = - g_signal_new ("hide", + g_signal_new (I_("hide"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkWidgetClass, hide), @@ -559,7 +559,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) _gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); widget_signals[MAP] = - g_signal_new ("map", + g_signal_new (I_("map"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkWidgetClass, map), @@ -567,7 +567,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) _gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); widget_signals[UNMAP] = - g_signal_new ("unmap", + g_signal_new (I_("unmap"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkWidgetClass, unmap), @@ -575,7 +575,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) _gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); widget_signals[REALIZE] = - g_signal_new ("realize", + g_signal_new (I_("realize"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkWidgetClass, realize), @@ -583,7 +583,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) _gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); widget_signals[UNREALIZE] = - g_signal_new ("unrealize", + g_signal_new (I_("unrealize"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, unrealize), @@ -591,7 +591,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) _gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); widget_signals[SIZE_REQUEST] = - g_signal_new ("size_request", + g_signal_new (I_("size_request"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkWidgetClass, size_request), @@ -600,7 +600,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_NONE, 1, GTK_TYPE_REQUISITION | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[SIZE_ALLOCATE] = - g_signal_new ("size_allocate", + g_signal_new (I_("size_allocate"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkWidgetClass, size_allocate), @@ -609,7 +609,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_NONE, 1, GDK_TYPE_RECTANGLE | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[STATE_CHANGED] = - g_signal_new ("state_changed", + g_signal_new (I_("state_changed"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkWidgetClass, state_changed), @@ -618,7 +618,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_NONE, 1, GTK_TYPE_STATE_TYPE); widget_signals[PARENT_SET] = - g_signal_new ("parent_set", + g_signal_new (I_("parent_set"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkWidgetClass, parent_set), @@ -627,7 +627,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_NONE, 1, GTK_TYPE_WIDGET); widget_signals[HIERARCHY_CHANGED] = - g_signal_new ("hierarchy_changed", + g_signal_new (I_("hierarchy_changed"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, hierarchy_changed), @@ -646,7 +646,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) * gtk_widget_modify_base() also cause this signal to be emitted. */ widget_signals[STYLE_SET] = - g_signal_new ("style_set", + g_signal_new (I_("style_set"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkWidgetClass, style_set), @@ -655,7 +655,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_NONE, 1, GTK_TYPE_STYLE); widget_signals[DIRECTION_CHANGED] = - g_signal_new ("direction_changed", + g_signal_new (I_("direction_changed"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkWidgetClass, direction_changed), @@ -664,7 +664,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_NONE, 1, GTK_TYPE_TEXT_DIRECTION); widget_signals[GRAB_NOTIFY] = - g_signal_new ("grab_notify", + g_signal_new (I_("grab_notify"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkWidgetClass, grab_notify), @@ -682,7 +682,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) * changed on an object. The signal's detail holds the property name. */ widget_signals[CHILD_NOTIFY] = - g_signal_new ("child_notify", + g_signal_new (I_("child_notify"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE | G_SIGNAL_DETAILED | G_SIGNAL_NO_HOOKS, G_STRUCT_OFFSET (GtkWidgetClass, child_notify), @@ -691,7 +691,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_NONE, 1, G_TYPE_PARAM); widget_signals[MNEMONIC_ACTIVATE] = - g_signal_new ("mnemonic_activate", + g_signal_new (I_("mnemonic_activate"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, mnemonic_activate), @@ -700,7 +700,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_BOOLEAN, 1, G_TYPE_BOOLEAN); widget_signals[GRAB_FOCUS] = - g_signal_new ("grab_focus", + g_signal_new (I_("grab_focus"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkWidgetClass, grab_focus), @@ -708,7 +708,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) _gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); widget_signals[FOCUS] = - g_signal_new ("focus", + g_signal_new (I_("focus"), G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, focus), @@ -717,7 +717,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_BOOLEAN, 1, GTK_TYPE_DIRECTION_TYPE); widget_signals[EVENT] = - g_signal_new ("event", + g_signal_new (I_("event"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, event), @@ -726,7 +726,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[EVENT_AFTER] = - g_signal_new ("event-after", + g_signal_new (I_("event-after"), G_TYPE_FROM_CLASS (gobject_class), 0, 0, @@ -735,7 +735,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_NONE, 1, GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[BUTTON_PRESS_EVENT] = - g_signal_new ("button_press_event", + g_signal_new (I_("button_press_event"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, button_press_event), @@ -744,7 +744,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[BUTTON_RELEASE_EVENT] = - g_signal_new ("button_release_event", + g_signal_new (I_("button_release_event"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, button_release_event), @@ -753,7 +753,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[SCROLL_EVENT] = - g_signal_new ("scroll_event", + g_signal_new (I_("scroll_event"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, scroll_event), @@ -762,7 +762,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[MOTION_NOTIFY_EVENT] = - g_signal_new ("motion_notify_event", + g_signal_new (I_("motion_notify_event"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, motion_notify_event), @@ -786,7 +786,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) * %FALSE to propagate the event further. */ widget_signals[DELETE_EVENT] = - g_signal_new ("delete_event", + g_signal_new (I_("delete_event"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, delete_event), @@ -809,7 +809,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) * %FALSE to propagate the event further. */ widget_signals[DESTROY_EVENT] = - g_signal_new ("destroy_event", + g_signal_new (I_("destroy_event"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, destroy_event), @@ -818,7 +818,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[EXPOSE_EVENT] = - g_signal_new ("expose_event", + g_signal_new (I_("expose_event"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, expose_event), @@ -827,7 +827,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[KEY_PRESS_EVENT] = - g_signal_new ("key_press_event", + g_signal_new (I_("key_press_event"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, key_press_event), @@ -836,7 +836,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[KEY_RELEASE_EVENT] = - g_signal_new ("key_release_event", + g_signal_new (I_("key_release_event"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, key_release_event), @@ -845,7 +845,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[ENTER_NOTIFY_EVENT] = - g_signal_new ("enter_notify_event", + g_signal_new (I_("enter_notify_event"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, enter_notify_event), @@ -854,7 +854,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[LEAVE_NOTIFY_EVENT] = - g_signal_new ("leave_notify_event", + g_signal_new (I_("leave_notify_event"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, leave_notify_event), @@ -863,7 +863,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[CONFIGURE_EVENT] = - g_signal_new ("configure_event", + g_signal_new (I_("configure_event"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, configure_event), @@ -872,7 +872,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[FOCUS_IN_EVENT] = - g_signal_new ("focus_in_event", + g_signal_new (I_("focus_in_event"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, focus_in_event), @@ -881,7 +881,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[FOCUS_OUT_EVENT] = - g_signal_new ("focus_out_event", + g_signal_new (I_("focus_out_event"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, focus_out_event), @@ -890,7 +890,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[MAP_EVENT] = - g_signal_new ("map_event", + g_signal_new (I_("map_event"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, map_event), @@ -899,7 +899,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[UNMAP_EVENT] = - g_signal_new ("unmap_event", + g_signal_new (I_("unmap_event"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, unmap_event), @@ -908,7 +908,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[PROPERTY_NOTIFY_EVENT] = - g_signal_new ("property_notify_event", + g_signal_new (I_("property_notify_event"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, property_notify_event), @@ -917,7 +917,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[SELECTION_CLEAR_EVENT] = - g_signal_new ("selection_clear_event", + g_signal_new (I_("selection_clear_event"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, selection_clear_event), @@ -926,7 +926,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[SELECTION_REQUEST_EVENT] = - g_signal_new ("selection_request_event", + g_signal_new (I_("selection_request_event"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, selection_request_event), @@ -935,7 +935,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[SELECTION_NOTIFY_EVENT] = - g_signal_new ("selection_notify_event", + g_signal_new (I_("selection_notify_event"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, selection_notify_event), @@ -944,7 +944,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[SELECTION_RECEIVED] = - g_signal_new ("selection_received", + g_signal_new (I_("selection_received"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, selection_received), @@ -954,7 +954,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) GTK_TYPE_SELECTION_DATA | G_SIGNAL_TYPE_STATIC_SCOPE, G_TYPE_UINT); widget_signals[SELECTION_GET] = - g_signal_new ("selection_get", + g_signal_new (I_("selection_get"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, selection_get), @@ -965,7 +965,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_UINT, G_TYPE_UINT); widget_signals[PROXIMITY_IN_EVENT] = - g_signal_new ("proximity_in_event", + g_signal_new (I_("proximity_in_event"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, proximity_in_event), @@ -974,7 +974,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[PROXIMITY_OUT_EVENT] = - g_signal_new ("proximity_out_event", + g_signal_new (I_("proximity_out_event"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, proximity_out_event), @@ -994,7 +994,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) * undo highlighting with gtk_drag_unhighlight() */ widget_signals[DRAG_LEAVE] = - g_signal_new ("drag_leave", + g_signal_new (I_("drag_leave"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, drag_leave), @@ -1014,7 +1014,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) * gtk_drag_source_set_icon(). */ widget_signals[DRAG_BEGIN] = - g_signal_new ("drag_begin", + g_signal_new (I_("drag_begin"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, drag_begin), @@ -1032,7 +1032,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) * A typical reason to connect to this signal is to undo things done in ::drag-begin. */ widget_signals[DRAG_END] = - g_signal_new ("drag_end", + g_signal_new (I_("drag_end"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, drag_end), @@ -1052,7 +1052,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) * operation. */ widget_signals[DRAG_DATA_DELETE] = - g_signal_new ("drag_data_delete", + g_signal_new (I_("drag_data_delete"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, drag_data_delete), @@ -1148,7 +1148,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) * </programlisting></informalexample> */ widget_signals[DRAG_MOTION] = - g_signal_new ("drag_motion", + g_signal_new (I_("drag_motion"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, drag_motion), @@ -1179,7 +1179,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) * supported targets. */ widget_signals[DRAG_DROP] = - g_signal_new ("drag_drop", + g_signal_new (I_("drag_drop"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, drag_drop), @@ -1205,7 +1205,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) * gtk_selection_data_set_text(). */ widget_signals[DRAG_DATA_GET] = - g_signal_new ("drag_data_get", + g_signal_new (I_("drag_data_get"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, drag_data_get), @@ -1278,7 +1278,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) * </programlisting></informalexample> */ widget_signals[DRAG_DATA_RECEIVED] = - g_signal_new ("drag_data_received", + g_signal_new (I_("drag_data_received"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, drag_data_received), @@ -1292,7 +1292,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_UINT, G_TYPE_UINT); widget_signals[VISIBILITY_NOTIFY_EVENT] = - g_signal_new ("visibility_notify_event", + g_signal_new (I_("visibility_notify_event"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, visibility_notify_event), @@ -1301,7 +1301,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[CLIENT_EVENT] = - g_signal_new ("client_event", + g_signal_new (I_("client_event"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, client_event), @@ -1310,7 +1310,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[NO_EXPOSE_EVENT] = - g_signal_new ("no_expose_event", + g_signal_new (I_("no_expose_event"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, no_expose_event), @@ -1319,7 +1319,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[WINDOW_STATE_EVENT] = - g_signal_new ("window_state_event", + g_signal_new (I_("window_state_event"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, window_state_event), @@ -1345,7 +1345,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) * Since: 2.8 */ widget_signals[GRAB_BROKEN] = - g_signal_new ("grab_broken_event", + g_signal_new (I_("grab_broken_event"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, grab_broken_event), @@ -1366,7 +1366,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) * example of how to use this signal. */ widget_signals[POPUP_MENU] = - g_signal_new ("popup_menu", + g_signal_new (I_("popup_menu"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkWidgetClass, popup_menu), @@ -1374,7 +1374,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) _gtk_marshal_BOOLEAN__VOID, G_TYPE_BOOLEAN, 0); widget_signals[SHOW_HELP] = - g_signal_new ("show_help", + g_signal_new (I_("show_help"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkWidgetClass, show_help), @@ -1383,7 +1383,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_BOOLEAN, 1, GTK_TYPE_WIDGET_HELP_TYPE); widget_signals[ACCEL_CLOSURES_CHANGED] = - g_signal_new ("accel_closures_changed", + g_signal_new (I_("accel_closures_changed"), G_TYPE_FROM_CLASS (gobject_class), 0, 0, @@ -1391,7 +1391,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) _gtk_marshal_NONE__NONE, G_TYPE_NONE, 0); widget_signals[SCREEN_CHANGED] = - g_signal_new ("screen_changed", + g_signal_new (I_("screen_changed"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, screen_changed), @@ -1412,7 +1412,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) * for determining whether an accelerator can be activated. */ widget_signals[CAN_ACTIVATE_ACCEL] = - g_signal_new ("can_activate_accel", + g_signal_new (I_("can_activate_accel"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWidgetClass, can_activate_accel), @@ -7519,7 +7519,7 @@ gtk_requisition_get_type (void) static GType our_type = 0; if (our_type == 0) - our_type = g_boxed_type_register_static (g_intern_static_string ("GtkRequisition"), + our_type = g_boxed_type_register_static (I_("GtkRequisition"), (GBoxedCopyFunc) gtk_requisition_copy, (GBoxedFreeFunc) gtk_requisition_free); diff --git a/gtk/gtkwindow-decorate.c b/gtk/gtkwindow-decorate.c index 31dddfe3ff..20750b8a50 100644 --- a/gtk/gtkwindow-decorate.c +++ b/gtk/gtkwindow-decorate.c @@ -148,7 +148,7 @@ gtk_decorated_window_init (GtkWindow *window) deco->maximizable = FALSE; deco->real_inner_move = FALSE; - g_object_set_data_full (G_OBJECT (window), g_intern_static_string ("gtk-window-decoration"), deco, + g_object_set_data_full (G_OBJECT (window), I_("gtk-window-decoration"), deco, (GDestroyNotify) gtk_decoration_free); gtk_window_set_has_frame (window, TRUE); diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index c5279a7ec9..904c12c09e 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -317,7 +317,7 @@ gtk_window_get_type (void) (GInstanceInitFunc) gtk_window_init, }; - window_type = g_type_register_static (GTK_TYPE_BIN, g_intern_static_string ("GtkWindow"), + window_type = g_type_register_static (GTK_TYPE_BIN, I_("GtkWindow"), &window_info, 0); } @@ -670,7 +670,7 @@ gtk_window_class_init (GtkWindowClass *klass) GTK_PARAM_READWRITE)); window_signals[SET_FOCUS] = - g_signal_new ("set_focus", + g_signal_new (I_("set_focus"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkWindowClass, set_focus), @@ -680,7 +680,7 @@ gtk_window_class_init (GtkWindowClass *klass) GTK_TYPE_WIDGET); window_signals[FRAME_EVENT] = - g_signal_new ("frame_event", + g_signal_new (I_("frame_event"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET(GtkWindowClass, frame_event), @@ -690,7 +690,7 @@ gtk_window_class_init (GtkWindowClass *klass) GDK_TYPE_EVENT); window_signals[ACTIVATE_FOCUS] = - g_signal_new ("activate_focus", + g_signal_new (I_("activate_focus"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkWindowClass, activate_focus), @@ -700,7 +700,7 @@ gtk_window_class_init (GtkWindowClass *klass) 0); window_signals[ACTIVATE_DEFAULT] = - g_signal_new ("activate_default", + g_signal_new (I_("activate_default"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkWindowClass, activate_default), @@ -710,7 +710,7 @@ gtk_window_class_init (GtkWindowClass *klass) 0); window_signals[MOVE_FOCUS] = - g_signal_new ("move_focus", + g_signal_new (I_("move_focus"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GtkWindowClass, move_focus), @@ -721,7 +721,7 @@ gtk_window_class_init (GtkWindowClass *klass) GTK_TYPE_DIRECTION_TYPE); window_signals[KEYS_CHANGED] = - g_signal_new ("keys_changed", + g_signal_new (I_("keys_changed"), G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkWindowClass, keys_changed), @@ -1731,7 +1731,7 @@ gtk_window_add_embedded_xid (GtkWindow *window, guint xid) embedded_windows = g_list_prepend (embedded_windows, GUINT_TO_POINTER (xid)); - g_object_set_data_full (G_OBJECT (window), g_intern_static_string ("gtk-embedded"), + g_object_set_data_full (G_OBJECT (window), I_("gtk-embedded"), embedded_windows, embedded_windows ? (GDestroyNotify) g_list_free : NULL); @@ -1757,7 +1757,7 @@ gtk_window_remove_embedded_xid (GtkWindow *window, guint xid) g_list_free_1 (node); } - g_object_set_data_full (G_OBJECT (window), g_intern_static_string ("gtk-embedded"), + g_object_set_data_full (G_OBJECT (window), I_("gtk-embedded"), embedded_windows, embedded_windows ? (GDestroyNotify) g_list_free : NULL); @@ -2558,7 +2558,7 @@ ensure_icon_info (GtkWindow *window) { info = g_new0 (GtkWindowIconInfo, 1); g_object_set_data_full (G_OBJECT (window), - g_intern_static_string ("gtk-window-icon-info"), + I_("gtk-window-icon-info"), info, (GDestroyNotify)free_icon_info); } @@ -2580,7 +2580,7 @@ get_screen_icon_info (GdkScreen *screen) if (!info) { info = g_new0 (ScreenIconInfo, 1); - g_object_set_data (G_OBJECT (screen), g_intern_static_string ("gtk-window-default-icon-pixmap"), info); + g_object_set_data (G_OBJECT (screen), I_("gtk-window-default-icon-pixmap"), info); } if (info->serial != default_icon_serial) @@ -6940,7 +6940,7 @@ gtk_window_group_get_type (void) (GInstanceInitFunc) NULL, }; - window_group_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkWindowGroup"), + window_group_type = g_type_register_static (G_TYPE_OBJECT, I_("GtkWindowGroup"), &window_group_info, 0); } @@ -7523,7 +7523,7 @@ gtk_window_get_key_hash (GtkWindow *window) key_hash = _gtk_key_hash_new (gdk_keymap_get_for_display (gdk_screen_get_display (screen)), (GDestroyNotify)g_free); _gtk_window_keys_foreach (window, add_to_key_hash, key_hash); - g_object_set_data (G_OBJECT (window), g_intern_static_string ("gtk-window-key-hash"), key_hash); + g_object_set_data (G_OBJECT (window), I_("gtk-window-key-hash"), key_hash); return key_hash; } |