AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Intern some more strings.

Browse Source 
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().
This commit is contained in:
Matthias Clasen 2005-09-01 05:11:46 +00:00 committed by Matthias Clasen
parent f4bbe8f0de
commit 94eec04267
185 changed files with 798 additions and 698 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -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().

12
ChangeLog.pre-2-10
View File

@ -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().

2
configure.in
View File

@ -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])

2
gdk/gdkdisplay.c
View File

@ -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),

2
gdk/gdkdisplaymanager.c
View File

@ -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),

6
gdk/gdkpango.c
View File

@ -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",

8
gdk/gdkscreen.c
View File

@ -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),

2
gdk/x11/gdkscreen-x11.c
View File

@ -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),

12
gtk/gtkaboutdialog.c
View File

@ -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

6
gtk/gtkaccelgroup.c
View File

@ -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),

2
gtk/gtkaccellabel.c
View File

@ -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);
}

3
gtk/gtkaccelmap.c
View File

@ -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,

3
gtk/gtkaccessible.c
View File

@ -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);
}

8
gtk/gtkaction.c
View File

@ -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,

10
gtk/gtkactiongroup.c
View File

@ -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,

6
gtk/gtkadjustment.c
View File

@ -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),

2
gtk/gtkalignment.c
View File

@ -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);
}

2
gtk/gtkarrow.c
View File

@ -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);
}

2
gtk/gtkaspectframe.c
View File

@ -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);
}

2
gtk/gtkbbox.c
View File

@ -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);
}

3
gtk/gtkbin.c
View File

@ -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);
}

3
gtk/gtkbindings.c
View File

@ -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);
}

2
gtk/gtkbox.c
View File

@ -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);
}

16
gtk/gtkbutton.c
View File

@ -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));

16
gtk/gtkcalendar.c
View File

@ -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));
}

7
gtk/gtkcelleditable.c
View File

@ -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),

3
gtk/gtkcelllayout.c
View File

@ -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);

6
gtk/gtkcellrenderer.c
View File

@ -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),

2
gtk/gtkcellrenderercombo.c
View File

@ -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);

2
gtk/gtkcellrendererpixbuf.c
View File

@ -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);
}

6
gtk/gtkcellrenderertext.c
View File

@ -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);

4
gtk/gtkcellrenderertoggle.c
View File

@ -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),

2
gtk/gtkcellview.c
View File

@ -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,

2
gtk/gtkcheckbutton.c
View File

@ -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);
}

4
gtk/gtkcheckmenuitem.c
View File

@ -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),

13
gtk/gtkclipboard.c
View File

@ -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);

39
gtk/gtkclist.c
View File

@ -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,

4
gtk/gtkcolorbutton.c
View File

@ -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),

26
gtk/gtkcolorsel.c
View File

@ -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,

2
gtk/gtkcolorseldialog.c
View File

@ -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);
}

6
gtk/gtkcombo.c
View File

@ -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);
}

8
gtk/gtkcombobox.c
View File

@ -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);
}

2
gtk/gtkcomboboxentry.c
View File

@ -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);
}

16
gtk/gtkcontainer.c
View File

@ -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;

15
gtk/gtkctree.c
View File

@ -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,

4
gtk/gtkcurve.c
View File

@ -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),

8
gtk/gtkdialog.c
View File

@ -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);
}

25
gtk/gtkdnd.c
View File

@ -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);

3
gtk/gtkdrawingarea.c
View File

@ -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);
}

9
gtk/gtkeditable.c
View File

@ -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),

28
gtk/gtkentry.c
View File

@ -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);
}
/**

8
gtk/gtkentrycompletion.c
View File

@ -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),

2
gtk/gtkeventbox.c
View File

@ -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);
}

4
gtk/gtkexpander.c
View File

@ -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),

12
gtk/gtkfilechooser.c
View File

@ -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),

12
gtk/gtkfilechooserdefault.c
View File

@ -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);

3
gtk/gtkfilechooserdialog.c
View File

@ -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,

7
gtk/gtkfilechooserembed.c
View File

@ -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),

3
gtk/gtkfilechooserentry.c
View File

@ -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,

3
gtk/gtkfilechooserutils.c
View File

@ -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",

3
gtk/gtkfilechooserwidget.c
View File

@ -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,

3
gtk/gtkfilefilter.c
View File

@ -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);
}

4
gtk/gtkfilesel.c
View File

@ -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,

23
gtk/gtkfilesystem.c
View File

@ -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);

6
gtk/gtkfilesystemmodel.c
View File

@ -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)

8
gtk/gtkfilesystemunix.c
View File

@ -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,

4
gtk/gtkfilesystemwin32.c
View File

@ -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,

2
gtk/gtkfixed.c
View File

@ -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);
}

4
gtk/gtkfontbutton.c
View File

@ -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),

4
gtk/gtkfontsel.c
View File

@ -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);
}

2
gtk/gtkframe.c
View File

@ -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);
}

6
gtk/gtkgamma.c
View File

@ -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",

3
gtk/gtkgc.c
View File

@ -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);
}

6
gtk/gtkhandlebox.c
View File

@ -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),

3
gtk/gtkhbbox.c
View File

@ -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);
}

3
gtk/gtkhbox.c
View File

@ -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);
}

3
gtk/gtkhpaned.c
View File

@ -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);
}

3
gtk/gtkhruler.c
View File

@ -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);
}

2
gtk/gtkhscale.c
View File

@ -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);
}

2
gtk/gtkhscrollbar.c
View File

@ -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);
}

3
gtk/gtkhseparator.c
View File

@ -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);
}

7
gtk/gtkhsv.c
View File

@ -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),

4
gtk/gtkiconfactory.c
View File

@ -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);

10
gtk/gtkicontheme.c
View File

@ -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);

53
gtk/gtkiconview.c
View File

@ -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_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_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,

2
gtk/gtkimage.c
View File

@ -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);
}

4
gtk/gtkimagemenuitem.c
View File

@ -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));

19
gtk/gtkimcontext.c
View File

@ -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;

3
gtk/gtkimcontextsimple.c
View File

@ -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);
}

2
gtk/gtkimmodule.c
View File

@ -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);
}

4
gtk/gtkimmulticontext.c
View File

@ -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);

6
gtk/gtkinputdialog.c
View File

@ -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),

3
gtk/gtkintl.h
View File

@ -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

2
gtk/gtkinvisible.c
View File

@ -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);
}

9
gtk/gtkitem.c
View File

@ -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),

3
gtk/gtkitemfactory.c
View File

@ -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);
}

14
gtk/gtklabel.c
View File

@ -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);

4
gtk/gtklayout.c
View File

@ -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),

9
gtk/gtklist.c
View File

@ -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),

23
gtk/gtklistitem.c
View File

@ -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),

Some files were not shown because too many files have changed in this diff Show More