]> Pileus Git - ~andy/gtk/commitdiff
Intern some more strings.
authorMatthias Clasen <mclasen@redhat.com>
Thu, 1 Sep 2005 05:11:46 +0000 (05:11 +0000)
committerMatthias Clasen <matthiasc@src.gnome.org>
Thu, 1 Sep 2005 05:11:46 +0000 (05:11 +0000)
2005-09-01  Matthias Clasen  <mclasen@redhat.com>

        * gdk/*.c: Intern some more strings.
        * gtk/gtkintl.h:
        * gtk/*.c: Define an I_() macro and use it instead of the
        bulky g_intern_static_string().

185 files changed:
ChangeLog
ChangeLog.pre-2-10
configure.in
gdk/gdkdisplay.c
gdk/gdkdisplaymanager.c
gdk/gdkpango.c
gdk/gdkscreen.c
gdk/x11/gdkscreen-x11.c
gtk/gtkaboutdialog.c
gtk/gtkaccelgroup.c
gtk/gtkaccellabel.c
gtk/gtkaccelmap.c
gtk/gtkaccessible.c
gtk/gtkaction.c
gtk/gtkactiongroup.c
gtk/gtkadjustment.c
gtk/gtkalignment.c
gtk/gtkarrow.c
gtk/gtkaspectframe.c
gtk/gtkbbox.c
gtk/gtkbin.c
gtk/gtkbindings.c
gtk/gtkbox.c
gtk/gtkbutton.c
gtk/gtkcalendar.c
gtk/gtkcelleditable.c
gtk/gtkcelllayout.c
gtk/gtkcellrenderer.c
gtk/gtkcellrenderercombo.c
gtk/gtkcellrendererpixbuf.c
gtk/gtkcellrenderertext.c
gtk/gtkcellrenderertoggle.c
gtk/gtkcellview.c
gtk/gtkcheckbutton.c
gtk/gtkcheckmenuitem.c
gtk/gtkclipboard.c
gtk/gtkclist.c
gtk/gtkcolorbutton.c
gtk/gtkcolorsel.c
gtk/gtkcolorseldialog.c
gtk/gtkcombo.c
gtk/gtkcombobox.c
gtk/gtkcomboboxentry.c
gtk/gtkcontainer.c
gtk/gtkctree.c
gtk/gtkcurve.c
gtk/gtkdialog.c
gtk/gtkdnd.c
gtk/gtkdrawingarea.c
gtk/gtkeditable.c
gtk/gtkentry.c
gtk/gtkentrycompletion.c
gtk/gtkeventbox.c
gtk/gtkexpander.c
gtk/gtkfilechooser.c
gtk/gtkfilechooserdefault.c
gtk/gtkfilechooserdialog.c
gtk/gtkfilechooserembed.c
gtk/gtkfilechooserentry.c
gtk/gtkfilechooserutils.c
gtk/gtkfilechooserwidget.c
gtk/gtkfilefilter.c
gtk/gtkfilesel.c
gtk/gtkfilesystem.c
gtk/gtkfilesystemmodel.c
gtk/gtkfilesystemunix.c
gtk/gtkfilesystemwin32.c
gtk/gtkfixed.c
gtk/gtkfontbutton.c
gtk/gtkfontsel.c
gtk/gtkframe.c
gtk/gtkgamma.c
gtk/gtkgc.c
gtk/gtkhandlebox.c
gtk/gtkhbbox.c
gtk/gtkhbox.c
gtk/gtkhpaned.c
gtk/gtkhruler.c
gtk/gtkhscale.c
gtk/gtkhscrollbar.c
gtk/gtkhseparator.c
gtk/gtkhsv.c
gtk/gtkiconfactory.c
gtk/gtkicontheme.c
gtk/gtkiconview.c
gtk/gtkimage.c
gtk/gtkimagemenuitem.c
gtk/gtkimcontext.c
gtk/gtkimcontextsimple.c
gtk/gtkimmodule.c
gtk/gtkimmulticontext.c
gtk/gtkinputdialog.c
gtk/gtkintl.h
gtk/gtkinvisible.c
gtk/gtkitem.c
gtk/gtkitemfactory.c
gtk/gtklabel.c
gtk/gtklayout.c
gtk/gtklist.c
gtk/gtklistitem.c
gtk/gtkliststore.c
gtk/gtkmenu.c
gtk/gtkmenubar.c
gtk/gtkmenuitem.c
gtk/gtkmenushell.c
gtk/gtkmenutoolbutton.c
gtk/gtkmessagedialog.c
gtk/gtkmisc.c
gtk/gtkmodules.c
gtk/gtknotebook.c
gtk/gtkobject.c
gtk/gtkoldeditable.c
gtk/gtkoptionmenu.c
gtk/gtkpaned.c
gtk/gtkpathbar.c
gtk/gtkpixmap.c
gtk/gtkplug.c
gtk/gtkpreview.c
gtk/gtkprogress.c
gtk/gtkprogressbar.c
gtk/gtkradioaction.c
gtk/gtkradiobutton.c
gtk/gtkradiomenuitem.c
gtk/gtkradiotoolbutton.c
gtk/gtkrange.c
gtk/gtkrc.c
gtk/gtkruler.c
gtk/gtkscale.c
gtk/gtkscrollbar.c
gtk/gtkscrolledwindow.c
gtk/gtkselection.c
gtk/gtkseparator.c
gtk/gtkseparatortoolitem.c
gtk/gtksettings.c
gtk/gtksizegroup.c
gtk/gtksocket.c
gtk/gtkspinbutton.c
gtk/gtkstatusbar.c
gtk/gtkstatusicon.c
gtk/gtkstyle.c
gtk/gtktable.c
gtk/gtktearoffmenuitem.c
gtk/gtktext.c
gtk/gtktextbuffer.c
gtk/gtktextchild.c
gtk/gtktextdisplay.c
gtk/gtktextlayout.c
gtk/gtktextmark.c
gtk/gtktexttag.c
gtk/gtktexttagtable.c
gtk/gtktextutil.c
gtk/gtktextview.c
gtk/gtkthemes.c
gtk/gtktipsquery.c
gtk/gtktoggleaction.c
gtk/gtktogglebutton.c
gtk/gtktoggletoolbutton.c
gtk/gtktoolbar.c
gtk/gtktoolbutton.c
gtk/gtktoolitem.c
gtk/gtktooltips.c
gtk/gtktree.c
gtk/gtktreednd.c
gtk/gtktreeitem.c
gtk/gtktreemodel.c
gtk/gtktreemodelfilter.c
gtk/gtktreemodelsort.c
gtk/gtktreeselection.c
gtk/gtktreesortable.c
gtk/gtktreestore.c
gtk/gtktreeview.c
gtk/gtktreeviewcolumn.c
gtk/gtktypeutils.c
gtk/gtkuimanager.c
gtk/gtkvbbox.c
gtk/gtkvbox.c
gtk/gtkviewport.c
gtk/gtkvpaned.c
gtk/gtkvruler.c
gtk/gtkvscale.c
gtk/gtkvscrollbar.c
gtk/gtkvseparator.c
gtk/gtkwidget.c
gtk/gtkwindow-decorate.c
gtk/gtkwindow.c

index fcaa747507a32316084adedbd22f23b96c161857..d705b2c430c9a8501f23fce49f0857845c3cfa56 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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().
 
index fcaa747507a32316084adedbd22f23b96c161857..d705b2c430c9a8501f23fce49f0857845c3cfa56 100644 (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().
 
index 9647faa7041842c17db7cd48e457a8914e60ded3..fb5dfb58510575d73a4e871f74f6266d7218f92b 100644 (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])
index 986fcdf25db330879cce740578553c401cb860ca..f11e35672af501bff83f5af22be55c0967f7ab59 100644 (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),
index ca603624ea342b4492cb4ac41e4994bfacfa8a47..b506472281e5fe8a158cb6a2672622f8a98c6088 100644 (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),
index 4ddec897c582e46446bb69518b115b081c7cd1e6..809f1c3f1b56b6ae171fbad3cffae7d568e35128 100644 (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",
index 94c4f96eb72cfe3597e7d52deea2c05149860856..9493e8e7f86cd9b2f09ed9de72443060f88097bd 100644 (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),
index 7f2a2a5a38506e032ee30633c50c0095d79e8215..9ec43e3be4e024587830613dfd6b0095fe8ee624 100644 (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),
index c1cfb59bc532087778f1e2bebbed16264d950b61..a5cbe6e423e58dbaaf053da4bc3cc758a9639c28 100644 (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 
index 4ca34fd8336c5e30e66e69993759e13fabc21db6..d7324d4e5acb6cf589a4e2ef4328321ef13fd2a2 100644 (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),
index ffd8056f3a5eeb5fcc833858c2238350c90b95dd..fd159c34ba4e7f17c2b43cdd8bec6a2d2db308f3 100644 (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);
     }
   
index 7b9d049ce13f8667d7436c0b1b9f63a33e5cdb5b..98150ed22159ddc77a4b4cdc1737cdccff092ef9 100644 (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,
index e39d382f1201e3eeff4e8834dc77109fd4b057a5..d6cb43cbdbc0ef1877704b90d03c77bb024f5938 100644 (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);
     }
 
index c4f67d1e500246a516ad2adbbd34d13a8b412d87..6665d893e2aafc0580afa46542ca8410eb1d5345 100644 (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,
index 2554dc0d08a5c35960de1fee8085216ac254ef52..7910644d6010d318463a0c6bab6a3d6d91f332d0 100644 (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,
index bc5f8064b2ebe8b1932b6fbd35c9ab23223ae8a9..6f31797baef6fe0ec1464b1c6827045b846cd218 100644 (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),
index ec00ac58620d5fda38a74caebc5c5c87f4fe6ec9..0248ca285a752e77f2e21667f4b4c72128b57ffa 100644 (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);
     }
 
index 60f3723c3ce619268e640052451a14e8e1aed3fd..6635816df2258feee60ec85d93c109ec70e2ec8b 100644 (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);
     }
 
index 59fb04282397efcf3ce184e7aff1825ec34c995e..f15ccec17c51d148dedca7399c6ce41d64f077eb 100644 (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);
     }
   
index 088a2be40741a6565c5f0eeaad44ba26a7f2a330..f30656a7737dc571551beeee277d9225df8caf55 100644 (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);
     }
 
index 073c90956643bbcd5ede2ed22adfe38adb739f3b..a1a8bf1311c7def614d14f29e4d87422285d6c4b 100644 (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);
     }
 
index 7127d4d506f18ce984e3cf61f7abf25f67ff8cdb..46a786f496f71b44a4b10ccb10d1570c6d98ae33 100644 (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);
 }
 
index a70ccd7dfb4c9078e3925f07e3517365397b3c9d..1ddabd2160f2caa5b880f88cbae5111eab668bb9 100644 (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);
     }
 
index 8e7db584b35474bcffaa253741aee2a4c458aea3..fe7e5294044a73ee44b94c89f68b99f1dc4facde 100644 (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));
index 1b4b03d927dce93cceafeaf35811ed29224362e7..f1ecd1d48041cf37b61aad7b1356b0f3ab524b86 100644 (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));
 }
 
index 7400ec77582c8795c637ecf083fc799e5c7f4edf..e35b5c7672ef7af777022025293184ecfdadf388 100644 (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),
index f39bf9d68c74aea8b2f385281f46a8680e923d45..1fb7232aeee6be3f7598806619fc590236734277 100644 (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);
index 4df4c4c23c0cbc5e69047957a1ea5017eb89e968..3f4d52e3bf25343c1b0a24ce2b38ad2dfe97a4a3 100644 (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),
index c47cc3360cda7f72b96fd8183c9997241ecccd12..b34bb058ca8a76a97eb8e8df332acdffab052a61 100644 (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);
index 0aad2d8aabd9b6194e1db418d26611459c81a9e5..dfdb59fef4ff9d665cca9fb1054ef66c58fe7b49 100644 (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);
     }
 
index 0c090b3e40067c4deecea395cd40d601956a3081..5c1434b05d1d1414ffe56ab378322e91cfa010bb 100644 (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);
   
index 3ccd6f867e6e4ce90ed01a33382d3bd3acb4f3b9..6cec1480352f2fbb1e8a97d07b940c8c2f2de0cc 100644 (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),
index 047fbc794ecb3a66616be5af07770b0af0c26ce7..0df21966e489daca34c7dd5a450bc6a0a1115514 100644 (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,
index 2ee76f97c783504c95871d2d975b70bb509085df..a65772c8905c85c5ecd2ef95b51abbaad3b62304 100644 (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);
     }
   
index 91788ab467d4f8faecc2a1f73c182bc57a4a2a36..9c8ef0f27567aa494128de5c85c26f732ee44bd3 100644 (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),
index fd8790ce017b5094d0247b215e7f1ac991d6d5cc..d30c0ea454cd20e40587395029383134a26aab5c 100644 (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);
index 883939c2892e6127e7f3c5cfb69f88f91b5dde2f..93c9ee3bbd1dc7c8ea567137bbec9ef7aee2fbb9 100644 (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,
index 38779da3cb9d4c929706e54b573ce4ae88a2d219..b5096439810d8ab82b9ee3f4034956ad52176400 100644 (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),
index 1617bf9c9ee2ae7266fa4c2750e1ce18bb3b6dda..a1b6c717fb2774555392a5df82f716c4e5ab2842 100644 (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,
index f008c29768d38484685d44ca49d6868d3e9d61f3..97a84fff560e982f59752ffebd2468d68f018f80 100644 (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);
     }
   
index e7963f9609a26ca656590051771ff8b80b0dc327..c614e8ec86274f8bd28ec371d4571e89b6b651fe 100644 (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);
 }
 
index 8c9b87cf53e5f44b6609d94f628c02d227ce2a6e..0fc95250a07194a69fa9872a6fd42b80518c21c3 100644 (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);
     }
index 01d5e4c03fb3c5be922dba5c1fd318f5a952dcca..5ce651e032ebc0705a13ab3da526988e3a06bb94 100644 (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);
     }
index a92a5291e432c2be118cbeaf141fb90d4f541992..a02d16539c2a68b3f2afcd6670c58092f3c8d44c 100644 (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;
index c96dbd3b648e10c0c53d0535f9dad824490511d3..72376fd96ee84e654f9c4461e45dded954a8d8c5 100644 (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,
index bb61d39ec57cc0a51a4e59d4f17ccfface04a2f3..c96c3658d9a70268a51b0f5357e93a9e0ba418ee 100644 (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),
index f16e6cde8031969ebf5c6f7038ec4dd15ab60ea1..59a5a30f982cca6ca7e06d6b72ac6529337857c3 100644 (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);
     }
index c4611f496e37d9c445090921bf99b8d4c0d260e5..1ab4bf720549a488266cce64dc0d9c857b104167 100644 (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);
 
index bd4b68a62a36e2d9a29122420b788607cff860c9..992ebcf550658db579ebc3c57e4ccd6a9771ece9 100644 (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);
     }
 
index 53a40f70cc7a68cf7aa767e528542f2207c08cf7..6a2f6c77ea8de2e659f74c86e559148bacd30404 100644 (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),
index 9b8be65477cd1d6cbf2324c23e059ad24f87f327..5520e5244878d602cc721a46623a84258f947207 100644 (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);
 }
 
 /**
index f2857a7b2ec842cf648bf5bf92522bbb36e9068b..9b558e8b1b6a5e36645e5dc4cc12bdfe01d0fbd7 100644 (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),
index a534d7be04136b5121dea9d03afa34d03b0ee8e5..fd7e90cdf743e5cc4f64139ff4806f725a8a066c 100644 (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);
     }
 
index 23cd1fa139fb68f86653986c4443d1e203806321..45208679a24d8f25ce76ae1efbb717aa64a8a13f 100644 (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),
index c662e43da98f6638716b32f6cd2c5b9911161553..6c3f36880ad88c2b4a027d49a5cbca8c3900e62c 100644 (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),
index 45e4a74c43728940f2e1e2201e4cae06e837aa95..49dd51668f93dfadf51b095736659c04a25e4efa 100644 (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);
index 3377d30d8c105ce2442b5587593b410dea925923..d84f0ba3e333e2e5a7155a170f220e5b45291f47 100644 (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,
index 8fc3719809ea3b355d8806d4a2f7b58c220f198c..1f584a3d8702cce499a64171d7bbdbf18c64dab6 100644 (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),
index 02dcd4081d03b35d721834d0780559eb795848b0..6894c6c4a727d482904601790c745a135d4dd35e 100644 (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,
index 40bdd1a07f0b8e1db7a47daab5be88423a5bdc72..cbdf713769c1081a128fbab6746e79d0acea2bfe 100644 (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",
index d6dd6696dca6071a9936d712b637ed88a2b96a30..645b0b0d57f876034182382675bedbaa2f6381e7 100644 (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,
index e45900f330f8ba30037bf62933a3fb6c074dec9c..80d1ffb7445be4fc7729b70c8c608e548b53775a 100644 (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);
     }
 
index 8cfe382b1abd9df9bff419398b53ecf69e4c54a4..c982ec3369e7f6a44f0a185a35862fa4a993f790 100644 (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, 
index f23d9f38660c95893cfa61066c9b31f403373dd6..268bfad1dd7f3c28e91739a92a32770534eff018 100644 (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);
 
index 7d37afb3df4a4585559951a440242b248b857d46..3dbbe34b1c364fb0fc24a11c5794230bf693f937 100644 (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)
index 1c3abcdeb5df32e09c289b35379fecae1e83cf27..89c22d470d8cd634a8254297589f46a8ea166808 100644 (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,
index d5c7674a7339a6d1689909ace1f7cd4e3bdf71b4..523159491d14cadd29ad7dfdbecb66c5161f1d52 100644 (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,
index 0fbcfdfa202c9268f9ea284b99a965c4650f26c6..d98cb04a60e222f1b8924ecec5da216585223497 100644 (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);
     }
 
index 4e437ed217c5804751a55a67128e5ab5410d1a6c..c9cd587db3279e223886d10a1eac47f18bfe3528 100644 (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),
index 1a752e72daf7e3f5f4e8a8efc2ec589b0ba05eb1..4b5008950019423563651c6f9eb7ff954873f937 100644 (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);
     }
   
index 7dcee079d0fab692754c3073adf02dc27c92291b..460a53db745a85dafc45693ace2b514af9053c87 100644 (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);
     }
 
index 65aba0f6b897e60270f7d8308ce86cda1d2166b7..0cb5f2a6b4d992c108781bd3c8b7fb0063cf9b52 100644 (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",
index b53bcaaedf5fd1532ff0b9432e35a55dc3443175..4073ed384a7b67e292e7e77d89a3b8136e93fc16 100644 (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);
     }
   
index 4e506fb12c8ac96581f5e9846b5f7bbada0730ac..884930c9fe0b7279da453e66b984b1917a11744c 100644 (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),
index 9469f6c374d2a03096004de9f5d8f1d2c010602a..3dda89c16fd430ca632b903e61ca354ee4ce3911 100644 (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);
     }
 
index 3095f95d8c7e26d087c928f00b1e55fad0f10976..4c610bee2aa03b88db328440f6db5472ca988136 100644 (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);
     }
 
index 90ec3b689fc6ebf33b0e722a6ac911334e60dae8..34eb3c0711488b954770dbf704d9b3c537266ce0 100644 (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);
     }
 
index f25af4240740e16974788e61c715233e034f9e7f..2dc5aba9d1361e2c55dbaa47f045af2f59d1bc3b 100644 (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);
     }
 
index 1781b2c4e8355d327e99665d79d6d7861ec8ad68..597ed8ef1006e2ab1577299d60f01bbbc22b0f8c 100644 (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);
     }
   
index 23147f7f7a279235e08d671273e350a0c7751aa0..d67f8ad3c6ba0524c9abb08ee1bf5fd6662655ff 100644 (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);
     }
   
index 18c9c37b57868130669498b8bdf26a340bc2419e..80b6a991f1480584552b360617ec82d5b0325f06 100644 (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);
     }
 
index a23bbd2f1489b7b66d5d24649068973d84ec5a30..3b4a16f1d63ec603bcc9c591664118cbcc2f4691 100644 (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),
index f600284ccbb4fff1cfa492c3a05e1b373109cdc5..26ee7dc1f337b8cba2d697920352148626bf05cf 100644 (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);
 
index 299b02900c51b6fe5058523f94fb0c11bffa99cc..3dcc0b8bea338742f504468f23b99092c189cc48 100644 (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);
 
index 6d1b962d57fd24242f929689613c60dfb9ca5106..bc88d13dbffc967616c6c75d2dcf0cd8248af1e9 100644 (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_space, 0, "activate_cursor_item", 0);
-  gtk_binding_entry_add_signal (binding_set, GDK_Return, 0, "activate_cursor_item", 0);
-  gtk_binding_entry_add_signal (binding_set, GDK_ISO_Enter, 0, "activate_cursor_item", 0);
-  gtk_binding_entry_add_signal (binding_set, GDK_KP_Enter, 0, "activate_cursor_item", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK, 
+                               "select_all", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK | GDK_SHIFT_MASK, 
+                               "unselect_all", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_space, GDK_CONTROL_MASK, 
+                               "toggle_cursor_item", 0);
+
+  gtk_binding_entry_add_signal (binding_set, GDK_space, 0, 
+                               "activate_cursor_item", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_Return, 0, 
+                               "activate_cursor_item", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_ISO_Enter, 0, 
+                               "activate_cursor_item", 0);
+  gtk_binding_entry_add_signal (binding_set, GDK_KP_Enter, 0, 
+                               "activate_cursor_item", 0);
 
   gtk_icon_view_add_move_binding (binding_set, GDK_Up, 0,
                                  GTK_MOVEMENT_DISPLAY_LINES, -1);
@@ -3411,7 +3418,7 @@ gtk_icon_view_add_move_binding (GtkBindingSet  *binding_set,
 {
   
   gtk_binding_entry_add_signal (binding_set, keyval, modmask,
-                                "move_cursor", 2,
+                                I_("move_cursor"), 2,
                                 G_TYPE_ENUM, step,
                                 G_TYPE_INT, count);
 
@@ -5579,7 +5586,7 @@ set_status_pending (GdkDragContext *context,
                     GdkDragAction   suggested_action)
 {
   g_object_set_data (G_OBJECT (context),
-                     g_intern_static_string ("gtk-icon-view-status-pending"),
+                     I_("gtk-icon-view-status-pending"),
                      GINT_TO_POINTER (suggested_action));
 }
 
@@ -5627,12 +5634,12 @@ set_source_row (GdkDragContext *context,
 {
   if (source_row)
     g_object_set_data_full (G_OBJECT (context),
-                           g_intern_static_string ("gtk-icon-view-source-row"),
+                           I_("gtk-icon-view-source-row"),
                            gtk_tree_row_reference_new (model, source_row),
                            (GDestroyNotify) gtk_tree_row_reference_free);
   else
     g_object_set_data_full (G_OBJECT (context),
-                           g_intern_static_string ("gtk-icon-view-source-row"),
+                           I_("gtk-icon-view-source-row"),
                            NULL, NULL);
 }
 
@@ -5677,7 +5684,7 @@ set_dest_row (GdkDragContext *context,
   if (!dest_row)
     {
       g_object_set_data_full (G_OBJECT (context),
-                             g_intern_static_string ("gtk-icon-view-dest-row"),
+                             I_("gtk-icon-view-dest-row"),
                              NULL, NULL);
       return;
     }
@@ -5688,7 +5695,7 @@ set_dest_row (GdkDragContext *context,
   dr->empty_view_drop = empty_view_drop;
   dr->drop_append_mode = drop_append_mode;
   g_object_set_data_full (G_OBJECT (context),
-                          g_intern_static_string ("gtk-icon-view-dest-row"),
+                          I_("gtk-icon-view-dest-row"),
                           dr, (GDestroyNotify) dest_row_free);
 }
 
@@ -8058,7 +8065,7 @@ gtk_icon_view_item_accessible_get_type (void)
       };
 
       type = g_type_register_static (ATK_TYPE_OBJECT,
-                                     g_intern_static_string ("GtkIconViewItemAccessible"), &tinfo, 0);
+                                     I_("GtkIconViewItemAccessible"), &tinfo, 0);
       g_type_add_interface_static (type, ATK_TYPE_COMPONENT,
                                    &atk_component_info);
       g_type_add_interface_static (type, ATK_TYPE_ACTION,
index 902dadb31326ca38c364ebf98b47d786d39722a3..37be14a66767865b260ee15e8595e72052b93302 100644 (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);
     }
 
index 8e75ca9082ec6ef2194391ce53ae500be8f5e886..7e62c6f4a22e9c44fa4b6427a7f8937f3667ef35 100644 (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));
index 8a0d50428e58697bebb7965f91adce2cf33ffbed..43662003f3da4711cf98cc33f9b58dab7573adb6 100644 (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;
index 05c5841287abc08ab76c1512645645acbdb458d9..26f0d4dd18165ff65e739adf4376dc4ba6c36311 100644 (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);
     }
 
index 26ace6d6e9ee8abacd08d7377dee606c785b655a..977ff4bfa55364b74b81456e3289b23a3f6782c0 100644 (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);
     }
   
index 96934f9d97f538f9ed9e31b19a9a3d46823d7ca6..b1062af9e3724911327ac66887106d0f1ba883de 100644 (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);
index e0b63f6eec9fd444a5cc81b53cdc2a31fc1b4222..447a0798a37d80aefedae23cac09c311e90961f2 100644 (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),
index d29723bb9272bf5568599dd5aafce2dea299c616..3e03c69ce92703ce733a4091d123ae383bab51ee 100644 (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
index 08fbbc6363e5cf862f4dfa08206912f8bde36bcf..954e9b1f4ab11c8cd3a846efbfbb2431290cf838 100644 (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);
     }
 
index 34193e7e3978c9eb045e83b137552072d230e3e3..38a47580f6abf6418869cf33a598dd4838c5fd09 100644 (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),
index 21c0c06fe59bb112195efec6f75921df666ec1cb..4aac44d5e1b7f535c792a21ba357704251eba1a3 100644 (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);
     }
   
index 71c8aa16df4cf849af0b87bcf9daaba496c45bdd..5fb3beeb326984e9ebf217765fbba5eafdc2c088 100644 (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);
 
index 5cdfd153134e831edf50ae6de71144d60416007c..52b1689d36db0a84cf9e1a4d658ab2ee69a12392 100644 (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),
index 1fb46a5bc35f82f897ce7c3ad0a0359f709324ca..a1b8be585fb330eff7b8eaf2c9d0a8ca42d28eca 100644 (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),
index 1c841950da8d74b71c7204300e3ddcbdd560f2d3..4d3de9f7a693b4bc13a66b32f6620ca16160a84c 100644 (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),
index 2e64b2e7bb80ca2d1e6449eed219f59d083a91d9..29d28fbc3bd88e5cda179e970d1cea87229b8ef1 100644 (file)
@@ -25,6 +25,7 @@
 #include "gtktreedatalist.h"
 #include "gtktreednd.h"
 #include "gtksequence.h"
+#include "gtkintl.h"
 #include "gtkalias.h"
 
 #define GTK_LIST_STORE_IS_SORTED(list) (GTK_LIST_STORE (list)->sort_column_id != GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID)
@@ -166,7 +167,7 @@ gtk_list_store_get_type (void)
        NULL
       };
 
-      list_store_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkListStore"),
+      list_store_type = g_type_register_static (G_TYPE_OBJECT, I_("GtkListStore"),
                                                &list_store_info, 0);
 
       g_type_add_interface_static (list_store_type,
index 3ca1ab37971dba26db38b7cb5ea2ab6b5e0147fb..1761f4848f7cb1d97ce48dbade5846756b0ffb7e 100644 (file)
@@ -294,7 +294,7 @@ gtk_menu_get_type (void)
        (GInstanceInitFunc) gtk_menu_init,
       };
       
-      menu_type = g_type_register_static (GTK_TYPE_MENU_SHELL, g_intern_static_string ("GtkMenu"),
+      menu_type = g_type_register_static (GTK_TYPE_MENU_SHELL, I_("GtkMenu"),
                                          &menu_info, 0);
     }
   
@@ -319,7 +319,7 @@ get_attach_info (GtkWidget *child)
   if (!ai)
     {
       ai = g_new0 (AttachInfo, 1);
-      g_object_set_data_full (object, g_intern_static_string (ATTACH_INFO_KEY), ai, g_free);
+      g_object_set_data_full (object, I_(ATTACH_INFO_KEY), ai, g_free);
     }
 
   return ai;
@@ -517,7 +517,7 @@ gtk_menu_class_init (GtkMenuClass *class)
   menu_shell_class->move_current = gtk_menu_move_current;
 
   menu_signals[MOVE_SCROLL] =
-    _gtk_binding_signal_new ("move_scroll",
+    _gtk_binding_signal_new (I_("move_scroll"),
                             G_OBJECT_CLASS_TYPE (object_class),
                             G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                             G_CALLBACK (gtk_menu_real_move_scroll),
@@ -612,7 +612,7 @@ gtk_menu_class_init (GtkMenuClass *class)
   binding_set = gtk_binding_set_by_class (class);
   gtk_binding_entry_add_signal (binding_set,
                                GDK_Up, 0,
-                               "move_current", 1,
+                               I_("move_current"), 1,
                                GTK_TYPE_MENU_DIRECTION_TYPE,
                                GTK_MENU_DIR_PREV);
   gtk_binding_entry_add_signal (binding_set,
@@ -1053,13 +1053,13 @@ gtk_menu_attach_to_widget (GtkMenu             *menu,
   attach_widget_screen_changed (attach_widget, NULL, menu);
   
   data->detacher = detacher;
-  g_object_set_data (G_OBJECT (menu), g_intern_static_string (attach_data_key), data);
+  g_object_set_data (G_OBJECT (menu), I_(attach_data_key), data);
   list = g_object_steal_data (G_OBJECT (attach_widget), ATTACHED_MENUS);
   if (!g_list_find (list, menu))
     {
       list = g_list_prepend (list, menu);
     }
-  g_object_set_data_full (G_OBJECT (attach_widget), g_intern_static_string (ATTACHED_MENUS), list, (GtkDestroyNotify) g_list_free);
+  g_object_set_data_full (G_OBJECT (attach_widget), I_(ATTACHED_MENUS), list, (GtkDestroyNotify) g_list_free);
   
   if (GTK_WIDGET_STATE (menu) != GTK_STATE_NORMAL)
     gtk_widget_set_state (GTK_WIDGET (menu), GTK_STATE_NORMAL);
@@ -1101,7 +1101,7 @@ gtk_menu_detach (GtkMenu *menu)
       g_warning ("gtk_menu_detach(): menu is not attached");
       return;
     }
-  g_object_set_data (G_OBJECT (menu), g_intern_static_string (attach_data_key), NULL);
+  g_object_set_data (G_OBJECT (menu), I_(attach_data_key), NULL);
   
   g_signal_handlers_disconnect_by_func (data->attach_widget,
                                        (gpointer) attach_widget_screen_changed,
@@ -1111,9 +1111,9 @@ gtk_menu_detach (GtkMenu *menu)
   list = g_object_steal_data (G_OBJECT (data->attach_widget), ATTACHED_MENUS);
   list = g_list_remove (list, menu);
   if (list)
-    g_object_set_data_full (G_OBJECT (data->attach_widget), g_intern_static_string (ATTACHED_MENUS), list, (GtkDestroyNotify) g_list_free);
+    g_object_set_data_full (G_OBJECT (data->attach_widget), I_(ATTACHED_MENUS), list, (GtkDestroyNotify) g_list_free);
   else
-    g_object_set_data (G_OBJECT (data->attach_widget), g_intern_static_string (ATTACHED_MENUS), NULL);
+    g_object_set_data (G_OBJECT (data->attach_widget), I_(ATTACHED_MENUS), NULL);
   
   if (GTK_WIDGET_REALIZED (menu))
     gtk_widget_unrealize (GTK_WIDGET (menu));
@@ -1148,7 +1148,7 @@ gtk_menu_remove (GtkContainer *container,
     }
 
   GTK_CONTAINER_CLASS (parent_class)->remove (container, widget);
-  g_object_set_data (G_OBJECT (widget), g_intern_static_string (ATTACH_INFO_KEY), NULL);
+  g_object_set_data (G_OBJECT (widget), I_(ATTACH_INFO_KEY), NULL);
 
   menu_queue_resize (menu);
 }
@@ -1935,10 +1935,10 @@ gtk_menu_set_title (GtkMenu     *menu,
   g_return_if_fail (GTK_IS_MENU (menu));
 
   if (title)
-    g_object_set_data_full (G_OBJECT (menu), g_intern_static_string ("gtk-menu-title"),
+    g_object_set_data_full (G_OBJECT (menu), I_("gtk-menu-title"),
                            g_strdup (title), (GtkDestroyNotify) g_free);
   else
-    g_object_set_data (G_OBJECT (menu), g_intern_static_string ("gtk-menu-title"), NULL);
+    g_object_set_data (G_OBJECT (menu), I_("gtk-menu-title"), NULL);
     
   gtk_menu_update_title (menu);
   g_object_notify (G_OBJECT (menu), "tearoff-title");
@@ -2121,7 +2121,7 @@ menu_grab_transfer_window_get (GtkMenu *menu)
 
       gdk_window_show (window);
 
-      g_object_set_data (G_OBJECT (menu), g_intern_static_string ("gtk-menu-transfer-window"), window);
+      g_object_set_data (G_OBJECT (menu), I_("gtk-menu-transfer-window"), window);
     }
 
   return window;
@@ -2135,7 +2135,7 @@ menu_grab_transfer_window_destroy (GtkMenu *menu)
     {
       gdk_window_set_user_data (window, NULL);
       gdk_window_destroy (window);
-      g_object_set_data (G_OBJECT (menu), g_intern_static_string ("gtk-menu-transfer-window"), NULL);
+      g_object_set_data (G_OBJECT (menu), I_("gtk-menu-transfer-window"), NULL);
     }
 }
 
@@ -3965,7 +3965,7 @@ gtk_menu_set_screen (GtkMenu   *menu,
   g_return_if_fail (GTK_IS_MENU (menu));
   g_return_if_fail (!screen || GDK_IS_SCREEN (screen));
 
-  g_object_set_data (G_OBJECT (menu), g_intern_static_string ("gtk-menu-explicit-screen"), screen);
+  g_object_set_data (G_OBJECT (menu), I_("gtk-menu-explicit-screen"), screen);
 
   if (screen)
     {
index 8e9aedc97768954042637c97ff870e5a11ed5496..bc63b056d84ad4ad3a232726ecc96b8e2fd05d4b 100644 (file)
@@ -109,7 +109,7 @@ gtk_menu_bar_get_type (void)
        NULL,           /* instance_init */
       };
 
-      menu_bar_type = g_type_register_static (GTK_TYPE_MENU_SHELL, g_intern_static_string ("GtkMenuBar"),
+      menu_bar_type = g_type_register_static (GTK_TYPE_MENU_SHELL, I_("GtkMenuBar"),
                                              &menu_bar_info, 0);
     }
 
@@ -608,7 +608,7 @@ static void
 set_menu_bars (GtkWindow *window,
               GList     *menubars)
 {
-  g_object_set_data (G_OBJECT (window), g_intern_static_string ("gtk-menu-bar-list"), menubars);
+  g_object_set_data (G_OBJECT (window), I_("gtk-menu-bar-list"), menubars);
 }
 
 static gboolean
index 0cca9f567439dc78b69dcfc18850fc72b454c585..9f9b2a05e7af4840a7f66a3ea70162daf5dff6e7 100644 (file)
@@ -37,6 +37,7 @@
 #include "gtkmenuitem.h"
 #include "gtkseparatormenuitem.h"
 #include "gtkprivate.h"
+#include "gtkintl.h"
 #include "gtkalias.h"
 
 #define MENU_ITEM_CLASS(w)  GTK_MENU_ITEM_CLASS (GTK_OBJECT (w)->klass)
@@ -119,7 +120,7 @@ gtk_menu_item_get_type (void)
        (GInstanceInitFunc) gtk_menu_item_init,
       };
 
-      menu_item_type = g_type_register_static (GTK_TYPE_ITEM, g_intern_static_string ("GtkMenuItem"),
+      menu_item_type = g_type_register_static (GTK_TYPE_ITEM, I_("GtkMenuItem"),
                                               &menu_item_info, 0);
     }
 
@@ -167,7 +168,7 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass)
   klass->hide_on_activate = TRUE;
 
   menu_item_signals[ACTIVATE] =
-    g_signal_new ("activate",
+    g_signal_new (I_("activate"),
                  G_OBJECT_CLASS_TYPE (gobject_class),
                  G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
                  G_STRUCT_OFFSET (GtkMenuItemClass, activate),
@@ -177,7 +178,7 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass)
   widget_class->activate_signal = menu_item_signals[ACTIVATE];
 
   menu_item_signals[ACTIVATE_ITEM] =
-    g_signal_new ("activate_item",
+    g_signal_new (I_("activate_item"),
                  G_OBJECT_CLASS_TYPE (gobject_class),
                  G_SIGNAL_RUN_FIRST,
                  G_STRUCT_OFFSET (GtkMenuItemClass, activate_item),
@@ -186,7 +187,7 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass)
                  G_TYPE_NONE, 0);
 
   menu_item_signals[TOGGLE_SIZE_REQUEST] =
-    g_signal_new ("toggle_size_request",
+    g_signal_new (I_("toggle_size_request"),
                  G_OBJECT_CLASS_TYPE (gobject_class),
                  G_SIGNAL_RUN_FIRST,
                  G_STRUCT_OFFSET (GtkMenuItemClass, toggle_size_request),
@@ -196,7 +197,7 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass)
                  G_TYPE_POINTER);
 
   menu_item_signals[TOGGLE_SIZE_ALLOCATE] =
-    g_signal_new ("toggle_size_allocate",
+    g_signal_new (I_("toggle_size_allocate"),
                  G_OBJECT_CLASS_TYPE (gobject_class),
                  G_SIGNAL_RUN_FIRST,
                  G_STRUCT_OFFSET (GtkMenuItemClass, toggle_size_allocate),
index ac6a0d7fd0bdca80ba15ad60b99ede7dd05353a0..bce558672ac43a504943eb1f307e6d9bd7e1cf79 100644 (file)
@@ -227,7 +227,7 @@ gtk_menu_shell_get_type (void)
       };
 
       menu_shell_type =
-       g_type_register_static (GTK_TYPE_CONTAINER, g_intern_static_string ("GtkMenuShell"),
+       g_type_register_static (GTK_TYPE_CONTAINER, I_("GtkMenuShell"),
                                &menu_shell_info, G_TYPE_FLAG_ABSTRACT);
     }
 
@@ -277,7 +277,7 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass)
   klass->insert = gtk_menu_shell_real_insert;
 
   menu_shell_signals[DEACTIVATE] =
-    g_signal_new ("deactivate",
+    g_signal_new (I_("deactivate"),
                  G_OBJECT_CLASS_TYPE (object_class),
                  G_SIGNAL_RUN_FIRST,
                  G_STRUCT_OFFSET (GtkMenuShellClass, deactivate),
@@ -285,7 +285,7 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass)
                  _gtk_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);
   menu_shell_signals[SELECTION_DONE] =
-    g_signal_new ("selection-done",
+    g_signal_new (I_("selection-done"),
                  G_OBJECT_CLASS_TYPE (object_class),
                  G_SIGNAL_RUN_FIRST,
                  G_STRUCT_OFFSET (GtkMenuShellClass, selection_done),
@@ -293,7 +293,7 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass)
                  _gtk_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);
   menu_shell_signals[MOVE_CURRENT] =
-    g_signal_new ("move_current",
+    g_signal_new (I_("move_current"),
                  G_OBJECT_CLASS_TYPE (object_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                  G_STRUCT_OFFSET (GtkMenuShellClass, move_current),
@@ -302,7 +302,7 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass)
                  G_TYPE_NONE, 1, 
                  GTK_TYPE_MENU_DIRECTION_TYPE);
   menu_shell_signals[ACTIVATE_CURRENT] =
-    g_signal_new ("activate_current",
+    g_signal_new (I_("activate_current"),
                  G_OBJECT_CLASS_TYPE (object_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                  G_STRUCT_OFFSET (GtkMenuShellClass, activate_current),
@@ -311,7 +311,7 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass)
                  G_TYPE_NONE, 1, 
                  G_TYPE_BOOLEAN);
   menu_shell_signals[CANCEL] =
-    g_signal_new ("cancel",
+    g_signal_new (I_("cancel"),
                  G_OBJECT_CLASS_TYPE (object_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                  G_STRUCT_OFFSET (GtkMenuShellClass, cancel),
@@ -319,7 +319,7 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass)
                  _gtk_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);
   menu_shell_signals[CYCLE_FOCUS] =
-    _gtk_binding_signal_new ("cycle_focus",
+    _gtk_binding_signal_new (I_("cycle_focus"),
                             G_OBJECT_CLASS_TYPE (object_class),
                             G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                             G_CALLBACK (gtk_real_menu_shell_cycle_focus),
index 84833e051a696b3043c6d3220170d5e6ca6ecc0c..d44f8bc50dbfc54eab068ea0cde83efe6fb49736 100644 (file)
@@ -88,7 +88,7 @@ gtk_menu_tool_button_get_type (void)
        };
 
       type = g_type_register_static (GTK_TYPE_TOOL_BUTTON,
-                                     g_intern_static_string ("GtkMenuToolButton"),
+                                     I_("GtkMenuToolButton"),
                                      &info, 0);
     }
 
@@ -256,7 +256,7 @@ gtk_menu_tool_button_class_init (GtkMenuToolButtonClass *klass)
   toolitem_class->toolbar_reconfigured = gtk_menu_tool_button_toolbar_reconfigured;
 
   signals[SHOW_MENU] =
-    g_signal_new ("show-menu",
+    g_signal_new (I_("show-menu"),
                   G_OBJECT_CLASS_TYPE (klass),
                   G_SIGNAL_RUN_FIRST,
                   G_STRUCT_OFFSET (GtkMenuToolButtonClass, show_menu),
index 81890256a7b3f399ba5acccdb6269990cba97bbe..fb75bdfbcbf0a36b429749cd9fec08ea18d1ef06 100644 (file)
@@ -98,7 +98,7 @@ gtk_message_dialog_get_type (void)
        (GInstanceInitFunc) gtk_message_dialog_init,
       };
 
-      dialog_type = g_type_register_static (GTK_TYPE_DIALOG, g_intern_static_string ("GtkMessageDialog"),
+      dialog_type = g_type_register_static (GTK_TYPE_DIALOG, I_("GtkMessageDialog"),
                                            &dialog_info, 0);
     }
 
index 24268f2b8505f8dcd746e66af19598691668f727..7a22c14974cf6b2e9b7e1206aafee9da7336023a 100644 (file)
@@ -74,7 +74,7 @@ gtk_misc_get_type (void)
        NULL,           /* value_table */
       };
 
-      misc_type = g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkMisc"),
+      misc_type = g_type_register_static (GTK_TYPE_WIDGET, I_("GtkMisc"),
                                          &misc_info, G_TYPE_FLAG_ABSTRACT);
     }
 
index ff4ff921eb5b81f04a95603952908b93b81bdec0..33020f72fb498a5c9101ae4c08d7ad33086ef5a4 100644 (file)
@@ -26,6 +26,7 @@
 #include "gtksettings.h"
 #include "gtkdebug.h"
 #include "gtkprivate.h" /* GTK_LIBDIR */
+#include "gtkintl.h" 
 
 #include <gmodule.h>
 #include <pango/pango-utils.h> /* For pango_split_file_list */
@@ -428,7 +429,7 @@ display_closed_cb (GdkDisplay *display,
       settings = gtk_settings_get_for_screen (screen);
 
       g_object_set_data_full (G_OBJECT (settings),
-                             g_intern_static_string ("gtk-modules"),
+                             I_("gtk-modules"),
                              NULL, NULL);
     }  
 }
@@ -535,7 +536,7 @@ _gtk_modules_settings_changed (GtkSettings *settings,
     new_modules = load_modules (modules);
 
   g_object_set_data_full (G_OBJECT (settings),
-                         g_intern_static_string ("gtk-modules"),
+                         I_("gtk-modules"),
                          new_modules,
                          settings_destroy_notify);
 }
index 057c34f8ee2803807a9cdd48ac14013bb5c7c14d..422bc75e97bc802101144ca9cecb53718fbe04fb 100644 (file)
@@ -314,7 +314,7 @@ gtk_notebook_get_type (void)
        (GInstanceInitFunc) gtk_notebook_init,
       };
 
-      notebook_type = g_type_register_static (GTK_TYPE_CONTAINER, g_intern_static_string ("GtkNotebook"),
+      notebook_type = g_type_register_static (GTK_TYPE_CONTAINER, I_("GtkNotebook"),
                                              &notebook_info, 0);
     }
 
@@ -589,7 +589,7 @@ gtk_notebook_class_init (GtkNotebookClass *class)
                                                                    GTK_PARAM_READABLE));
 
   notebook_signals[SWITCH_PAGE] =
-    g_signal_new ("switch_page",
+    g_signal_new (I_("switch_page"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkNotebookClass, switch_page),
@@ -599,7 +599,7 @@ gtk_notebook_class_init (GtkNotebookClass *class)
                  G_TYPE_POINTER,
                  G_TYPE_UINT);
   notebook_signals[FOCUS_TAB] = 
-    g_signal_new ("focus_tab",
+    g_signal_new (I_("focus_tab"),
                   G_TYPE_FROM_CLASS (gobject_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                   G_STRUCT_OFFSET (GtkNotebookClass, focus_tab),
@@ -608,7 +608,7 @@ gtk_notebook_class_init (GtkNotebookClass *class)
                   G_TYPE_BOOLEAN, 1,
                   GTK_TYPE_NOTEBOOK_TAB);
   notebook_signals[SELECT_PAGE] = 
-    g_signal_new ("select_page",
+    g_signal_new (I_("select_page"),
                   G_TYPE_FROM_CLASS (gobject_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                   G_STRUCT_OFFSET (GtkNotebookClass, select_page),
@@ -617,7 +617,7 @@ gtk_notebook_class_init (GtkNotebookClass *class)
                   G_TYPE_BOOLEAN, 1,
                   G_TYPE_BOOLEAN);
   notebook_signals[CHANGE_CURRENT_PAGE] = 
-    g_signal_new ("change_current_page",
+    g_signal_new (I_("change_current_page"),
                   G_TYPE_FROM_CLASS (gobject_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                   G_STRUCT_OFFSET (GtkNotebookClass, change_current_page),
@@ -626,7 +626,7 @@ gtk_notebook_class_init (GtkNotebookClass *class)
                   G_TYPE_NONE, 1,
                   G_TYPE_INT);
   notebook_signals[MOVE_FOCUS_OUT] =
-    g_signal_new ("move_focus_out",
+    g_signal_new (I_("move_focus_out"),
                   G_TYPE_FROM_CLASS (gobject_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                   G_STRUCT_OFFSET (GtkNotebookClass, move_focus_out),
index 6c5e18ab6e40a079dec6e4068a02cece5b85e7b3..e5df6f8043d52bea309540760bdcd737098c0fe0 100644 (file)
@@ -29,6 +29,7 @@
 #include <string.h>
 #include <stdio.h>
 #include "gtkobject.h"
+#include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtksignal.h"
 #include "gtkprivate.h"
@@ -95,7 +96,7 @@ gtk_object_get_type (void)
        NULL,           /* value_table */
       };
       
-      object_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkObject"), 
+      object_type = g_type_register_static (G_TYPE_OBJECT, I_("GtkObject"), 
                                            &object_info, G_TYPE_FLAG_ABSTRACT);
     }
 
@@ -329,11 +330,12 @@ gtk_object_class_init (GtkObjectClass *class)
 
   g_object_class_install_property (gobject_class,
                                   PROP_USER_DATA,
-                                  g_param_spec_pointer ("user-data", "User Data",
-                                                        "Anonymous User Data Pointer",
+                                  g_param_spec_pointer ("user-data", 
+                                                        P_("User Data"),
+                                                        P_("Anonymous User Data Pointer"),
                                                         GTK_PARAM_READWRITE));
   object_signals[DESTROY] =
-    g_signal_new ("destroy",
+    g_signal_new (I_("destroy"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_CLEANUP | G_SIGNAL_NO_RECURSE | G_SIGNAL_NO_HOOKS,
                  G_STRUCT_OFFSET (GtkObjectClass, destroy),
@@ -422,7 +424,7 @@ gtk_object_set_property (GObject      *object,
   switch (property_id)
     {
     case PROP_USER_DATA:
-      g_object_set_data (G_OBJECT (object), g_intern_static_string ("user_data"), g_value_get_pointer (value));
+      g_object_set_data (G_OBJECT (object), I_("user_data"), g_value_get_pointer (value));
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
index 690a623d61320efb73f8788420252878843e7c69..77c5c2546e11013746157cf646eb07d70ffd1204 100644 (file)
@@ -36,6 +36,7 @@
 #include "gtkmarshalers.h"
 #include "gtkselection.h"
 #include "gtksignal.h"
+#include "gtkintl.h"
 #include "gtkalias.h"
 
 #define MIN_EDITABLE_WIDTH  150
@@ -158,7 +159,7 @@ gtk_old_editable_get_type (void)
        NULL                                                     /* interface_data */
       };
 
-      old_editable_type = g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkOldEditable"),
+      old_editable_type = g_type_register_static (GTK_TYPE_WIDGET, I_("GtkOldEditable"),
                                                  &old_editable_info, G_TYPE_FLAG_ABSTRACT);
       g_type_add_interface_static (old_editable_type,
                                   GTK_TYPE_EDITABLE,
@@ -209,7 +210,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
   class->set_position = NULL;
 
   editable_signals[ACTIVATE] =
-    gtk_signal_new ("activate",
+    gtk_signal_new (I_("activate"),
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkOldEditableClass, activate),
@@ -218,7 +219,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
   widget_class->activate_signal = editable_signals[ACTIVATE];
 
   editable_signals[SET_EDITABLE] =
-    gtk_signal_new ("set-editable",
+    gtk_signal_new (I_("set-editable"),
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkOldEditableClass, set_editable),
@@ -227,7 +228,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
                    GTK_TYPE_BOOL);
 
   editable_signals[MOVE_CURSOR] =
-    gtk_signal_new ("move_cursor",
+    gtk_signal_new (I_("move_cursor"),
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkOldEditableClass, move_cursor),
@@ -237,7 +238,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
                    GTK_TYPE_INT);
 
   editable_signals[MOVE_WORD] =
-    gtk_signal_new ("move_word",
+    gtk_signal_new (I_("move_word"),
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkOldEditableClass, move_word),
@@ -246,7 +247,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
                    GTK_TYPE_INT);
 
   editable_signals[MOVE_PAGE] =
-    gtk_signal_new ("move_page",
+    gtk_signal_new (I_("move_page"),
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkOldEditableClass, move_page),
@@ -256,7 +257,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
                    GTK_TYPE_INT);
 
   editable_signals[MOVE_TO_ROW] =
-    gtk_signal_new ("move_to_row",
+    gtk_signal_new (I_("move_to_row"),
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkOldEditableClass, move_to_row),
@@ -265,7 +266,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
                    GTK_TYPE_INT);
 
   editable_signals[MOVE_TO_COLUMN] =
-    gtk_signal_new ("move_to_column",
+    gtk_signal_new (I_("move_to_column"),
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkOldEditableClass, move_to_column),
@@ -274,7 +275,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
                    GTK_TYPE_INT);
 
   editable_signals[KILL_CHAR] =
-    gtk_signal_new ("kill_char",
+    gtk_signal_new (I_("kill_char"),
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkOldEditableClass, kill_char),
@@ -283,7 +284,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
                    GTK_TYPE_INT);
 
   editable_signals[KILL_WORD] =
-    gtk_signal_new ("kill_word",
+    gtk_signal_new (I_("kill_word"),
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkOldEditableClass, kill_word),
@@ -292,7 +293,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
                    GTK_TYPE_INT);
 
   editable_signals[KILL_LINE] =
-    gtk_signal_new ("kill_line",
+    gtk_signal_new (I_("kill_line"),
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkOldEditableClass, kill_line),
@@ -301,7 +302,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
                    GTK_TYPE_INT);
 
   editable_signals[CUT_CLIPBOARD] =
-    gtk_signal_new ("cut_clipboard",
+    gtk_signal_new (I_("cut_clipboard"),
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkOldEditableClass, cut_clipboard),
@@ -309,7 +310,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
                    GTK_TYPE_NONE, 0);
 
   editable_signals[COPY_CLIPBOARD] =
-    gtk_signal_new ("copy_clipboard",
+    gtk_signal_new (I_("copy_clipboard"),
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkOldEditableClass, copy_clipboard),
@@ -317,7 +318,7 @@ gtk_old_editable_class_init (GtkOldEditableClass *class)
                    GTK_TYPE_NONE, 0);
 
   editable_signals[PASTE_CLIPBOARD] =
-    gtk_signal_new ("paste_clipboard",
+    gtk_signal_new (I_("paste_clipboard"),
                    GTK_RUN_LAST | GTK_RUN_ACTION,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkOldEditableClass, paste_clipboard),
index f386434ac0b0c2bcec5ff25b1b324e521c8fb031..ffcf99c3d2c66d22d65330daf1926585c5a9015b 100644 (file)
@@ -141,7 +141,7 @@ gtk_option_menu_get_type (void)
       };
 
       option_menu_type =
-       g_type_register_static (GTK_TYPE_BUTTON, g_intern_static_string ("GtkOptionMenu"),
+       g_type_register_static (GTK_TYPE_BUTTON, I_("GtkOptionMenu"),
                                &option_menu_info, 0);
     }
 
@@ -166,7 +166,7 @@ gtk_option_menu_class_init (GtkOptionMenuClass *class)
   parent_class = g_type_class_peek_parent (class);
 
   signals[CHANGED] =
-    g_signal_new ("changed",
+    g_signal_new (I_("changed"),
                   G_OBJECT_CLASS_TYPE (class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkOptionMenuClass, changed),
index f4e711fb94855532ae3927a2e576a84f942a280e..630c61f876aa608588ad38ca2aa2c8e51a38e882 100644 (file)
@@ -161,7 +161,7 @@ gtk_paned_get_type (void)
        NULL,           /* value_table */
       };
 
-      paned_type = g_type_register_static (GTK_TYPE_CONTAINER, g_intern_static_string ("GtkPaned"),
+      paned_type = g_type_register_static (GTK_TYPE_CONTAINER, I_("GtkPaned"),
                                           &paned_info, G_TYPE_FLAG_ABSTRACT);
     }
   
@@ -333,7 +333,7 @@ gtk_paned_class_init (GtkPanedClass *class)
                                                                    GTK_PARAM_READWRITE));
 
   signals [CYCLE_CHILD_FOCUS] =
-    g_signal_new ("cycle_child_focus",
+    g_signal_new (I_("cycle_child_focus"),
                  G_TYPE_FROM_CLASS (object_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                  G_STRUCT_OFFSET (GtkPanedClass, cycle_child_focus),
@@ -343,7 +343,7 @@ gtk_paned_class_init (GtkPanedClass *class)
                  G_TYPE_BOOLEAN);
 
   signals [TOGGLE_HANDLE_FOCUS] =
-    g_signal_new ("toggle_handle_focus",
+    g_signal_new (I_("toggle_handle_focus"),
                  G_TYPE_FROM_CLASS (object_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                  G_STRUCT_OFFSET (GtkPanedClass, toggle_handle_focus),
@@ -352,7 +352,7 @@ gtk_paned_class_init (GtkPanedClass *class)
                  G_TYPE_BOOLEAN, 0);
 
   signals[MOVE_HANDLE] =
-    g_signal_new ("move_handle",
+    g_signal_new (I_("move_handle"),
                  G_TYPE_FROM_CLASS (object_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                   G_STRUCT_OFFSET (GtkPanedClass, move_handle),
@@ -362,7 +362,7 @@ gtk_paned_class_init (GtkPanedClass *class)
                   GTK_TYPE_SCROLL_TYPE);
 
   signals [CYCLE_HANDLE_FOCUS] =
-    g_signal_new ("cycle_handle_focus",
+    g_signal_new (I_("cycle_handle_focus"),
                  G_TYPE_FROM_CLASS (object_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                  G_STRUCT_OFFSET (GtkPanedClass, cycle_handle_focus),
@@ -372,7 +372,7 @@ gtk_paned_class_init (GtkPanedClass *class)
                  G_TYPE_BOOLEAN);
 
   signals [ACCEPT_POSITION] =
-    g_signal_new ("accept_position",
+    g_signal_new (I_("accept_position"),
                  G_TYPE_FROM_CLASS (object_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                  G_STRUCT_OFFSET (GtkPanedClass, accept_position),
@@ -381,7 +381,7 @@ gtk_paned_class_init (GtkPanedClass *class)
                  G_TYPE_BOOLEAN, 0);
 
   signals [CANCEL_POSITION] =
-    g_signal_new ("cancel_position",
+    g_signal_new (I_("cancel_position"),
                  G_TYPE_FROM_CLASS (object_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                  G_STRUCT_OFFSET (GtkPanedClass, cancel_position),
index bccf797f895f9f21407beae181caff7f3143641f..468b65059908a08f91a32ea4a378d1e18f1971a7 100644 (file)
@@ -185,7 +185,7 @@ gtk_path_bar_class_init (GtkPathBarClass *path_bar_class)
   /*  container_class->child_type = gtk_path_bar_child_type;*/
 
   path_bar_signals [PATH_CLICKED] =
-    g_signal_new ("path-clicked",
+    g_signal_new (I_("path-clicked"),
                  G_OBJECT_CLASS_TYPE (object_class),
                  G_SIGNAL_RUN_FIRST,
                  G_STRUCT_OFFSET (GtkPathBarClass, path_clicked),
index 2d92298ccf28c63e191aa63bba0bb3103305147e..e8c4b379767fd7278ca2bc24db8b3580371e111d 100644 (file)
@@ -34,6 +34,7 @@
 #include <math.h>
 #include "gtkcontainer.h"
 #include "gtkpixmap.h"
+#include "gtkintl.h"
 #include "gtkalias.h"
 
 
@@ -65,7 +66,7 @@ gtk_pixmap_get_type (void)
         (GtkClassInitFunc) NULL,
       };
 
-      g_intern_static_string ("GtkPixmap");
+      I_("GtkPixmap");
       pixmap_type = gtk_type_unique (GTK_TYPE_MISC, &pixmap_info);
     }
 
index 3c557c9f5b87f14edb8767c2967abd946d47ceac..4b6271c3299b9340eae97638b969fd5bf6f3f0a5 100644 (file)
@@ -28,6 +28,7 @@
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkplug.h"
+#include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtkplugprivate.h"
 
@@ -91,7 +92,7 @@ gtk_plug_get_type (void)
        (GInstanceInitFunc) gtk_plug_init,
       };
 
-      plug_type = g_type_register_static (GTK_TYPE_WINDOW, g_intern_static_string ("GtkPlug"),
+      plug_type = g_type_register_static (GTK_TYPE_WINDOW, I_("GtkPlug"),
                                          &plug_info, 0);
     }
 
@@ -131,7 +132,7 @@ gtk_plug_class_init (GtkPlugClass *class)
   window_class->keys_changed = gtk_plug_keys_changed;
 
   plug_signals[EMBEDDED] =
-    g_signal_new ("embedded",
+    g_signal_new (I_("embedded"),
                  G_OBJECT_CLASS_TYPE (class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkPlugClass, embedded),
index bfd9379584189eab0a8b3eb9b397edd03c3d8429..66a83c0dee2470dcc6fb097d2e6ca8e73be4b59b 100644 (file)
@@ -94,7 +94,7 @@ gtk_preview_get_type (void)
         (GtkClassInitFunc) NULL,
       };
 
-      g_intern_static_string ("GtkPreview");
+      I_("GtkPreview");
       preview_type = gtk_type_unique (GTK_TYPE_WIDGET, &preview_info);
     }
 
index 4fa9b415e8b7b79f4ecb665d864ce625ac0f9ef2..b0ba79b8e4f514c99c4c288e48ebdf18578a236e 100644 (file)
@@ -92,7 +92,7 @@ gtk_progress_get_type (void)
        (GInstanceInitFunc) gtk_progress_init,
       };
 
-      progress_type = g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkProgress"),
+      progress_type = g_type_register_static (GTK_TYPE_WIDGET, I_("GtkProgress"),
                                              &progress_info, 0);
     }
 
index 452cfa2221744f5b92da29a3960091c6a7504a0f..55679451c0516850c5c45756d7ef31d5df90b549 100644 (file)
@@ -112,7 +112,7 @@ gtk_progress_bar_get_type (void)
       };
 
       progress_bar_type =
-       g_type_register_static (GTK_TYPE_PROGRESS, g_intern_static_string ("GtkProgressBar"),
+       g_type_register_static (GTK_TYPE_PROGRESS, I_("GtkProgressBar"),
                                &progress_bar_info, 0);
     }
 
index 92c3173efc01cb81e19922d4a604e3f26b9f7f88..b2f60b46c55a4f35339ce05f944c6481345e924b 100644 (file)
@@ -96,7 +96,7 @@ gtk_radio_action_get_type (void)
       };
 
       type = g_type_register_static (GTK_TYPE_TOGGLE_ACTION,
-                                     g_intern_static_string ("GtkRadioAction"),
+                                     I_("GtkRadioAction"),
                                      &type_info, 0);
     }
   return type;
@@ -171,7 +171,7 @@ gtk_radio_action_class_init (GtkRadioActionClass *klass)
    * Since: 2.4
    */
   radio_action_signals[CHANGED] =
-    g_signal_new ("changed",
+    g_signal_new (I_("changed"),
                  G_OBJECT_CLASS_TYPE (klass),
                  G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE,
                  G_STRUCT_OFFSET (GtkRadioActionClass, changed),  NULL, NULL,
index 16c31bf15b78039bd677fd6d10a81666b60daafc..61c8dada478678a8661da2ec5a5a81fd9d6e25d5 100644 (file)
@@ -81,7 +81,7 @@ gtk_radio_button_get_type (void)
       };
 
       radio_button_type =
-       g_type_register_static (GTK_TYPE_CHECK_BUTTON, g_intern_static_string ("GtkRadioButton"),
+       g_type_register_static (GTK_TYPE_CHECK_BUTTON, I_("GtkRadioButton"),
                                &radio_button_info, 0);
     }
 
@@ -138,7 +138,7 @@ gtk_radio_button_class_init (GtkRadioButtonClass *class)
    *
    * Since: 2.4
    */
-  group_changed_signal = g_signal_new ("group-changed",
+  group_changed_signal = g_signal_new (I_("group-changed"),
                                       G_OBJECT_CLASS_TYPE (object_class),
                                       G_SIGNAL_RUN_FIRST,
                                       G_STRUCT_OFFSET (GtkRadioButtonClass, group_changed),
index 9d12cda4be27fbb69a472ed2c1f0d7aba636c1a4..7a9b82fe099e73a08b25e662bdd1112cd1d8e576 100644 (file)
@@ -77,7 +77,7 @@ gtk_radio_menu_item_get_type (void)
       };
 
       radio_menu_item_type =
-       g_type_register_static (GTK_TYPE_CHECK_MENU_ITEM, g_intern_static_string ("GtkRadioMenuItem"),
+       g_type_register_static (GTK_TYPE_CHECK_MENU_ITEM, I_("GtkRadioMenuItem"),
                                &radio_menu_item_info, 0);
     }
 
@@ -397,7 +397,7 @@ gtk_radio_menu_item_class_init (GtkRadioMenuItemClass *klass)
    *
    * Since: 2.4
    */
-  group_changed_signal = g_signal_new ("group-changed",
+  group_changed_signal = g_signal_new (I_("group-changed"),
                                       G_OBJECT_CLASS_TYPE (object_class),
                                       G_SIGNAL_RUN_FIRST,
                                       G_STRUCT_OFFSET (GtkRadioMenuItemClass, group_changed),
index 9b91bb982b0bb30813fc9eea7d1c9b0d9d672b36..4bf5f3eb3e20797bc1b73f1fd26dda1fbc6e7020 100644 (file)
@@ -60,7 +60,7 @@ gtk_radio_tool_button_get_type (void)
        };
 
       type = g_type_register_static (GTK_TYPE_TOGGLE_TOOL_BUTTON,
-                                    g_intern_static_string ("GtkRadioToolButton"), &type_info, 0);
+                                    I_("GtkRadioToolButton"), &type_info, 0);
     }
   return type;
 }
index c9d2d8e3821d6dd8935597380f05597ea9f085e1..6330ffe9001cb4fc068268a7929551368f125740 100644 (file)
@@ -208,7 +208,7 @@ gtk_range_get_type (void)
        NULL,           /* value_table */
       };
 
-      range_type = g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkRange"),
+      range_type = g_type_register_static (GTK_TYPE_WIDGET, I_("GtkRange"),
                                           &range_info, G_TYPE_FLAG_ABSTRACT);
     }
 
@@ -258,7 +258,7 @@ gtk_range_class_init (GtkRangeClass *class)
   class->stepper_detail = "stepper";
 
   signals[VALUE_CHANGED] =
-    g_signal_new ("value_changed",
+    g_signal_new (I_("value_changed"),
                   G_TYPE_FROM_CLASS (gobject_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkRangeClass, value_changed),
@@ -267,7 +267,7 @@ gtk_range_class_init (GtkRangeClass *class)
                   G_TYPE_NONE, 0);
   
   signals[ADJUST_BOUNDS] =
-    g_signal_new ("adjust_bounds",
+    g_signal_new (I_("adjust_bounds"),
                   G_TYPE_FROM_CLASS (gobject_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkRangeClass, adjust_bounds),
@@ -277,7 +277,7 @@ gtk_range_class_init (GtkRangeClass *class)
                   G_TYPE_DOUBLE);
   
   signals[MOVE_SLIDER] =
-    g_signal_new ("move_slider",
+    g_signal_new (I_("move_slider"),
                   G_TYPE_FROM_CLASS (gobject_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                   G_STRUCT_OFFSET (GtkRangeClass, move_slider),
@@ -313,7 +313,7 @@ gtk_range_class_init (GtkRangeClass *class)
    * Since: 2.6
    */
   signals[CHANGE_VALUE] =
-    g_signal_new ("change_value",
+    g_signal_new (I_("change_value"),
                   G_TYPE_FROM_CLASS (gobject_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkRangeClass, change_value),
index 1c779e163f254657c68c369add4bfc24a6586450..b4117b6d593f764f33f54da828156740c8a7b03c 100644 (file)
@@ -945,7 +945,7 @@ gtk_rc_style_get_type (void)
         (GInstanceInitFunc) gtk_rc_style_init,
       };
       
-      rc_style_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkRcStyle"),
+      rc_style_type = g_type_register_static (G_TYPE_OBJECT, I_("GtkRcStyle"),
                                              &rc_style_info, 0);
     }
   
index 894f8bef328fc9f535402ebea15af2676ad509e7..625b7787f3feb4b3efe9e75a132da8637768987c 100644 (file)
@@ -87,7 +87,7 @@ gtk_ruler_get_type (void)
        (GInstanceInitFunc) gtk_ruler_init,
       };
 
-      ruler_type = g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkRuler"),
+      ruler_type = g_type_register_static (GTK_TYPE_WIDGET, I_("GtkRuler"),
                                           &ruler_info, 0);
     }
 
index 9454cbebdf845a2357f902737ac04e5ad2488276..85f745460bb2a41556d6548f0ccf949123b2cbe7 100644 (file)
@@ -105,7 +105,7 @@ gtk_scale_get_type (void)
        NULL,           /* value_table */
       };
 
-      scale_type = g_type_register_static (GTK_TYPE_RANGE, g_intern_static_string ("GtkScale"),
+      scale_type = g_type_register_static (GTK_TYPE_RANGE, I_("GtkScale"),
                                           &scale_info, G_TYPE_FLAG_ABSTRACT);
     }
 
@@ -129,9 +129,9 @@ single_string_accumulator (GSignalInvocationHint *ihint,
 }
 
 
-#define add_slider_binding(binding_set, keyval, mask, scroll)          \
-  gtk_binding_entry_add_signal (binding_set, keyval, mask,             \
-                                "move_slider", 1,                      \
+#define add_slider_binding(binding_set, keyval, mask, scroll)              \
+  gtk_binding_entry_add_signal (binding_set, keyval, mask,                 \
+                                I_("move_slider"), 1, \
                                 GTK_TYPE_SCROLL_TYPE, scroll)
 
 static void
@@ -158,7 +158,7 @@ gtk_scale_class_init (GtkScaleClass *class)
   range_class->get_range_border = gtk_scale_get_range_border;
   
   signals[FORMAT_VALUE] =
-    g_signal_new ("format_value",
+    g_signal_new (I_("format_value"),
                   G_TYPE_FROM_CLASS (gobject_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkScaleClass, format_value),
index cfb71c2b943c79fe36744219d764b982fe7db8e4..1cb611160f4daddb45d16b7c5f18789b29a9a6e2 100644 (file)
@@ -60,7 +60,7 @@ gtk_scrollbar_get_type (void)
       };
 
       scrollbar_type =
-       g_type_register_static (GTK_TYPE_RANGE, g_intern_static_string ("GtkScrollbar"),
+       g_type_register_static (GTK_TYPE_RANGE, I_("GtkScrollbar"),
                                &scrollbar_info, G_TYPE_FLAG_ABSTRACT);
     }
 
index ab98e204663a574c8f8c7d9cacc7de85bc717ed3..7eafb767a620168700ee1b58de6f019572cfbfac 100644 (file)
@@ -158,7 +158,7 @@ gtk_scrolled_window_get_type (void)
       };
 
       scrolled_window_type =
-       g_type_register_static (GTK_TYPE_BIN, g_intern_static_string ("GtkScrolledWindow"),
+       g_type_register_static (GTK_TYPE_BIN, I_("GtkScrolledWindow"),
                                &scrolled_window_info, 0);
     }
 
@@ -291,7 +291,7 @@ gtk_scrolled_window_class_init (GtkScrolledWindowClass *class)
                                                             GTK_PARAM_READABLE));
 
   signals[SCROLL_CHILD] =
-    g_signal_new ("scroll_child",
+    g_signal_new (I_("scroll_child"),
                   G_TYPE_FROM_CLASS (object_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                   G_STRUCT_OFFSET (GtkScrolledWindowClass, scroll_child),
@@ -301,7 +301,7 @@ gtk_scrolled_window_class_init (GtkScrolledWindowClass *class)
                   GTK_TYPE_SCROLL_TYPE,
                  G_TYPE_BOOLEAN);
   signals[MOVE_FOCUS_OUT] =
-    g_signal_new ("move_focus_out",
+    g_signal_new (I_("move_focus_out"),
                   G_TYPE_FROM_CLASS (object_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                   G_STRUCT_OFFSET (GtkScrolledWindowClass, move_focus_out),
index 739ff38c00ab473482f5226bf3853c86006c1a78..78d257a4978e4e4283118859ee1333f1301b8c7e 100644 (file)
@@ -58,6 +58,7 @@
 
 #include "gtkmain.h"
 #include "gtkselection.h"
+#include "gtkintl.h"
 #include "gdk-pixbuf/gdk-pixbuf.h"
 
 #ifdef GDK_WINDOWING_X11
@@ -682,7 +683,7 @@ gtk_selection_target_list_get (GtkWidget    *widget,
   sellist->list = gtk_target_list_new (NULL, 0);
 
   lists = g_list_prepend (lists, sellist);
-  g_object_set_data (G_OBJECT (widget), g_intern_static_string (gtk_selection_handler_key), lists);
+  g_object_set_data (G_OBJECT (widget), I_(gtk_selection_handler_key), lists);
 
   return sellist->list;
 }
@@ -708,7 +709,7 @@ gtk_selection_target_list_remove (GtkWidget    *widget)
     }
 
   g_list_free (lists);
-  g_object_set_data (G_OBJECT (widget), g_intern_static_string (gtk_selection_handler_key), NULL);
+  g_object_set_data (G_OBJECT (widget), I_(gtk_selection_handler_key), NULL);
 }
 
 /**
@@ -748,7 +749,7 @@ gtk_selection_clear_targets (GtkWidget *widget,
       tmp_list = tmp_list->next;
     }
   
-  g_object_set_data (G_OBJECT (widget), g_intern_static_string (gtk_selection_handler_key), lists);
+  g_object_set_data (G_OBJECT (widget), I_(gtk_selection_handler_key), lists);
 }
 
 /**
@@ -2746,7 +2747,7 @@ gtk_selection_data_get_type (void)
   static GType our_type = 0;
   
   if (our_type == 0)
-    our_type = g_boxed_type_register_static (g_intern_static_string ("GtkSelectionData"),
+    our_type = g_boxed_type_register_static (I_("GtkSelectionData"),
                                             (GBoxedCopyFunc) gtk_selection_data_copy,
                                             (GBoxedFreeFunc) gtk_selection_data_free);
 
index dc5bf86268ad2ba8c01b6ebc137a5828083e87ff..e2ddc59057f6e0f675f6ed0820b85f05590a8bb7 100644 (file)
@@ -26,6 +26,7 @@
 
 #include <config.h>
 #include "gtkseparator.h"
+#include "gtkintl.h"
 #include "gtkalias.h"
 
 
@@ -55,7 +56,7 @@ gtk_separator_get_type (void)
       };
 
       separator_type =
-       g_type_register_static (GTK_TYPE_WIDGET, g_intern_static_string ("GtkSeparator"),
+       g_type_register_static (GTK_TYPE_WIDGET, I_("GtkSeparator"),
                                &separator_info, G_TYPE_FLAG_ABSTRACT);
     }
 
index dbb942d02ad4e4f9a296348fd360a20e174a27c7..fc3d267e2e923441418bad0ab3d9759f36089981 100644 (file)
@@ -88,7 +88,7 @@ gtk_separator_tool_item_get_type (void)
        };
       
       type = g_type_register_static (GTK_TYPE_TOOL_ITEM,
-                                    g_intern_static_string ("GtkSeparatorToolItem"), &type_info, 0);
+                                    I_("GtkSeparatorToolItem"), &type_info, 0);
     }
   return type;
 }
index af3b7417375664e89672ce0c44d7b9a86eaf697c..9322211ded44a418e93ce0c4de6e2c135cda38a6 100644 (file)
@@ -137,7 +137,7 @@ gtk_settings_get_type (void)
        (GInstanceInitFunc) gtk_settings_init,
       };
       
-      settings_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkSettings"),
+      settings_type = g_type_register_static (G_TYPE_OBJECT, I_("GtkSettings"),
                                              &settings_info, 0);
     }
   
@@ -426,7 +426,7 @@ gtk_settings_get_for_screen (GdkScreen *screen)
     {
       settings = g_object_new (GTK_TYPE_SETTINGS, NULL);
       settings->screen = screen;
-      g_object_set_data (G_OBJECT (screen), g_intern_static_string ("gtk-settings"), settings);
+      g_object_set_data (G_OBJECT (screen), I_("gtk-settings"), settings);
 
       gtk_rc_reparse_all_for_settings (settings, TRUE);
       settings_update_double_click (settings);
index 0b9b77fea62fa6f21eb7c426407e15d8f77b0de3..1f87a2240f3234d3bea6adb09ff9c0007e991b8c 100644 (file)
@@ -322,7 +322,7 @@ gtk_size_group_get_type (void)
        (GInstanceInitFunc) gtk_size_group_init,
       };
 
-      size_group_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkSizeGroup"),
+      size_group_type = g_type_register_static (G_TYPE_OBJECT, I_("GtkSizeGroup"),
                                                &size_group_info, 0);
     }
 
index 74e219d74eebcfa71a0b992e298633b3a49a0820..f89cc393f478d455202acaa4d5a562038454019b 100644 (file)
@@ -37,6 +37,7 @@
 #include "gtksocket.h"
 #include "gtksocketprivate.h"
 #include "gtkdnd.h"
+#include "gtkintl.h"
 
 #include "gtkalias.h"
 
@@ -138,7 +139,7 @@ gtk_socket_get_type (void)
        (GInstanceInitFunc) gtk_socket_init,
       };
 
-      socket_type = g_type_register_static (GTK_TYPE_CONTAINER, g_intern_static_string ("GtkSocket"),
+      socket_type = g_type_register_static (GTK_TYPE_CONTAINER, I_("GtkSocket"),
                                            &socket_info, 0);
     }
 
@@ -192,7 +193,7 @@ gtk_socket_class_init (GtkSocketClass *class)
   container_class->forall = gtk_socket_forall;
 
   socket_signals[PLUG_ADDED] =
-    g_signal_new ("plug_added",
+    g_signal_new (I_("plug_added"),
                  G_OBJECT_CLASS_TYPE (class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkSocketClass, plug_added),
@@ -200,7 +201,7 @@ gtk_socket_class_init (GtkSocketClass *class)
                  _gtk_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);
   socket_signals[PLUG_REMOVED] =
-    g_signal_new ("plug_removed",
+    g_signal_new (I_("plug_removed"),
                  G_OBJECT_CLASS_TYPE (class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkSocketClass, plug_removed),
@@ -225,7 +226,7 @@ gtk_socket_init (GtkSocket *socket)
   socket->active = FALSE;
 
   socket->accel_group = gtk_accel_group_new ();
-  g_object_set_data (G_OBJECT (socket->accel_group), g_intern_static_string ("gtk-socket"), socket);
+  g_object_set_data (G_OBJECT (socket->accel_group), I_("gtk-socket"), socket);
 }
 
 /**
index b65877c4556d4b87423197af4af7e94089286b90..2c62c04aa224d9a85efca17ddc4c2b73369312cd 100644 (file)
@@ -176,7 +176,7 @@ gtk_spin_button_get_type (void)
       };
 
       spin_button_type =
-       g_type_register_static (GTK_TYPE_ENTRY, g_intern_static_string ("GtkSpinButton"),
+       g_type_register_static (GTK_TYPE_ENTRY, I_("GtkSpinButton"),
                                &spin_button_info, 0);
 
       g_type_add_interface_static (spin_button_type,
@@ -317,7 +317,7 @@ gtk_spin_button_class_init (GtkSpinButtonClass *class)
                                                                     GTK_PARAM_READABLE),
                                                  gtk_rc_property_parse_enum);
   spinbutton_signals[INPUT] =
-    g_signal_new ("input",
+    g_signal_new (I_("input"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkSpinButtonClass, input),
@@ -327,7 +327,7 @@ gtk_spin_button_class_init (GtkSpinButtonClass *class)
                  G_TYPE_POINTER);
 
   spinbutton_signals[OUTPUT] =
-    g_signal_new ("output",
+    g_signal_new (I_("output"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkSpinButtonClass, output),
@@ -336,7 +336,7 @@ gtk_spin_button_class_init (GtkSpinButtonClass *class)
                  G_TYPE_BOOLEAN, 0);
 
   spinbutton_signals[VALUE_CHANGED] =
-    g_signal_new ("value_changed",
+    g_signal_new (I_("value_changed"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkSpinButtonClass, value_changed),
@@ -346,7 +346,7 @@ gtk_spin_button_class_init (GtkSpinButtonClass *class)
 
   /* Action signals */
   spinbutton_signals[CHANGE_VALUE] =
-    g_signal_new ("change_value",
+    g_signal_new (I_("change_value"),
                   G_TYPE_FROM_CLASS (gobject_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                   G_STRUCT_OFFSET (GtkSpinButtonClass, change_value),
index e07b7b8007aeced245f07158bdfc4cb42d5b0f02..bfed9505cfed61694092af799525fb462c97a514 100644 (file)
@@ -117,7 +117,7 @@ gtk_statusbar_get_type (void)
         (GInstanceInitFunc) gtk_statusbar_init,
       };
 
-      statusbar_type = g_type_register_static (GTK_TYPE_HBOX, g_intern_static_string ("GtkStatusbar"),
+      statusbar_type = g_type_register_static (GTK_TYPE_HBOX, I_("GtkStatusbar"),
                                               &statusbar_info, 0);
     }
 
@@ -180,7 +180,7 @@ gtk_statusbar_class_init (GtkStatusbarClass *class)
                                                         TRUE,
                                                         GTK_PARAM_READWRITE));
   statusbar_signals[SIGNAL_TEXT_PUSHED] =
-    g_signal_new ("text_pushed",
+    g_signal_new (I_("text_pushed"),
                  G_OBJECT_CLASS_TYPE (class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkStatusbarClass, text_pushed),
@@ -190,7 +190,7 @@ gtk_statusbar_class_init (GtkStatusbarClass *class)
                  G_TYPE_UINT,
                  G_TYPE_STRING);
   statusbar_signals[SIGNAL_TEXT_POPPED] =
-    g_signal_new ("text_popped",
+    g_signal_new (I_("text_popped"),
                  G_OBJECT_CLASS_TYPE (class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkStatusbarClass, text_popped),
index d1f48458bd1d60596a1998c9a4ac3303fbb16fa5..30f0f78e828d33207f391f73ccfec3c2bcb82940 100755 (executable)
@@ -197,7 +197,7 @@ gtk_status_icon_class_init (GtkStatusIconClass *class)
    * Since: 2.10
    */
   status_icon_signals [ACTIVATE_SIGNAL] =
-    g_signal_new ("activate",
+    g_signal_new (I_("activate"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
                  G_STRUCT_OFFSET (GtkStatusIconClass, activate),
@@ -225,7 +225,7 @@ gtk_status_icon_class_init (GtkStatusIconClass *class)
    * Since: 2.10
    */
   status_icon_signals [POPUP_MENU_SIGNAL] =
-    g_signal_new ("popup-menu",
+    g_signal_new (I_("popup-menu"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
                  G_STRUCT_OFFSET (GtkStatusIconClass, popup_menu),
@@ -248,7 +248,7 @@ gtk_status_icon_class_init (GtkStatusIconClass *class)
    * Since: 2.10
    */
   status_icon_signals [SIZE_CHANGED_SIGNAL] =
-    g_signal_new ("size-changed",
+    g_signal_new (I_("size-changed"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_FIRST,
                  G_STRUCT_OFFSET (GtkStatusIconClass, size_changed),
index 85b08f09890ce0ef23e8b76907246e8140b074ec..d5cddc7f33293f9b5ae1ecb5e8ac3e3921ba30a2 100644 (file)
@@ -37,6 +37,7 @@
 #include "gtkthemes.h"
 #include "gtkiconfactory.h"
 #include "gtksettings.h"       /* _gtk_settings_parse_convert() */
+#include "gtkintl.h"
 #include "gtkalias.h"
 
 #define LIGHTNESS_MULT  1.3
@@ -376,7 +377,7 @@ gtk_style_get_type (void)
         (GInstanceInitFunc) gtk_style_init,
       };
       
-      style_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkStyle"),
+      style_type = g_type_register_static (G_TYPE_OBJECT, I_("GtkStyle"),
                                           &style_info, 0);
     }
   
@@ -545,7 +546,7 @@ gtk_style_class_init (GtkStyleClass *klass)
    *
    * Since: 2.4
    */
-  realize_signal = g_signal_new ("realize",
+  realize_signal = g_signal_new (I_("realize"),
                                 G_TYPE_FROM_CLASS (object_class),
                                 G_SIGNAL_RUN_FIRST,
                                 G_STRUCT_OFFSET (GtkStyleClass, realize),
@@ -563,7 +564,7 @@ gtk_style_class_init (GtkStyleClass *klass)
    *
    * Since: 2.4
    */
-  unrealize_signal = g_signal_new ("unrealize",
+  unrealize_signal = g_signal_new (I_("unrealize"),
                                   G_TYPE_FROM_CLASS (object_class),
                                   G_SIGNAL_RUN_FIRST,
                                   G_STRUCT_OFFSET (GtkStyleClass, unrealize),
@@ -6402,7 +6403,7 @@ gtk_border_get_type (void)
   static GType our_type = 0;
   
   if (our_type == 0)
-    our_type = g_boxed_type_register_static (g_intern_static_string ("GtkBorder"),
+    our_type = g_boxed_type_register_static (I_("GtkBorder"),
                                             (GBoxedCopyFunc) gtk_border_copy,
                                             (GBoxedFreeFunc) gtk_border_free);
 
@@ -6541,7 +6542,7 @@ style_unrealize_cursor_gcs (GtkStyle *style)
        gtk_gc_release (cursor_info->secondary_gc);
       
       g_free (cursor_info);
-      g_object_set_data (G_OBJECT (style), g_intern_static_string ("gtk-style-cursor-info"), NULL);
+      g_object_set_data (G_OBJECT (style), I_("gtk-style-cursor-info"), NULL);
     }
 }
 
@@ -6579,7 +6580,7 @@ get_insertion_cursor_gc (GtkWidget *widget,
   if (!cursor_info)
     {
       cursor_info = g_new (CursorInfo, 1);
-      g_object_set_data (G_OBJECT (widget->style), g_intern_static_string ("gtk-style-cursor-info"), cursor_info);
+      g_object_set_data (G_OBJECT (widget->style), I_("gtk-style-cursor-info"), cursor_info);
       cursor_info->primary_gc = NULL;
       cursor_info->secondary_gc = NULL;
       cursor_info->for_type = G_TYPE_INVALID;
index 9c4a250d09f9f389eb4166f0ce69d868e388bd3d..2ab0054df81201c833342b3daa5e06253517e380 100644 (file)
@@ -123,7 +123,7 @@ gtk_table_get_type (void)
        (GInstanceInitFunc) gtk_table_init,
       };
       
-      table_type = g_type_register_static (GTK_TYPE_CONTAINER, g_intern_static_string ("GtkTable"),
+      table_type = g_type_register_static (GTK_TYPE_CONTAINER, I_("GtkTable"),
                                           &table_info, 0);
     }
   
index 4d47284045dd40cefbe9bcbf76ba4106d4eea8f0..1c61856e57660828ee7e38d69074ca078f111b04 100644 (file)
@@ -28,6 +28,7 @@
 
 #include "gtkmenu.h"
 #include "gtktearoffmenuitem.h"
+#include "gtkintl.h"
 #include "gtkalias.h"
 
 #define ARROW_SIZE 10
@@ -65,7 +66,7 @@ gtk_tearoff_menu_item_get_type (void)
       };
 
       tearoff_menu_item_type =
-       g_type_register_static (GTK_TYPE_MENU_ITEM, g_intern_static_string ("GtkTearoffMenuItem"),
+       g_type_register_static (GTK_TYPE_MENU_ITEM, I_("GtkTearoffMenuItem"),
                                &tearoff_menu_item_info, 0);
     }
 
index 14902669fb3442c7dba6810f8247e901f81c72c8..8ad8463d4a061fdc3df8e50b787072fdda888a5a 100644 (file)
@@ -540,7 +540,7 @@ gtk_text_get_type (void)
        NULL  /* interface_data */
       };
       
-      g_intern_static_string ("GtkText");
+      I_("GtkText");
       text_type = gtk_type_unique (GTK_TYPE_OLD_EDITABLE, &text_info);
       g_type_add_interface_static (text_type,
                                   GTK_TYPE_EDITABLE,
@@ -634,7 +634,7 @@ gtk_text_class_init (GtkTextClass *class)
                                                         GTK_PARAM_READWRITE));
 
   widget_class->set_scroll_adjustments_signal =
-    gtk_signal_new ("set_scroll_adjustments",
+    gtk_signal_new (I_("set_scroll_adjustments"),
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkTextClass, set_scroll_adjustments),
index 29a41cb0e77db5d67a8a0613ccee44ec60d6b46c..149fbe981b532936c5984158f380184c317a3e0c 100644 (file)
@@ -155,7 +155,7 @@ gtk_text_buffer_get_type (void)
         (GInstanceInitFunc) gtk_text_buffer_init
       };
 
-      our_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkTextBuffer"),
+      our_type = g_type_register_static (G_TYPE_OBJECT, I_("GtkTextBuffer"),
                                          &our_info, 0);
     }
 
@@ -209,7 +209,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
                                                         GTK_PARAM_READWRITE));
 
   signals[INSERT_TEXT] =
-    g_signal_new ("insert_text",
+    g_signal_new (I_("insert_text"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTextBufferClass, insert_text),
@@ -222,7 +222,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
                   G_TYPE_INT);
 
   signals[INSERT_PIXBUF] =
-    g_signal_new ("insert_pixbuf",
+    g_signal_new (I_("insert_pixbuf"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTextBufferClass, insert_pixbuf),
@@ -234,7 +234,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
                   GDK_TYPE_PIXBUF);
 
   signals[INSERT_CHILD_ANCHOR] =
-    g_signal_new ("insert_child_anchor",
+    g_signal_new (I_("insert_child_anchor"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTextBufferClass, insert_child_anchor),
@@ -259,7 +259,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
    * those don't have access to the deleted text.
    */
   signals[DELETE_RANGE] =
-    g_signal_new ("delete_range",
+    g_signal_new (I_("delete_range"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTextBufferClass, delete_range),
@@ -271,7 +271,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
                   GTK_TYPE_TEXT_ITER | G_SIGNAL_TYPE_STATIC_SCOPE);
 
   signals[CHANGED] =
-    g_signal_new ("changed",
+    g_signal_new (I_("changed"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,                   
                   G_STRUCT_OFFSET (GtkTextBufferClass, changed),
@@ -281,7 +281,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
                   0);
 
   signals[MODIFIED_CHANGED] =
-    g_signal_new ("modified_changed",
+    g_signal_new (I_("modified_changed"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTextBufferClass, modified_changed),
@@ -291,7 +291,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
                   0);
 
   signals[MARK_SET] =
-    g_signal_new ("mark_set",
+    g_signal_new (I_("mark_set"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,                   
                   G_STRUCT_OFFSET (GtkTextBufferClass, mark_set),
@@ -303,7 +303,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
                   GTK_TYPE_TEXT_MARK);
 
   signals[MARK_DELETED] =
-    g_signal_new ("mark_deleted",
+    g_signal_new (I_("mark_deleted"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,                   
                   G_STRUCT_OFFSET (GtkTextBufferClass, mark_deleted),
@@ -314,7 +314,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
                   GTK_TYPE_TEXT_MARK);
   
   signals[APPLY_TAG] =
-    g_signal_new ("apply_tag",
+    g_signal_new (I_("apply_tag"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTextBufferClass, apply_tag),
@@ -327,7 +327,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
                   GTK_TYPE_TEXT_ITER);
 
   signals[REMOVE_TAG] =
-    g_signal_new ("remove_tag",
+    g_signal_new (I_("remove_tag"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTextBufferClass, remove_tag),
@@ -340,7 +340,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
                   GTK_TYPE_TEXT_ITER);
 
   signals[BEGIN_USER_ACTION] =
-    g_signal_new ("begin_user_action",
+    g_signal_new (I_("begin_user_action"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,                   
                   G_STRUCT_OFFSET (GtkTextBufferClass, begin_user_action),
@@ -350,7 +350,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
                   0);
 
   signals[END_USER_ACTION] =
-    g_signal_new ("end_user_action",
+    g_signal_new (I_("end_user_action"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,                   
                   G_STRUCT_OFFSET (GtkTextBufferClass, end_user_action),
@@ -2811,7 +2811,7 @@ create_clipboard_contents_buffer (GtkTextBuffer *buffer)
 
   contents = gtk_text_buffer_new (gtk_text_buffer_get_tag_table (buffer));
 
-  g_object_set_data (G_OBJECT (contents), g_intern_static_string ("gtk-text-buffer-clipboard"), GINT_TO_POINTER (1));
+  g_object_set_data (G_OBJECT (contents), I_("gtk-text-buffer-clipboard"), GINT_TO_POINTER (1));
   
   return contents;
 }
index 7f7c73d240507a45fb16fd60031ac78edcfb75c6..05a1a3c7e32dd539b3bee70b75b944f51c018935 100644 (file)
@@ -52,6 +52,7 @@
 #include "gtktextchild.h"
 #include "gtktextbtree.h"
 #include "gtktextlayout.h"
+#include "gtkintl.h"
 #include "gtkalias.h"
 
 #define CHECK_IN_BUFFER(anchor)                                                            \
@@ -299,7 +300,7 @@ _gtk_anchored_child_set_layout (GtkWidget     *child,
                                 GtkTextLayout *layout)
 {
   g_object_set_data (G_OBJECT (child),
-                     g_intern_static_string ("gtk-text-child-anchor-layout"),
+                     I_("gtk-text-child-anchor-layout"),
                      layout);  
 }
      
@@ -329,7 +330,7 @@ gtk_text_child_anchor_get_type (void)
         (GInstanceInitFunc) gtk_text_child_anchor_init,
       };
 
-      object_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkTextChildAnchor"),
+      object_type = g_type_register_static (G_TYPE_OBJECT, I_("GtkTextChildAnchor"),
                                             &object_info, 0);
     }
 
index 47be831749f7ec075e66cdc9f5dc1d57f2cbca2f..0a16785addeebad7ccd5bc8ceec831897a13b1ca 100644 (file)
@@ -77,6 +77,7 @@
 #define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
 #include <config.h>
 #include "gtktextdisplay.h"
+#include "gtkintl.h"
 #include "gtkalias.h"
 /* DO NOT go putting private headers in here. This file should only
  * use the semi-public headers, as with gtktextview.c.
@@ -651,7 +652,7 @@ on_renderer_display_closed (GdkDisplay       *display,
   g_signal_handlers_disconnect_by_func (text_renderer->screen,
                                        (gpointer)on_renderer_display_closed,
                                        text_renderer);
-  g_object_set_data (G_OBJECT (text_renderer->screen), g_intern_static_string ("gtk-text-renderer"), NULL);
+  g_object_set_data (G_OBJECT (text_renderer->screen), I_("gtk-text-renderer"), NULL);
 }
 
 static GtkTextRenderer *
@@ -667,7 +668,7 @@ get_text_renderer (GdkScreen *screen)
       text_renderer = g_object_new (GTK_TYPE_TEXT_RENDERER, "screen", screen, NULL);
       text_renderer->screen = screen;
       
-      g_object_set_data_full (G_OBJECT (screen), g_intern_static_string ("gtk-text-renderer"), text_renderer,
+      g_object_set_data_full (G_OBJECT (screen), I_("gtk-text-renderer"), text_renderer,
                              (GDestroyNotify)g_object_unref);
 
       g_signal_connect (gdk_screen_get_display (screen), "closed",
index b2335274f64266d90b66d860b4c2f98fc53edf7b..85598c95b72670931498d02e65cd16fdad126883 100644 (file)
@@ -82,6 +82,7 @@
 #include "gtktextlayout.h"
 #include "gtktextbtree.h"
 #include "gtktextiterprivate.h"
+#include "gtkintl.h"
 #include "gtkalias.h"
 
 #include <stdlib.h>
@@ -184,7 +185,7 @@ gtk_text_layout_get_type (void)
         (GInstanceInitFunc) gtk_text_layout_init
       };
 
-      our_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkTextLayout"),
+      our_type = g_type_register_static (G_TYPE_OBJECT, I_("GtkTextLayout"),
                                          &our_info, 0);
     }
 
@@ -205,7 +206,7 @@ gtk_text_layout_class_init (GtkTextLayoutClass *klass)
   klass->free_line_data = gtk_text_layout_real_free_line_data;
 
   signals[INVALIDATED] =
-    g_signal_new ("invalidated",
+    g_signal_new (I_("invalidated"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTextLayoutClass, invalidated),
@@ -215,7 +216,7 @@ gtk_text_layout_class_init (GtkTextLayoutClass *klass)
                   0);
 
   signals[CHANGED] =
-    g_signal_new ("changed",
+    g_signal_new (I_("changed"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTextLayoutClass, changed),
@@ -228,7 +229,7 @@ gtk_text_layout_class_init (GtkTextLayoutClass *klass)
                   G_TYPE_INT);
 
   signals[ALLOCATE_CHILD] =
-    g_signal_new ("allocate_child",
+    g_signal_new (I_("allocate_child"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTextLayoutClass, allocate_child),
index a6d7a04c6d6477d9d07637d04c195b215bedd21b..260cc44d1d1c29e77c4cb4085186c9034b0c30bd 100644 (file)
@@ -50,6 +50,7 @@
 #define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
 #include <config.h>
 #include "gtktextbtree.h"
+#include "gtkintl.h"
 #include "gtkalias.h"
 
 static void gtk_text_mark_init       (GtkTextMark      *mark);
@@ -79,7 +80,7 @@ gtk_text_mark_get_type (void)
         (GInstanceInitFunc) gtk_text_mark_init,
       };
 
-      object_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkTextMark"),
+      object_type = g_type_register_static (G_TYPE_OBJECT, I_("GtkTextMark"),
                                             &object_info, 0);
     }
 
index ac942269ccb9be921adca4ae91eade37e0ca2de2..99d831f43356fad964fc3c56570f11eee3b74c05 100644 (file)
@@ -175,7 +175,7 @@ gtk_text_tag_get_type (void)
         (GInstanceInitFunc) gtk_text_tag_init
       };
 
-      our_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkTextTag"),
+      our_type = g_type_register_static (G_TYPE_OBJECT, I_("GtkTextTag"),
                                          &our_info, 0);
     }
 
@@ -665,7 +665,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                 P_("Whether this tag affects the paragraph background color"));
   
   signals[EVENT] =
-    g_signal_new ("event",
+    g_signal_new (I_("event"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTextTagClass, event),
@@ -1971,7 +1971,7 @@ gtk_text_attributes_get_type (void)
   static GType our_type = 0;
   
   if (our_type == 0)
-    our_type = g_boxed_type_register_static (g_intern_static_string ("GtkTextAttributes"),
+    our_type = g_boxed_type_register_static (I_("GtkTextAttributes"),
                                             (GBoxedCopyFunc) gtk_text_attributes_ref,
                                             (GBoxedFreeFunc) gtk_text_attributes_unref);
 
index 1dd1c18f646281e1e505f9cf0266f9ecadb0a31d..8d22070e2b609717b11c3c3c52cf6b1b5a45b24c 100644 (file)
@@ -28,6 +28,7 @@
 #include "gtktexttagtable.h"
 #include "gtkmarshalers.h"
 #include "gtktextbuffer.h" /* just for the lame notify_will_remove_tag hack */
+#include "gtkintl.h"
 #include "gtkalias.h"
 
 #include <stdlib.h>
@@ -78,7 +79,7 @@ gtk_text_tag_table_get_type (void)
         (GInstanceInitFunc) gtk_text_tag_table_init
       };
 
-      our_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkTextTagTable"),
+      our_type = g_type_register_static (G_TYPE_OBJECT, I_("GtkTextTagTable"),
                                          &our_info, 0);
     }
 
@@ -98,7 +99,7 @@ gtk_text_tag_table_class_init (GtkTextTagTableClass *klass)
   object_class->finalize = gtk_text_tag_table_finalize;
   
   signals[TAG_CHANGED] =
-    g_signal_new ("tag_changed",
+    g_signal_new (I_("tag_changed"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTextTagTableClass, tag_changed),
@@ -110,7 +111,7 @@ gtk_text_tag_table_class_init (GtkTextTagTableClass *klass)
                   G_TYPE_BOOLEAN);  
 
   signals[TAG_ADDED] =
-    g_signal_new ("tag_added",
+    g_signal_new (I_("tag_added"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTextTagTableClass, tag_added),
@@ -121,7 +122,7 @@ gtk_text_tag_table_class_init (GtkTextTagTableClass *klass)
                   GTK_TYPE_TEXT_TAG);
 
   signals[TAG_REMOVED] =
-    g_signal_new ("tag_removed",                   
+    g_signal_new (I_("tag_removed"),  
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTextTagTableClass, tag_removed),
index 440e30be0923bced7bc1b9a9b11f5dc2e7913f17..7552a8cb8c84ed3f82fc23918eb291d3df110656 100644 (file)
@@ -110,7 +110,7 @@ _gtk_text_util_append_special_char_menuitems (GtkMenuShell              *menushe
       info->data = data;
       
       menuitem = gtk_menu_item_new_with_mnemonic (_(bidi_menu_entries[i].label));
-      g_object_set_data (G_OBJECT (menuitem), g_intern_static_string ("gtk-unicode-menu-entry"),
+      g_object_set_data (G_OBJECT (menuitem), I_("gtk-unicode-menu-entry"),
                          (gpointer)&bidi_menu_entries[i]);
       
       g_signal_connect_data (menuitem, "activate",
index d95017041524d27228cad3ff2e067838315258bc..6f5aa59202f4d60bbfc3dd5b4944b2890dc585c2 100644 (file)
@@ -441,7 +441,7 @@ gtk_text_view_get_type (void)
        (GInstanceInitFunc) gtk_text_view_init,
       };
 
-      our_type = g_type_register_static (GTK_TYPE_CONTAINER, g_intern_static_string ("GtkTextView"),
+      our_type = g_type_register_static (GTK_TYPE_CONTAINER, I_("GtkTextView"),
                                         &our_info, 0);
     }
 
@@ -698,7 +698,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
    *
    */
   signals[MOVE_CURSOR] = 
-    g_signal_new ("move_cursor",
+    g_signal_new (I_("move_cursor"),
                  G_OBJECT_CLASS_TYPE (gobject_class), 
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, 
                  G_STRUCT_OFFSET (GtkTextViewClass, move_cursor),
@@ -710,7 +710,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
                  G_TYPE_BOOLEAN);
 
   signals[PAGE_HORIZONTALLY] =
-    g_signal_new ("page_horizontally",
+    g_signal_new (I_("page_horizontally"),
                  G_OBJECT_CLASS_TYPE (gobject_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                  G_STRUCT_OFFSET (GtkTextViewClass, page_horizontally),
@@ -721,7 +721,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
                  G_TYPE_BOOLEAN);
   
   signals[MOVE_VIEWPORT] =
-    _gtk_binding_signal_new ("move_viewport",
+    _gtk_binding_signal_new (I_("move_viewport"),
                             G_OBJECT_CLASS_TYPE (gobject_class),
                             G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                             G_CALLBACK (gtk_text_view_move_viewport),
@@ -732,7 +732,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
                             G_TYPE_INT);
 
   signals[SET_ANCHOR] =
-    g_signal_new ("set_anchor",
+    g_signal_new (I_("set_anchor"),
                  G_OBJECT_CLASS_TYPE (gobject_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                  G_STRUCT_OFFSET (GtkTextViewClass, set_anchor),
@@ -741,7 +741,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
                  G_TYPE_NONE, 0);
 
   signals[INSERT_AT_CURSOR] =
-    g_signal_new ("insert_at_cursor",
+    g_signal_new (I_("insert_at_cursor"),
                  G_OBJECT_CLASS_TYPE (gobject_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                  G_STRUCT_OFFSET (GtkTextViewClass, insert_at_cursor),
@@ -751,7 +751,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
                  G_TYPE_STRING);
 
   signals[DELETE_FROM_CURSOR] =
-    g_signal_new ("delete_from_cursor",
+    g_signal_new (I_("delete_from_cursor"),
                  G_OBJECT_CLASS_TYPE (gobject_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                  G_STRUCT_OFFSET (GtkTextViewClass, delete_from_cursor),
@@ -762,7 +762,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
                  G_TYPE_INT);
 
   signals[BACKSPACE] =
-    g_signal_new ("backspace",
+    g_signal_new (I_("backspace"),
                  G_OBJECT_CLASS_TYPE (gobject_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                  G_STRUCT_OFFSET (GtkTextViewClass, backspace),
@@ -771,7 +771,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
                  G_TYPE_NONE, 0);
 
   signals[CUT_CLIPBOARD] =
-    g_signal_new ("cut_clipboard",
+    g_signal_new (I_("cut_clipboard"),
                  G_OBJECT_CLASS_TYPE (gobject_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                  G_STRUCT_OFFSET (GtkTextViewClass, cut_clipboard),
@@ -780,7 +780,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
                  G_TYPE_NONE, 0);
 
   signals[COPY_CLIPBOARD] =
-    g_signal_new ("copy_clipboard",
+    g_signal_new (I_("copy_clipboard"),
                  G_OBJECT_CLASS_TYPE (gobject_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                  G_STRUCT_OFFSET (GtkTextViewClass, copy_clipboard),
@@ -789,7 +789,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
                  G_TYPE_NONE, 0);
 
   signals[PASTE_CLIPBOARD] =
-    g_signal_new ("paste_clipboard",
+    g_signal_new (I_("paste_clipboard"),
                  G_OBJECT_CLASS_TYPE (gobject_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                  G_STRUCT_OFFSET (GtkTextViewClass, paste_clipboard),
@@ -798,7 +798,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
                  G_TYPE_NONE, 0);
 
   signals[TOGGLE_OVERWRITE] =
-    g_signal_new ("toggle_overwrite",
+    g_signal_new (I_("toggle_overwrite"),
                  G_OBJECT_CLASS_TYPE (gobject_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                  G_STRUCT_OFFSET (GtkTextViewClass, toggle_overwrite),
@@ -807,7 +807,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
                  G_TYPE_NONE, 0);
 
   signals[MOVE_FOCUS] =
-    g_signal_new ("move_focus",
+    g_signal_new (I_("move_focus"),
                  G_OBJECT_CLASS_TYPE (gobject_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                  G_STRUCT_OFFSET (GtkTextViewClass, move_focus),
@@ -817,7 +817,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
                  GTK_TYPE_DIRECTION_TYPE);
   
   signals[SET_SCROLL_ADJUSTMENTS] =
-    g_signal_new ("set_scroll_adjustments",
+    g_signal_new (I_("set_scroll_adjustments"),
                  G_OBJECT_CLASS_TYPE (gobject_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                  G_STRUCT_OFFSET (GtkTextViewClass, set_scroll_adjustments),
@@ -829,7 +829,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
   widget_class->set_scroll_adjustments_signal = signals[SET_SCROLL_ADJUSTMENTS];
 
   signals[POPULATE_POPUP] =
-    g_signal_new ("populate_popup",
+    g_signal_new (I_("populate_popup"),
                  G_OBJECT_CLASS_TYPE (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkTextViewClass, populate_popup),
@@ -839,7 +839,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
                  GTK_TYPE_MENU);
   
   signals[SELECT_ALL] =
-    _gtk_binding_signal_new ("select_all",
+    _gtk_binding_signal_new (I_("select_all"),
                             G_OBJECT_CLASS_TYPE (object_class),
                             G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                             G_CALLBACK (gtk_text_view_select_all),
@@ -6899,7 +6899,7 @@ append_action_signal (GtkTextView  *text_view,
 {
   GtkWidget *menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL);
 
-  g_object_set_data (G_OBJECT (menuitem), g_intern_static_string ("gtk-signal"), (char *)signal);
+  g_object_set_data (G_OBJECT (menuitem), I_("gtk-signal"), (char *)signal);
   g_signal_connect (menuitem, "activate",
                    G_CALLBACK (activate_cb), text_view);
 
@@ -8087,7 +8087,7 @@ text_view_child_new_anchored (GtkWidget          *child,
   g_object_ref (vc->anchor);
 
   g_object_set_data (G_OBJECT (child),
-                     g_intern_static_string ("gtk-text-view-child"),
+                     I_("gtk-text-view-child"),
                      vc);
 
   gtk_text_child_anchor_register_child (anchor, child, layout);
@@ -8118,7 +8118,7 @@ text_view_child_new_window (GtkWidget          *child,
   vc->y = y;
 
   g_object_set_data (G_OBJECT (child),
-                     g_intern_static_string ("gtk-text-view-child"),
+                     I_("gtk-text-view-child"),
                      vc);
   
   return vc;
@@ -8128,7 +8128,7 @@ static void
 text_view_child_free (GtkTextViewChild *child)
 {
   g_object_set_data (G_OBJECT (child->widget),
-                     g_intern_static_string ("gtk-text-view-child"), NULL);
+                     I_("gtk-text-view-child"), NULL);
 
   if (child->anchor)
     {
index 141791df4d6f1ca02a3d1a3a292e68bfc4080d95..1e5e0cc5aedafa050f2700c2fe91fe6a8146c321 100644 (file)
@@ -150,7 +150,7 @@ gtk_theme_engine_get_type (void)
       };
 
       theme_engine_type =
-       g_type_register_static (G_TYPE_TYPE_MODULE, g_intern_static_string ("GtkThemeEngine"),
+       g_type_register_static (G_TYPE_TYPE_MODULE, I_("GtkThemeEngine"),
                                &theme_engine_info, 0);
     }
   
index 4563fe813ca23811f4ac960146bc01a3190bb12b..042365d890134630095d084f2d65b40d904f59f1 100644 (file)
@@ -105,7 +105,7 @@ gtk_tips_query_get_type (void)
        (GtkClassInitFunc) NULL,
       };
 
-      g_intern_static_string ("GtkTipsQuery");
+      I_("GtkTipsQuery");
       tips_query_type = gtk_type_unique (gtk_label_get_type (), &tips_query_info);
     }
 
@@ -141,21 +141,21 @@ gtk_tips_query_class_init (GtkTipsQueryClass *class)
   gtk_object_add_arg_type ("GtkTipsQuery::label-no-tip", GTK_TYPE_STRING, GTK_ARG_READWRITE | G_PARAM_STATIC_NAME, ARG_LABEL_NO_TIP);
 
   tips_query_signals[SIGNAL_START_QUERY] =
-    gtk_signal_new ("start_query",
+    gtk_signal_new (I_("start_query"),
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkTipsQueryClass, start_query),
                    _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   tips_query_signals[SIGNAL_STOP_QUERY] =
-    gtk_signal_new ("stop_query",
+    gtk_signal_new (I_("stop_query"),
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkTipsQueryClass, stop_query),
                    _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   tips_query_signals[SIGNAL_WIDGET_ENTERED] =
-    gtk_signal_new ("widget_entered",
+    gtk_signal_new (I_("widget_entered"),
                    GTK_RUN_LAST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkTipsQueryClass, widget_entered),
@@ -165,7 +165,7 @@ gtk_tips_query_class_init (GtkTipsQueryClass *class)
                    GTK_TYPE_STRING,
                    GTK_TYPE_STRING);
   tips_query_signals[SIGNAL_WIDGET_SELECTED] =
-    g_signal_new ("widget_selected",
+    g_signal_new (I_("widget_selected"),
                   G_TYPE_FROM_CLASS(object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET(GtkTipsQueryClass, widget_selected),
index 7c6a00415e0f02c91d24f0b77febc8bdca6d46ca..547157ed90aa553e6fac8c0f8dedc591f4c62c2d 100644 (file)
@@ -75,7 +75,7 @@ gtk_toggle_action_get_type (void)
       };
 
       type = g_type_register_static (GTK_TYPE_ACTION,
-                                     g_intern_static_string ("GtkToggleAction"),
+                                     I_("GtkToggleAction"),
                                      &type_info, 0);
     }
   return type;
@@ -134,7 +134,7 @@ gtk_toggle_action_class_init (GtkToggleActionClass *klass)
                                                          GTK_PARAM_READWRITE));
 
   action_signals[TOGGLED] =
-    g_signal_new ("toggled",
+    g_signal_new (I_("toggled"),
                   G_OBJECT_CLASS_TYPE (klass),
                   G_SIGNAL_RUN_FIRST,
                   G_STRUCT_OFFSET (GtkToggleActionClass, toggled),
index 46fa079da85acd5fe49ee56eeada6699274816c5..a850f3d5b42b6d5e17c4949b9d4609671e65ef78 100644 (file)
@@ -93,7 +93,7 @@ gtk_toggle_button_get_type (void)
       };
 
       toggle_button_type =
-       g_type_register_static (GTK_TYPE_BUTTON, g_intern_static_string ("GtkToggleButton"),
+       g_type_register_static (GTK_TYPE_BUTTON, I_("GtkToggleButton"),
                                &toggle_button_info, 0);
     }
 
@@ -154,7 +154,7 @@ gtk_toggle_button_class_init (GtkToggleButtonClass *class)
                                                         GTK_PARAM_READWRITE));
 
   toggle_button_signals[TOGGLED] =
-    g_signal_new ("toggled",
+    g_signal_new (I_("toggled"),
                  G_OBJECT_CLASS_TYPE (gobject_class),
                  G_SIGNAL_RUN_FIRST,
                  G_STRUCT_OFFSET (GtkToggleButtonClass, toggled),
index cabae8800cf18ca10ae5c67d51b30240e80e5157..740ea1934a3738375f8b547c7a4f1b7e6258cbb9 100644 (file)
@@ -93,7 +93,7 @@ gtk_toggle_tool_button_get_type (void)
        };
 
       type = g_type_register_static (GTK_TYPE_TOOL_BUTTON,
-                                    g_intern_static_string ("GtkToggleToolButton"), &type_info, 0);
+                                    I_("GtkToggleToolButton"), &type_info, 0);
     }
   return type;
 }
@@ -140,7 +140,7 @@ gtk_toggle_tool_button_class_init (GtkToggleToolButtonClass *klass)
  * Emitted whenever the toggle tool button changes state.
  **/
   toggle_signals[TOGGLED] =
-    g_signal_new ("toggled",
+    g_signal_new (I_("toggled"),
                  G_OBJECT_CLASS_TYPE (klass),
                  G_SIGNAL_RUN_FIRST,
                  G_STRUCT_OFFSET (GtkToggleToolButtonClass, toggled),
index 0807732299a7cc5b86526dc1d1a5754769355d34..8a60d4614986111e6d6961d2f4be7d5c3e8fbeab 100644 (file)
@@ -324,7 +324,7 @@ gtk_toolbar_get_type (void)
        };
       
       type = g_type_register_static (GTK_TYPE_CONTAINER,
-                                    g_intern_static_string ("GtkToolbar"),
+                                    I_("GtkToolbar"),
                                     &type_info, 0);
     }
   
@@ -412,7 +412,7 @@ gtk_toolbar_class_init (GtkToolbarClass *klass)
    * Emitted when the orientation of the toolbar changes.
    */
   toolbar_signals[ORIENTATION_CHANGED] =
-    g_signal_new ("orientation-changed",
+    g_signal_new (I_("orientation-changed"),
                  G_OBJECT_CLASS_TYPE (klass),
                  G_SIGNAL_RUN_FIRST,
                  G_STRUCT_OFFSET (GtkToolbarClass, orientation_changed),
@@ -428,7 +428,7 @@ gtk_toolbar_class_init (GtkToolbarClass *klass)
    * Emitted when the style of the toolbar changes. 
    */
   toolbar_signals[STYLE_CHANGED] =
-    g_signal_new ("style-changed",
+    g_signal_new (I_("style-changed"),
                  G_OBJECT_CLASS_TYPE (klass),
                  G_SIGNAL_RUN_FIRST,
                  G_STRUCT_OFFSET (GtkToolbarClass, style_changed),
@@ -455,7 +455,7 @@ gtk_toolbar_class_init (GtkToolbarClass *klass)
    * Return value: return %TRUE if the signal was handled, %FALSE if not
    */
   toolbar_signals[POPUP_CONTEXT_MENU] =
-    g_signal_new ("popup_context_menu",
+    g_signal_new (I_("popup_context_menu"),
                  G_OBJECT_CLASS_TYPE (klass),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkToolbarClass, popup_context_menu),
@@ -475,7 +475,7 @@ gtk_toolbar_class_init (GtkToolbarClass *klass)
    * Return value: %TRUE if the signal was handled, %FALSE if not
    */
   toolbar_signals[MOVE_FOCUS] =
-    _gtk_binding_signal_new ("move_focus",
+    _gtk_binding_signal_new (I_("move_focus"),
                             G_TYPE_FROM_CLASS (klass),
                             G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                             G_CALLBACK (gtk_toolbar_move_focus),
@@ -494,7 +494,7 @@ gtk_toolbar_class_init (GtkToolbarClass *klass)
    * Return value: %TRUE if the signal was handled, %FALSE if not
    */
   toolbar_signals[FOCUS_HOME_OR_END] =
-    _gtk_binding_signal_new ("focus_home_or_end",
+    _gtk_binding_signal_new (I_("focus_home_or_end"),
                             G_OBJECT_CLASS_TYPE (klass),
                             G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                             G_CALLBACK (gtk_toolbar_focus_home_or_end),
index 4fb6c1d4247289843d9ac8ddfc5b7ec2f65db0aa..8d53c83ba56b9141f1bfc428c80aa3dbd366469f 100644 (file)
@@ -116,7 +116,7 @@ gtk_tool_button_get_type (void)
        };
 
       type = g_type_register_static (GTK_TYPE_TOOL_ITEM,
-                                    g_intern_static_string ("GtkToolButton"),
+                                    I_("GtkToolButton"),
                                     &type_info, 0);
     }
   return type;
@@ -242,7 +242,7 @@ gtk_tool_button_class_init (GtkToolButtonClass *klass)
  * or activated with the keyboard.
  **/
   toolbutton_signals[CLICKED] =
-    g_signal_new ("clicked",
+    g_signal_new (I_("clicked"),
                  G_OBJECT_CLASS_TYPE (klass),
                  G_SIGNAL_RUN_FIRST,
                  G_STRUCT_OFFSET (GtkToolButtonClass, clicked),
index 83deeb9ab01eb8a8b0ec8956605573941292cd38..35407444a28c9bb89e8314bf1b5437153bf6b31a 100644 (file)
@@ -122,7 +122,7 @@ gtk_tool_item_get_type (void)
        };
 
       type = g_type_register_static (GTK_TYPE_BIN,
-                                    g_intern_static_string ("GtkToolItem"),
+                                    I_("GtkToolItem"),
                                     &type_info, 0);
     }
   return type;
@@ -206,7 +206,7 @@ gtk_tool_item_class_init (GtkToolItemClass *klass)
  * Return value: %TRUE if the signal was handled, %FALSE if not
  **/
   toolitem_signals[CREATE_MENU_PROXY] =
-    g_signal_new ("create_menu_proxy",
+    g_signal_new (I_("create_menu_proxy"),
                  G_OBJECT_CLASS_TYPE (klass),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkToolItemClass, create_menu_proxy),
@@ -231,7 +231,7 @@ gtk_tool_item_class_init (GtkToolItemClass *klass)
  * themselves accordingly.
  **/
   toolitem_signals[TOOLBAR_RECONFIGURED] =
-    g_signal_new ("toolbar_reconfigured",
+    g_signal_new (I_("toolbar_reconfigured"),
                  G_OBJECT_CLASS_TYPE (klass),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkToolItemClass, toolbar_reconfigured),
@@ -252,7 +252,7 @@ gtk_tool_item_class_init (GtkToolItemClass *klass)
  * Return value: %TRUE if the signal was handled, %FALSE if not
  **/
   toolitem_signals[SET_TOOLTIP] =
-    g_signal_new ("set_tooltip",
+    g_signal_new (I_("set_tooltip"),
                  G_OBJECT_CLASS_TYPE (klass),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkToolItemClass, set_tooltip),
index 12a2761dc774a15f334f3a3703c3ec0e21e25c0a..484d34335ba44658d64428b6955f9cfd1ff40806 100644 (file)
@@ -37,6 +37,7 @@
 #include "gtkwindow.h"
 #include "gtkstyle.h"
 #include "gtktooltips.h"
+#include "gtkintl.h"
 #include "gtkalias.h"
 
 
@@ -92,7 +93,7 @@ gtk_tooltips_get_type (void)
        (GInstanceInitFunc) gtk_tooltips_init,
       };
 
-      tooltips_type = g_type_register_static (GTK_TYPE_OBJECT, g_intern_static_string ("GtkTooltips"),
+      tooltips_type = g_type_register_static (GTK_TYPE_OBJECT, I_("GtkTooltips"),
                                              &tooltips_info, 0);
     }
 
@@ -148,7 +149,7 @@ gtk_tooltips_destroy_data (GtkTooltipsData *tooltipsdata)
                                        gtk_tooltips_widget_remove,
                                        tooltipsdata);
 
-  g_object_set_data (G_OBJECT (tooltipsdata->widget), g_intern_static_string (tooltips_data_key), NULL);
+  g_object_set_data (G_OBJECT (tooltipsdata->widget), I_(tooltips_data_key), NULL);
   g_object_unref (tooltipsdata->widget);
   g_free (tooltipsdata);
 }
@@ -361,7 +362,7 @@ gtk_tooltips_set_tip (GtkTooltips *tooltips,
                               G_CALLBACK (gtk_tooltips_event_handler),
                              tooltipsdata);
 
-      g_object_set_data (G_OBJECT (widget), g_intern_static_string (tooltips_data_key),
+      g_object_set_data (G_OBJECT (widget), I_(tooltips_data_key),
                          tooltipsdata);
 
       g_signal_connect (widget, "unmap",
@@ -415,7 +416,7 @@ gtk_tooltips_draw_tips (GtkTooltips *tooltips)
   style = tooltips->tip_window->style;
   
   widget = tooltips->active_tips_data->widget;
-  g_object_set_data (G_OBJECT (tooltips->tip_window), g_intern_static_string (tooltips_info_key),
+  g_object_set_data (G_OBJECT (tooltips->tip_window), I_(tooltips_info_key),
                      tooltips);
 
   keyboard_mode = get_keyboard_mode (widget);
@@ -588,7 +589,7 @@ start_keyboard_mode (GtkWidget *widget)
     {
       GtkWidget *focus = GTK_WINDOW (toplevel)->focus_widget;
 
-      g_object_set_data (G_OBJECT (toplevel), g_intern_static_string ("gtk-tooltips-keyboard-mode"), GUINT_TO_POINTER (TRUE));
+      g_object_set_data (G_OBJECT (toplevel), I_("gtk-tooltips-keyboard-mode"), GUINT_TO_POINTER (TRUE));
 
       if (focus)
        gtk_tooltips_show_tip (focus);
@@ -605,7 +606,7 @@ stop_keyboard_mode (GtkWidget *widget)
       if (focus)
        gtk_tooltips_hide_tip (focus);
       
-      g_object_set_data (G_OBJECT (toplevel), g_intern_static_string ("gtk-tooltips-keyboard-mode"), GUINT_TO_POINTER (FALSE));
+      g_object_set_data (G_OBJECT (toplevel), I_("gtk-tooltips-keyboard-mode"), GUINT_TO_POINTER (FALSE));
     }
 }
 
index 79276dbbb80a30f60b3902e6daca3bad44390039..c123c0deb141891b266d7e85d051d8e513afb7d9 100644 (file)
@@ -35,6 +35,7 @@
 #define GTK_ENABLE_BROKEN
 #include "gtktree.h"
 #include "gtktreeitem.h"
+#include "gtkintl.h"
 #include "gtkalias.h"
 
 enum {
@@ -98,7 +99,7 @@ gtk_tree_get_type (void)
         (GtkClassInitFunc) NULL,
       };
       
-      g_intern_static_string ("GtkTree");
+      I_("GtkTree");
       tree_type = gtk_type_unique (gtk_container_get_type (), &tree_info);
     }
   
@@ -142,14 +143,14 @@ gtk_tree_class_init (GtkTreeClass *class)
   class->unselect_child = gtk_real_tree_unselect_child;
 
   tree_signals[SELECTION_CHANGED] =
-    gtk_signal_new ("selection_changed",
+    gtk_signal_new (I_("selection_changed"),
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkTreeClass, selection_changed),
                    _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   tree_signals[SELECT_CHILD] =
-    gtk_signal_new ("select_child",
+    gtk_signal_new (I_("select_child"),
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkTreeClass, select_child),
@@ -157,7 +158,7 @@ gtk_tree_class_init (GtkTreeClass *class)
                    GTK_TYPE_NONE, 1,
                    GTK_TYPE_WIDGET);
   tree_signals[UNSELECT_CHILD] =
-    gtk_signal_new ("unselect_child",
+    gtk_signal_new (I_("unselect_child"),
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkTreeClass, unselect_child),
index 2431c950a2270803ddf81b44e6bd42449cc87b2f..4e5c2715d616c79a2cd82d1d3dfd71237be9e803 100644 (file)
@@ -20,6 +20,7 @@
 #include <config.h>
 #include <string.h>
 #include "gtktreednd.h"
+#include "gtkintl.h"
 #include "gtkalias.h"
 
 GType
@@ -42,7 +43,7 @@ gtk_tree_drag_source_get_type (void)
        NULL
       };
 
-      our_type = g_type_register_static (G_TYPE_INTERFACE, g_intern_static_string ("GtkTreeDragSource"),
+      our_type = g_type_register_static (G_TYPE_INTERFACE, I_("GtkTreeDragSource"),
                                         &our_info, 0);
     }
   
@@ -70,7 +71,7 @@ gtk_tree_drag_dest_get_type (void)
        NULL
       };
 
-      our_type = g_type_register_static (G_TYPE_INTERFACE, g_intern_static_string ("GtkTreeDragDest"), &our_info, 0);
+      our_type = g_type_register_static (G_TYPE_INTERFACE, I_("GtkTreeDragDest"), &our_info, 0);
     }
   
   return our_type;
index e944a7c4a6236a730749fa055755425fc7533b07..2b824d7bea6af4a3c9be0a6ca3470a355ac7d2f5 100644 (file)
@@ -36,6 +36,7 @@
 #define GTK_ENABLE_BROKEN
 #include "gtktree.h"
 #include "gtktreeitem.h"
+#include "gtkintl.h"
 #include "gtkalias.h"
 
 #include "tree_plus.xpm"
@@ -118,7 +119,7 @@ gtk_tree_item_get_type (void)
         (GtkClassInitFunc) NULL,
       };
 
-      g_intern_static_string ("GtkTreeItem");
+      I_("GtkTreeItem");
       tree_item_type = gtk_type_unique (gtk_item_get_type (), &tree_item_info);
     }
 
@@ -160,14 +161,14 @@ gtk_tree_item_class_init (GtkTreeItemClass *class)
   class->collapse = gtk_real_tree_item_collapse;
 
   tree_item_signals[EXPAND_TREE] =
-    gtk_signal_new ("expand",
+    gtk_signal_new (I_("expand"),
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkTreeItemClass, expand),
                    _gtk_marshal_VOID__VOID,
                    GTK_TYPE_NONE, 0);
   tree_item_signals[COLLAPSE_TREE] =
-    gtk_signal_new ("collapse",
+    gtk_signal_new (I_("collapse"),
                    GTK_RUN_FIRST,
                    GTK_CLASS_TYPE (object_class),
                    GTK_SIGNAL_OFFSET (GtkTreeItemClass, collapse),
index 967793aaadbc0eeb1ef611445bae7dbb0f56afd8..58e09880056fbe8b2214e59c878bedb60056b526 100644 (file)
@@ -27,6 +27,7 @@
 #include "gtktreeview.h"
 #include "gtktreeprivate.h"
 #include "gtkmarshalers.h"
+#include "gtkintl.h"
 #include "gtkalias.h"
 
 
@@ -115,7 +116,7 @@ gtk_tree_model_get_type (void)
       };
 
       tree_model_type =
-       g_type_register_static (G_TYPE_INTERFACE, g_intern_static_string ("GtkTreeModel"),
+       g_type_register_static (G_TYPE_INTERFACE, I_("GtkTreeModel"),
                                &tree_model_info, 0);
 
       g_type_interface_add_prerequisite (tree_model_type, G_TYPE_OBJECT);
@@ -146,7 +147,7 @@ gtk_tree_model_base_init (gpointer g_class)
       rows_reordered_params[2] = G_TYPE_POINTER;
 
       tree_model_signals[ROW_CHANGED] =
-        g_signal_new ("row_changed",
+        g_signal_new (I_("row_changed"),
                       GTK_TYPE_TREE_MODEL,
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (GtkTreeModelIface, row_changed),
@@ -171,7 +172,7 @@ gtk_tree_model_base_init (gpointer g_class)
       closure = g_closure_new_simple (sizeof (GClosure), NULL);
       g_closure_set_marshal (closure, row_inserted_marshal);
       tree_model_signals[ROW_INSERTED] =
-        g_signal_newv ("row_inserted",
+        g_signal_newv (I_("row_inserted"),
                        GTK_TYPE_TREE_MODEL,
                        G_SIGNAL_RUN_FIRST,
                        closure,
@@ -181,7 +182,7 @@ gtk_tree_model_base_init (gpointer g_class)
                        row_inserted_params);
 
       tree_model_signals[ROW_HAS_CHILD_TOGGLED] =
-        g_signal_new ("row_has_child_toggled",
+        g_signal_new (I_("row_has_child_toggled"),
                       GTK_TYPE_TREE_MODEL,
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (GtkTreeModelIface, row_has_child_toggled),
@@ -194,7 +195,7 @@ gtk_tree_model_base_init (gpointer g_class)
       closure = g_closure_new_simple (sizeof (GClosure), NULL);
       g_closure_set_marshal (closure, row_deleted_marshal);
       tree_model_signals[ROW_DELETED] =
-        g_signal_newv ("row_deleted",
+        g_signal_newv (I_("row_deleted"),
                        GTK_TYPE_TREE_MODEL,
                        G_SIGNAL_RUN_FIRST,
                        closure,
@@ -206,7 +207,7 @@ gtk_tree_model_base_init (gpointer g_class)
       closure = g_closure_new_simple (sizeof (GClosure), NULL);
       g_closure_set_marshal (closure, rows_reordered_marshal);
       tree_model_signals[ROWS_REORDERED] =
-        g_signal_newv ("rows_reordered",
+        g_signal_newv (I_("rows_reordered"),
                        GTK_TYPE_TREE_MODEL,
                        G_SIGNAL_RUN_FIRST,
                        closure,
@@ -599,7 +600,7 @@ gtk_tree_path_get_type (void)
   static GType our_type = 0;
   
   if (our_type == 0)
-    our_type = g_boxed_type_register_static (g_intern_static_string ("GtkTreePath"),
+    our_type = g_boxed_type_register_static (I_("GtkTreePath"),
                                             (GBoxedCopyFunc) gtk_tree_path_copy,
                                             (GBoxedFreeFunc) gtk_tree_path_free);
 
@@ -827,7 +828,7 @@ gtk_tree_iter_get_type (void)
   static GType our_type = 0;
   
   if (our_type == 0)
-    our_type = g_boxed_type_register_static (g_intern_static_string ("GtkTreeIter"),
+    our_type = g_boxed_type_register_static (I_("GtkTreeIter"),
                                             (GBoxedCopyFunc) gtk_tree_iter_copy,
                                             (GBoxedFreeFunc) gtk_tree_iter_free);
 
@@ -1577,7 +1578,7 @@ gtk_tree_row_reference_get_type (void)
   static GType our_type = 0;
   
   if (our_type == 0)
-    our_type = g_boxed_type_register_static (g_intern_static_string ("GtkTreeRowReference"),
+    our_type = g_boxed_type_register_static (I_("GtkTreeRowReference"),
                                             (GBoxedCopyFunc) gtk_tree_row_reference_copy,
                                             (GBoxedFreeFunc) gtk_tree_row_reference_free);
 
@@ -1913,7 +1914,7 @@ gtk_tree_row_reference_new_proxy (GObject      *proxy,
       refs->list = NULL;
 
       g_object_set_data_full (G_OBJECT (proxy),
-                             g_intern_static_string (ROW_REF_DATA_STRING),
+                             I_(ROW_REF_DATA_STRING),
                               refs, release_row_references);
     }
 
@@ -2027,7 +2028,7 @@ gtk_tree_row_reference_free (GtkTreeRowReference *reference)
   if (refs->list == NULL)
     {
       g_object_set_data (G_OBJECT (reference->proxy),
-                        g_intern_static_string (ROW_REF_DATA_STRING),
+                        I_(ROW_REF_DATA_STRING),
                         NULL);
     }
 
index fd9241279ac4ba161c951286e49f4c47bbe6e32e..6576519cc41bd7b4c74273aae226aff3dc8659e5 100644 (file)
@@ -280,7 +280,7 @@ gtk_tree_model_filter_get_type (void)
         };
 
       tree_model_filter_type = g_type_register_static (G_TYPE_OBJECT,
-                                                       g_intern_static_string ("GtkTreeModelFilter"),
+                                                       I_("GtkTreeModelFilter"),
                                                        &tree_model_filter_info, 0);
 
       g_type_add_interface_static (tree_model_filter_type,
index 86c1456481da51a0601c3b9e9ac9733d1c129ae9..ac32fc4110f3fd06861ff4c11c0ec16a56510af2 100644 (file)
@@ -282,7 +282,7 @@ gtk_tree_model_sort_get_type (void)
       };
 
       tree_model_sort_type =
-       g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkTreeModelSort"),
+       g_type_register_static (G_TYPE_OBJECT, I_("GtkTreeModelSort"),
                                &tree_model_sort_info, 0);
 
       g_type_add_interface_static (tree_model_sort_type,
index a269a1e0af0d4c248afab511defed5ba8fe01904..a004b6c4df65628ad656977e80ba092c35a87de1 100644 (file)
@@ -23,6 +23,7 @@
 #include "gtktreeprivate.h"
 #include "gtkrbtree.h"
 #include "gtkmarshalers.h"
+#include "gtkintl.h"
 #include "gtkalias.h"
 
 static void gtk_tree_selection_init              (GtkTreeSelection      *selection);
@@ -66,7 +67,7 @@ gtk_tree_selection_get_type (void)
       };
 
       selection_type =
-       g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkTreeSelection"),
+       g_type_register_static (G_TYPE_OBJECT, I_("GtkTreeSelection"),
                                &selection_info, 0);
     }
 
@@ -85,7 +86,7 @@ gtk_tree_selection_class_init (GtkTreeSelectionClass *class)
   class->changed = NULL;
 
   tree_selection_signals[CHANGED] =
-    g_signal_new ("changed",
+    g_signal_new (I_("changed"),
                  G_OBJECT_CLASS_TYPE (object_class),
                  G_SIGNAL_RUN_FIRST,
                  G_STRUCT_OFFSET (GtkTreeSelectionClass, changed),
index 5a175989718fa86ddbb1e0176e5d840bb709160e..d72ef22b530cf31af5c4a5f4fefc496cfff7ed7f 100644 (file)
@@ -21,6 +21,7 @@
 #include <config.h>
 #include "gtktreesortable.h"
 #include "gtkmarshalers.h"
+#include "gtkintl.h"
 #include "gtkalias.h"
 
 static void gtk_tree_sortable_base_init (gpointer g_class);
@@ -46,7 +47,7 @@ gtk_tree_sortable_get_type (void)
       };
 
       tree_sortable_type =
-       g_type_register_static (G_TYPE_INTERFACE, g_intern_static_string ("GtkTreeSortable"),
+       g_type_register_static (G_TYPE_INTERFACE, I_("GtkTreeSortable"),
                                &tree_sortable_info, 0);
 
       g_type_interface_add_prerequisite (tree_sortable_type, GTK_TYPE_TREE_MODEL);
@@ -62,7 +63,7 @@ gtk_tree_sortable_base_init (gpointer g_class)
 
   if (! initialized)
     {
-      g_signal_new ("sort_column_changed",
+      g_signal_new (I_("sort_column_changed"),
                     GTK_TYPE_TREE_SORTABLE,
                     G_SIGNAL_RUN_LAST,
                     G_STRUCT_OFFSET (GtkTreeSortableIface, sort_column_changed),
index 65516895df07f4d6f0244bc1970dbc32bd2d02bd..ca969144211c167d8d30870f9856be9cbfc1f7f8 100644 (file)
@@ -24,6 +24,7 @@
 #include "gtktreestore.h"
 #include "gtktreedatalist.h"
 #include "gtktreednd.h"
+#include "gtkintl.h"
 #include "gtkalias.h"
 
 #define G_NODE(node) ((GNode *)node)
@@ -185,7 +186,7 @@ gtk_tree_store_get_type (void)
        NULL
       };
 
-      tree_store_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkTreeStore"),
+      tree_store_type = g_type_register_static (G_TYPE_OBJECT, I_("GtkTreeStore"),
                                                &tree_store_info, 0);
 
       g_type_add_interface_static (tree_store_type,
index f92feee66c372859d7bf9b5b81a3525f66e305c5..3c9bdb0ad23714cb1c6ca32d94c449076dcb43dd 100644 (file)
@@ -484,7 +484,7 @@ gtk_tree_view_get_type (void)
       };
 
       tree_view_type =
-       g_type_register_static (GTK_TYPE_CONTAINER, g_intern_static_string ("GtkTreeView"),
+       g_type_register_static (GTK_TYPE_CONTAINER, I_("GtkTreeView"),
                                &tree_view_info, 0);
     }
 
@@ -768,7 +768,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
 
   /* Signals */
   widget_class->set_scroll_adjustments_signal =
-    g_signal_new ("set_scroll_adjustments",
+    g_signal_new (I_("set_scroll_adjustments"),
                  G_TYPE_FROM_CLASS (o_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                  G_STRUCT_OFFSET (GtkTreeViewClass, set_scroll_adjustments),
@@ -779,7 +779,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                  GTK_TYPE_ADJUSTMENT);
 
   tree_view_signals[ROW_ACTIVATED] =
-    g_signal_new ("row_activated",
+    g_signal_new (I_("row_activated"),
                  G_TYPE_FROM_CLASS (o_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                  G_STRUCT_OFFSET (GtkTreeViewClass, row_activated),
@@ -790,7 +790,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                  GTK_TYPE_TREE_VIEW_COLUMN);
 
   tree_view_signals[TEST_EXPAND_ROW] =
-    g_signal_new ("test_expand_row",
+    g_signal_new (I_("test_expand_row"),
                  G_TYPE_FROM_CLASS (o_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkTreeViewClass, test_expand_row),
@@ -801,7 +801,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                  GTK_TYPE_TREE_PATH);
 
   tree_view_signals[TEST_COLLAPSE_ROW] =
-    g_signal_new ("test_collapse_row",
+    g_signal_new (I_("test_collapse_row"),
                  G_TYPE_FROM_CLASS (o_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkTreeViewClass, test_collapse_row),
@@ -812,7 +812,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                  GTK_TYPE_TREE_PATH);
 
   tree_view_signals[ROW_EXPANDED] =
-    g_signal_new ("row_expanded",
+    g_signal_new (I_("row_expanded"),
                  G_TYPE_FROM_CLASS (o_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkTreeViewClass, row_expanded),
@@ -823,7 +823,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                  GTK_TYPE_TREE_PATH);
 
   tree_view_signals[ROW_COLLAPSED] =
-    g_signal_new ("row_collapsed",
+    g_signal_new (I_("row_collapsed"),
                  G_TYPE_FROM_CLASS (o_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkTreeViewClass, row_collapsed),
@@ -834,7 +834,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                  GTK_TYPE_TREE_PATH);
 
   tree_view_signals[COLUMNS_CHANGED] =
-    g_signal_new ("columns_changed",
+    g_signal_new (I_("columns_changed"),
                  G_TYPE_FROM_CLASS (o_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkTreeViewClass, columns_changed),
@@ -843,7 +843,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                  G_TYPE_NONE, 0);
 
   tree_view_signals[CURSOR_CHANGED] =
-    g_signal_new ("cursor_changed",
+    g_signal_new (I_("cursor_changed"),
                  G_TYPE_FROM_CLASS (o_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkTreeViewClass, cursor_changed),
@@ -852,7 +852,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                  G_TYPE_NONE, 0);
 
   tree_view_signals[MOVE_CURSOR] =
-    g_signal_new ("move_cursor",
+    g_signal_new (I_("move_cursor"),
                  G_TYPE_FROM_CLASS (object_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                  G_STRUCT_OFFSET (GtkTreeViewClass, move_cursor),
@@ -863,7 +863,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                  G_TYPE_INT);
 
   tree_view_signals[SELECT_ALL] =
-    g_signal_new ("select_all",
+    g_signal_new (I_("select_all"),
                  G_TYPE_FROM_CLASS (object_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                  G_STRUCT_OFFSET (GtkTreeViewClass, select_all),
@@ -872,7 +872,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                  G_TYPE_BOOLEAN, 0);
 
   tree_view_signals[UNSELECT_ALL] =
-    g_signal_new ("unselect_all",
+    g_signal_new (I_("unselect_all"),
                  G_TYPE_FROM_CLASS (object_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                  G_STRUCT_OFFSET (GtkTreeViewClass, unselect_all),
@@ -881,7 +881,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                  G_TYPE_BOOLEAN, 0);
 
   tree_view_signals[SELECT_CURSOR_ROW] =
-    g_signal_new ("select_cursor_row",
+    g_signal_new (I_("select_cursor_row"),
                  G_TYPE_FROM_CLASS (object_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                  G_STRUCT_OFFSET (GtkTreeViewClass, select_cursor_row),
@@ -891,7 +891,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                  G_TYPE_BOOLEAN);
 
   tree_view_signals[TOGGLE_CURSOR_ROW] =
-    g_signal_new ("toggle_cursor_row",
+    g_signal_new (I_("toggle_cursor_row"),
                  G_TYPE_FROM_CLASS (object_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                  G_STRUCT_OFFSET (GtkTreeViewClass, toggle_cursor_row),
@@ -900,7 +900,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                  G_TYPE_BOOLEAN, 0);
 
   tree_view_signals[EXPAND_COLLAPSE_CURSOR_ROW] =
-    g_signal_new ("expand_collapse_cursor_row",
+    g_signal_new (I_("expand_collapse_cursor_row"),
                  G_TYPE_FROM_CLASS (object_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                  G_STRUCT_OFFSET (GtkTreeViewClass, expand_collapse_cursor_row),
@@ -912,7 +912,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                  G_TYPE_BOOLEAN);
 
   tree_view_signals[SELECT_CURSOR_PARENT] =
-    g_signal_new ("select_cursor_parent",
+    g_signal_new (I_("select_cursor_parent"),
                  G_TYPE_FROM_CLASS (object_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                  G_STRUCT_OFFSET (GtkTreeViewClass, select_cursor_parent),
@@ -921,7 +921,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
                  G_TYPE_BOOLEAN, 0);
 
   tree_view_signals[START_INTERACTIVE_SEARCH] =
-    g_signal_new ("start_interactive_search",
+    g_signal_new (I_("start_interactive_search"),
                  G_TYPE_FROM_CLASS (object_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                  G_STRUCT_OFFSET (GtkTreeViewClass, start_interactive_search),
@@ -5491,7 +5491,7 @@ set_source_row (GdkDragContext *context,
                 GtkTreePath    *source_row)
 {
   g_object_set_data_full (G_OBJECT (context),
-                          g_intern_static_string ("gtk-tree-view-source-row"),
+                          I_("gtk-tree-view-source-row"),
                           source_row ? gtk_tree_row_reference_new (model, source_row) : NULL,
                           (GDestroyNotify) (source_row ? gtk_tree_row_reference_free : NULL));
 }
@@ -5539,7 +5539,7 @@ set_dest_row (GdkDragContext *context,
 
   if (!dest_row)
     {
-      g_object_set_data_full (G_OBJECT (context), g_intern_static_string ("gtk-tree-view-dest-row"),
+      g_object_set_data_full (G_OBJECT (context), I_("gtk-tree-view-dest-row"),
                               NULL, NULL);
       return;
     }
@@ -5551,7 +5551,7 @@ set_dest_row (GdkDragContext *context,
   dr->empty_view_drop = empty_view_drop;
   dr->drop_append_mode = drop_append_mode;
 
-  g_object_set_data_full (G_OBJECT (context), g_intern_static_string ("gtk-tree-view-dest-row"),
+  g_object_set_data_full (G_OBJECT (context), I_("gtk-tree-view-dest-row"),
                           dr, (GDestroyNotify) dest_row_free);
 }
 
@@ -5594,7 +5594,7 @@ set_status_pending (GdkDragContext *context,
                     GdkDragAction   suggested_action)
 {
   g_object_set_data (G_OBJECT (context),
-                     g_intern_static_string ("gtk-tree-view-status-pending"),
+                     I_("gtk-tree-view-status-pending"),
                      GINT_TO_POINTER (suggested_action));
 }
 
@@ -5649,7 +5649,7 @@ ensure_info (GtkTreeView *tree_view)
       di = g_new0 (TreeViewDragInfo, 1);
 
       g_object_set_data_full (G_OBJECT (tree_view),
-                              g_intern_static_string ("gtk-tree-view-drag-info"),
+                              I_("gtk-tree-view-drag-info"),
                               di,
                               (GDestroyNotify) destroy_info);
     }
@@ -5660,7 +5660,7 @@ ensure_info (GtkTreeView *tree_view)
 static void
 remove_info (GtkTreeView *tree_view)
 {
-  g_object_set_data (G_OBJECT (tree_view), g_intern_static_string ("gtk-tree-view-drag-info"), NULL);
+  g_object_set_data (G_OBJECT (tree_view), I_("gtk-tree-view-drag-info"), NULL);
 }
 
 #if 0
index a4ddc42ac453acf88d896a38368eb566ea6f8c51..08d2c28752526f25c8ca479346b084d9e0f665ca 100644 (file)
@@ -185,7 +185,7 @@ gtk_tree_view_column_get_type (void)
       };
 
       tree_column_type =
-       g_type_register_static (GTK_TYPE_OBJECT, g_intern_static_string ("GtkTreeViewColumn"),
+       g_type_register_static (GTK_TYPE_OBJECT, I_("GtkTreeViewColumn"),
                                &tree_column_info, 0);
 
       g_type_add_interface_static (tree_column_type,
@@ -212,7 +212,7 @@ gtk_tree_view_column_class_init (GtkTreeViewColumnClass *class)
   object_class->get_property = gtk_tree_view_column_get_property;
   
   tree_column_signals[CLICKED] =
-    g_signal_new ("clicked",
+    g_signal_new (I_("clicked"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTreeViewColumnClass, clicked),
index 5937cd47e85869a680ba0bf524c219bb73bfb4d1..71159a9a6873a6ee942217acfa0b632d1af20bd3 100644 (file)
@@ -31,6 +31,7 @@
 
 #include "gtktypeutils.h"
 #include "gtkobject.h"
+#include "gtkintl.h"
 #include "gtkalias.h"
 
 
@@ -132,7 +133,7 @@ gtk_identifier_get_type (void)
   if (our_type == 0)
     {
       GTypeInfo tinfo = { 0, };
-      our_type = g_type_register_static (G_TYPE_STRING, "GtkIdentifier", &tinfo, 0);
+      our_type = g_type_register_static (G_TYPE_STRING, I_("GtkIdentifier"), &tinfo, 0);
     }
 
   return our_type;
index 957f1cd36119e50bfabf01431d7f64924601a713..edf2dd8f7b8ecf972f2739311fdfd2de47cde57b 100644 (file)
@@ -190,7 +190,7 @@ gtk_ui_manager_get_type (void)
       };
 
       type = g_type_register_static (G_TYPE_OBJECT,
-                                    g_intern_static_string ("GtkUIManager"),
+                                    I_("GtkUIManager"),
                                     &type_info, 0);
     }
   return type;
@@ -255,7 +255,7 @@ gtk_ui_manager_class_init (GtkUIManagerClass *klass)
    * Since: 2.4
    */
   ui_manager_signals[ADD_WIDGET] =
-    g_signal_new ("add_widget",
+    g_signal_new (I_("add_widget"),
                  G_OBJECT_CLASS_TYPE (klass),
                  G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE,
                  G_STRUCT_OFFSET (GtkUIManagerClass, add_widget),
@@ -274,7 +274,7 @@ gtk_ui_manager_class_init (GtkUIManagerClass *klass)
    * Since: 2.4
    */
   ui_manager_signals[ACTIONS_CHANGED] =
-    g_signal_new ("actions_changed",
+    g_signal_new (I_("actions_changed"),
                  G_OBJECT_CLASS_TYPE (klass),
                  G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE,
                  G_STRUCT_OFFSET (GtkUIManagerClass, actions_changed),  
@@ -298,7 +298,7 @@ gtk_ui_manager_class_init (GtkUIManagerClass *klass)
    * Since: 2.4
    */
   ui_manager_signals[CONNECT_PROXY] =
-    g_signal_new ("connect_proxy",
+    g_signal_new (I_("connect_proxy"),
                  G_OBJECT_CLASS_TYPE (klass),
                  G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE,
                  G_STRUCT_OFFSET (GtkUIManagerClass, connect_proxy),
@@ -320,7 +320,7 @@ gtk_ui_manager_class_init (GtkUIManagerClass *klass)
    * Since: 2.4
    */
   ui_manager_signals[DISCONNECT_PROXY] =
-    g_signal_new ("disconnect_proxy",
+    g_signal_new (I_("disconnect_proxy"),
                  G_OBJECT_CLASS_TYPE (klass),
                  G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE,
                  G_STRUCT_OFFSET (GtkUIManagerClass, disconnect_proxy),
@@ -344,7 +344,7 @@ gtk_ui_manager_class_init (GtkUIManagerClass *klass)
    * Since: 2.4
    */
   ui_manager_signals[PRE_ACTIVATE] =
-    g_signal_new ("pre_activate",
+    g_signal_new (I_("pre_activate"),
                  G_OBJECT_CLASS_TYPE (klass),
                  G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE,
                  G_STRUCT_OFFSET (GtkUIManagerClass, pre_activate),
@@ -367,7 +367,7 @@ gtk_ui_manager_class_init (GtkUIManagerClass *klass)
    * Since: 2.4
    */
   ui_manager_signals[POST_ACTIVATE] =
-    g_signal_new ("post_activate",
+    g_signal_new (I_("post_activate"),
                  G_OBJECT_CLASS_TYPE (klass),
                  G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE,
                  G_STRUCT_OFFSET (GtkUIManagerClass, post_activate),
@@ -2271,7 +2271,7 @@ update_node (GtkUIManager *self,
                gtk_menu_shell_append (GTK_MENU_SHELL (menu), tearoff);
                filler = gtk_menu_item_new_with_label (_("Empty"));
                g_object_set_data (G_OBJECT (filler),
-                                  g_intern_static_string ("gtk-empty-menu-item"),
+                                  I_("gtk-empty-menu-item"),
                                   GINT_TO_POINTER (TRUE));
                gtk_widget_set_sensitive (filler, FALSE);
                gtk_widget_set_no_show_all (filler, TRUE);
@@ -2371,7 +2371,7 @@ update_node (GtkUIManager *self,
              g_object_ref (info->proxy);
              gtk_object_sink (GTK_OBJECT (info->proxy));
              g_object_set_data (G_OBJECT (info->proxy),
-                                g_intern_static_string ("gtk-separator-mode"),
+                                I_("gtk-separator-mode"),
                                 GINT_TO_POINTER (SEPARATOR_MODE_HIDDEN));
              gtk_widget_set_no_show_all (info->proxy, TRUE);
              gtk_menu_shell_insert (GTK_MENU_SHELL (menushell),
@@ -2381,7 +2381,7 @@ update_node (GtkUIManager *self,
              g_object_ref (info->extra);
              gtk_object_sink (GTK_OBJECT (info->extra));
              g_object_set_data (G_OBJECT (info->extra),
-                                g_intern_static_string ("gtk-separator-mode"),
+                                I_("gtk-separator-mode"),
                                 GINT_TO_POINTER (SEPARATOR_MODE_HIDDEN));
              gtk_widget_set_no_show_all (info->extra, TRUE);
              gtk_menu_shell_insert (GTK_MENU_SHELL (menushell),
@@ -2424,7 +2424,7 @@ update_node (GtkUIManager *self,
              g_object_ref (info->proxy);
              gtk_object_sink (GTK_OBJECT (info->proxy));
              g_object_set_data (G_OBJECT (info->proxy),
-                                g_intern_static_string ("gtk-separator-mode"),
+                                I_("gtk-separator-mode"),
                                 GINT_TO_POINTER (SEPARATOR_MODE_HIDDEN));
              gtk_widget_set_no_show_all (info->proxy, TRUE);
              
@@ -2434,7 +2434,7 @@ update_node (GtkUIManager *self,
              g_object_ref (info->extra);
              gtk_object_sink (GTK_OBJECT (info->extra));
              g_object_set_data (G_OBJECT (info->extra),
-                                g_intern_static_string ("gtk-separator-mode"),
+                                I_("gtk-separator-mode"),
                                 GINT_TO_POINTER (SEPARATOR_MODE_HIDDEN));
              gtk_widget_set_no_show_all (info->extra, TRUE);
            }
@@ -2574,7 +2574,7 @@ update_node (GtkUIManager *self,
                  separator_mode = SEPARATOR_MODE_SMART;
 
              g_object_set_data (G_OBJECT (info->proxy),
-                                g_intern_static_string ("gtk-separator-mode"),
+                                I_("gtk-separator-mode"),
                                 GINT_TO_POINTER (separator_mode));
              gtk_widget_show (info->proxy);
            }
@@ -2599,7 +2599,7 @@ update_node (GtkUIManager *self,
              gtk_object_sink (GTK_OBJECT (info->proxy));
              gtk_widget_set_no_show_all (info->proxy, TRUE);
              g_object_set_data (G_OBJECT (info->proxy),
-                                g_intern_static_string ("gtk-separator-mode"),
+                                I_("gtk-separator-mode"),
                                 GINT_TO_POINTER (SEPARATOR_MODE_SMART));
              gtk_menu_shell_insert (GTK_MENU_SHELL (menushell),
                                     info->proxy, pos);
index 0eb9b7e3e0a9648c7c4a2e2513eb433ece76108e..be718e7f301febfb4101ec047510024c0e9765c6 100644 (file)
@@ -26,6 +26,7 @@
 
 #include <config.h>
 #include "gtkvbbox.h"
+#include "gtkintl.h"
 #include "gtkalias.h"
 
 
@@ -60,7 +61,7 @@ gtk_vbutton_box_get_type (void)
       };
 
       vbutton_box_type =
-       g_type_register_static (GTK_TYPE_BUTTON_BOX, g_intern_static_string ("GtkVButtonBox"),
+       g_type_register_static (GTK_TYPE_BUTTON_BOX, I_("GtkVButtonBox"),
                                &vbutton_box_info, 0);
     }
 
index 43a0ab431c95e6a553a36de082d3e71c3953b062..f10890bdd199d80fcbd31f1599dad4da452b6f30 100644 (file)
@@ -26,6 +26,7 @@
 
 #include <config.h>
 #include "gtkvbox.h"
+#include "gtkintl.h"
 #include "gtkalias.h"
 
 
@@ -57,7 +58,7 @@ gtk_vbox_get_type (void)
        (GInstanceInitFunc) gtk_vbox_init,
       };
 
-      vbox_type = g_type_register_static (GTK_TYPE_BOX, g_intern_static_string ("GtkVBox"),
+      vbox_type = g_type_register_static (GTK_TYPE_BOX, I_("GtkVBox"),
                                          &vbox_info, 0);
     }
 
index e88144c15248eeff41c478673db4bde1d277c949..fd987b3dec3449f13a4b352f7fe05a2ed256725c 100644 (file)
@@ -93,7 +93,7 @@ gtk_viewport_get_type (void)
        (GInstanceInitFunc) gtk_viewport_init,
       };
 
-      viewport_type = g_type_register_static (GTK_TYPE_BIN, g_intern_static_string ("GtkViewport"),
+      viewport_type = g_type_register_static (GTK_TYPE_BIN, I_("GtkViewport"),
                                              &viewport_info, 0);
     }
 
@@ -157,7 +157,7 @@ gtk_viewport_class_init (GtkViewportClass *class)
                                                      GTK_PARAM_READWRITE));
 
   widget_class->set_scroll_adjustments_signal =
-    g_signal_new ("set_scroll_adjustments",
+    g_signal_new (I_("set_scroll_adjustments"),
                  G_OBJECT_CLASS_TYPE (gobject_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                  G_STRUCT_OFFSET (GtkViewportClass, set_scroll_adjustments),
index 25a1de7d3b6087870b6c5058cc4ec82fc1427326..e00fc616acf918958fc87a6d5e615d66d044cf5a 100644 (file)
@@ -26,6 +26,7 @@
 
 #include <config.h>
 #include "gtkvpaned.h"
+#include "gtkintl.h"
 #include "gtkalias.h"
 
 static void     gtk_vpaned_class_init     (GtkVPanedClass *klass);
@@ -57,7 +58,7 @@ gtk_vpaned_get_type (void)
        (GInstanceInitFunc) gtk_vpaned_init,
       };
 
-      vpaned_type = g_type_register_static (GTK_TYPE_PANED, g_intern_static_string ("GtkVPaned"),
+      vpaned_type = g_type_register_static (GTK_TYPE_PANED, I_("GtkVPaned"),
                                            &vpaned_info, 0);
     }
 
index 0115aa7f91feb9abdf94736535572b2ddf8b93f8..eb910ab03e461fc22e7218663ebe32439ac6f7ea 100644 (file)
@@ -28,6 +28,7 @@
 #include <math.h>
 #include <string.h>
 #include "gtkvruler.h"
+#include "gtkintl.h"
 #include "gtkalias.h"
 
 #include <glib/gprintf.h>
@@ -69,7 +70,7 @@ gtk_vruler_get_type (void)
        (GInstanceInitFunc) gtk_vruler_init,
       };
 
-      vruler_type = g_type_register_static (GTK_TYPE_RULER, g_intern_static_string ("GtkVRuler"),
+      vruler_type = g_type_register_static (GTK_TYPE_RULER, I_("GtkVRuler"),
                                            &vruler_info, 0);
     }
 
index a512b816c13d6ea3b5a9a6ba069a63aa35055100..da92e7ef7721d78b32ee004ed11fa9278644a818 100644 (file)
@@ -65,7 +65,7 @@ gtk_vscale_get_type (void)
        (GInstanceInitFunc) gtk_vscale_init,
       };
       
-      vscale_type = g_type_register_static (GTK_TYPE_SCALE, g_intern_static_string ("GtkVScale"),
+      vscale_type = g_type_register_static (GTK_TYPE_SCALE, I_("GtkVScale"),
                                            &vscale_info, 0);
     }
   
index 6004af619e65833d20623abbce6d64ae5825295b..071fc1f3fabe42be19b2bc6a82110afb55e2894c 100644 (file)
@@ -55,7 +55,7 @@ gtk_vscrollbar_get_type (void)
       };
       
       vscrollbar_type =
-       g_type_register_static (GTK_TYPE_SCROLLBAR, g_intern_static_string ("GtkVScrollbar"),
+       g_type_register_static (GTK_TYPE_SCROLLBAR, I_("GtkVScrollbar"),
                                &vscrollbar_info, 0);
     }
   
index 1b90e86e9fc22d9bee396b06343921dbbe44c61e..bbf517780d6e24f6226bef5d62365b305fbbb109 100644 (file)
@@ -26,6 +26,7 @@
 
 #include <config.h>
 #include "gtkvseparator.h"
+#include "gtkintl.h"
 #include "gtkalias.h"
 
 
@@ -56,7 +57,7 @@ gtk_vseparator_get_type (void)
       };
 
       vseparator_type =
-       g_type_register_static (GTK_TYPE_SEPARATOR, g_intern_static_string ("GtkVSeparator"),
+       g_type_register_static (GTK_TYPE_SEPARATOR, I_("GtkVSeparator"),
                                &vseparator_info, 0);
     }
 
index 241277f3e28e007843ca3994cd824679395e1f7b..94b13009363a3ca2a1fcdfe8c3f9eb5390935a6d 100644 (file)
@@ -288,7 +288,7 @@ gtk_widget_get_type (void)
         NULL /* interface data */
       };
 
-      widget_type = g_type_register_static (GTK_TYPE_OBJECT, g_intern_static_string ("GtkWidget"), 
+      widget_type = g_type_register_static (GTK_TYPE_OBJECT, I_("GtkWidget"), 
                                            &widget_info, G_TYPE_FLAG_ABSTRACT);
 
       g_type_add_interface_static (widget_type, ATK_TYPE_IMPLEMENTOR,
@@ -543,7 +543,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                                                         FALSE,
                                                         GTK_PARAM_READWRITE));
   widget_signals[SHOW] =
-    g_signal_new ("show",
+    g_signal_new (I_("show"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_FIRST,
                  G_STRUCT_OFFSET (GtkWidgetClass, show),
@@ -551,7 +551,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  _gtk_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);
   widget_signals[HIDE] =
-    g_signal_new ("hide",
+    g_signal_new (I_("hide"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_FIRST,
                  G_STRUCT_OFFSET (GtkWidgetClass, hide),
@@ -559,7 +559,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  _gtk_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);
   widget_signals[MAP] =
-    g_signal_new ("map",
+    g_signal_new (I_("map"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_FIRST,
                  G_STRUCT_OFFSET (GtkWidgetClass, map),
@@ -567,7 +567,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  _gtk_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);
   widget_signals[UNMAP] =
-    g_signal_new ("unmap",
+    g_signal_new (I_("unmap"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_FIRST,
                  G_STRUCT_OFFSET (GtkWidgetClass, unmap),
@@ -575,7 +575,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  _gtk_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);
   widget_signals[REALIZE] =
-    g_signal_new ("realize",
+    g_signal_new (I_("realize"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_FIRST,
                  G_STRUCT_OFFSET (GtkWidgetClass, realize),
@@ -583,7 +583,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  _gtk_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);
   widget_signals[UNREALIZE] =
-    g_signal_new ("unrealize",
+    g_signal_new (I_("unrealize"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, unrealize),
@@ -591,7 +591,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  _gtk_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);
   widget_signals[SIZE_REQUEST] =
-    g_signal_new ("size_request",
+    g_signal_new (I_("size_request"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_FIRST,
                  G_STRUCT_OFFSET (GtkWidgetClass, size_request),
@@ -600,7 +600,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_TYPE_NONE, 1,
                  GTK_TYPE_REQUISITION | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[SIZE_ALLOCATE] = 
-    g_signal_new ("size_allocate",
+    g_signal_new (I_("size_allocate"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_FIRST,
                  G_STRUCT_OFFSET (GtkWidgetClass, size_allocate),
@@ -609,7 +609,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_TYPE_NONE, 1,
                  GDK_TYPE_RECTANGLE | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[STATE_CHANGED] =
-    g_signal_new ("state_changed",
+    g_signal_new (I_("state_changed"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_FIRST,
                  G_STRUCT_OFFSET (GtkWidgetClass, state_changed),
@@ -618,7 +618,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_TYPE_NONE, 1,
                  GTK_TYPE_STATE_TYPE);
   widget_signals[PARENT_SET] =
-    g_signal_new ("parent_set",
+    g_signal_new (I_("parent_set"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_FIRST,
                  G_STRUCT_OFFSET (GtkWidgetClass, parent_set),
@@ -627,7 +627,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_TYPE_NONE, 1,
                  GTK_TYPE_WIDGET);
   widget_signals[HIERARCHY_CHANGED] =
-    g_signal_new ("hierarchy_changed",
+    g_signal_new (I_("hierarchy_changed"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, hierarchy_changed),
@@ -646,7 +646,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
    * gtk_widget_modify_base() also cause this signal to be emitted.
    */
   widget_signals[STYLE_SET] =
-    g_signal_new ("style_set",
+    g_signal_new (I_("style_set"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_FIRST,
                  G_STRUCT_OFFSET (GtkWidgetClass, style_set),
@@ -655,7 +655,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_TYPE_NONE, 1,
                  GTK_TYPE_STYLE);
   widget_signals[DIRECTION_CHANGED] =
-    g_signal_new ("direction_changed",
+    g_signal_new (I_("direction_changed"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_FIRST,
                  G_STRUCT_OFFSET (GtkWidgetClass, direction_changed),
@@ -664,7 +664,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_TYPE_NONE, 1,
                  GTK_TYPE_TEXT_DIRECTION);
   widget_signals[GRAB_NOTIFY] =
-    g_signal_new ("grab_notify",
+    g_signal_new (I_("grab_notify"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_FIRST,
                   G_STRUCT_OFFSET (GtkWidgetClass, grab_notify),
@@ -682,7 +682,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
  * changed on an object. The signal's detail holds the property name. 
  */
   widget_signals[CHILD_NOTIFY] =
-    g_signal_new ("child_notify",
+    g_signal_new (I_("child_notify"),
                   G_TYPE_FROM_CLASS (gobject_class),
                   G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE | G_SIGNAL_DETAILED | G_SIGNAL_NO_HOOKS,
                   G_STRUCT_OFFSET (GtkWidgetClass, child_notify),
@@ -691,7 +691,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                   G_TYPE_NONE, 1,
                   G_TYPE_PARAM);
   widget_signals[MNEMONIC_ACTIVATE] =
-    g_signal_new ("mnemonic_activate",
+    g_signal_new (I_("mnemonic_activate"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, mnemonic_activate),
@@ -700,7 +700,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_TYPE_BOOLEAN, 1,
                  G_TYPE_BOOLEAN);
   widget_signals[GRAB_FOCUS] =
-    g_signal_new ("grab_focus",
+    g_signal_new (I_("grab_focus"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                  G_STRUCT_OFFSET (GtkWidgetClass, grab_focus),
@@ -708,7 +708,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  _gtk_marshal_VOID__VOID,
                  G_TYPE_NONE, 0);
   widget_signals[FOCUS] =
-    g_signal_new ("focus",
+    g_signal_new (I_("focus"),
                  G_TYPE_FROM_CLASS (object_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, focus),
@@ -717,7 +717,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_TYPE_BOOLEAN, 1,
                  GTK_TYPE_DIRECTION_TYPE);
   widget_signals[EVENT] =
-    g_signal_new ("event",
+    g_signal_new (I_("event"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, event),
@@ -726,7 +726,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_TYPE_BOOLEAN, 1,
                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[EVENT_AFTER] =
-    g_signal_new ("event-after",
+    g_signal_new (I_("event-after"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  0,
                  0,
@@ -735,7 +735,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_TYPE_NONE, 1,
                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[BUTTON_PRESS_EVENT] =
-    g_signal_new ("button_press_event",
+    g_signal_new (I_("button_press_event"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, button_press_event),
@@ -744,7 +744,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_TYPE_BOOLEAN, 1,
                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[BUTTON_RELEASE_EVENT] =
-    g_signal_new ("button_release_event",
+    g_signal_new (I_("button_release_event"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, button_release_event),
@@ -753,7 +753,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_TYPE_BOOLEAN, 1,
                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[SCROLL_EVENT] =
-    g_signal_new ("scroll_event",
+    g_signal_new (I_("scroll_event"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, scroll_event),
@@ -762,7 +762,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_TYPE_BOOLEAN, 1,
                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[MOTION_NOTIFY_EVENT] =
-    g_signal_new ("motion_notify_event",
+    g_signal_new (I_("motion_notify_event"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, motion_notify_event),
@@ -786,7 +786,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
  *   %FALSE to propagate the event further.
  */
   widget_signals[DELETE_EVENT] =
-    g_signal_new ("delete_event",
+    g_signal_new (I_("delete_event"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, delete_event),
@@ -809,7 +809,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
  *   %FALSE to propagate the event further.
  */
   widget_signals[DESTROY_EVENT] =
-    g_signal_new ("destroy_event",
+    g_signal_new (I_("destroy_event"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, destroy_event),
@@ -818,7 +818,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_TYPE_BOOLEAN, 1,
                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[EXPOSE_EVENT] =
-    g_signal_new ("expose_event",
+    g_signal_new (I_("expose_event"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, expose_event),
@@ -827,7 +827,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_TYPE_BOOLEAN, 1,
                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[KEY_PRESS_EVENT] =
-    g_signal_new ("key_press_event",
+    g_signal_new (I_("key_press_event"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, key_press_event),
@@ -836,7 +836,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_TYPE_BOOLEAN, 1,
                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[KEY_RELEASE_EVENT] =
-    g_signal_new ("key_release_event",
+    g_signal_new (I_("key_release_event"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, key_release_event),
@@ -845,7 +845,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_TYPE_BOOLEAN, 1,
                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[ENTER_NOTIFY_EVENT] =
-    g_signal_new ("enter_notify_event",
+    g_signal_new (I_("enter_notify_event"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, enter_notify_event),
@@ -854,7 +854,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_TYPE_BOOLEAN, 1,
                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[LEAVE_NOTIFY_EVENT] =
-    g_signal_new ("leave_notify_event",
+    g_signal_new (I_("leave_notify_event"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, leave_notify_event),
@@ -863,7 +863,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_TYPE_BOOLEAN, 1,
                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[CONFIGURE_EVENT] =
-    g_signal_new ("configure_event",
+    g_signal_new (I_("configure_event"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, configure_event),
@@ -872,7 +872,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_TYPE_BOOLEAN, 1,
                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[FOCUS_IN_EVENT] =
-    g_signal_new ("focus_in_event",
+    g_signal_new (I_("focus_in_event"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, focus_in_event),
@@ -881,7 +881,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_TYPE_BOOLEAN, 1,
                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[FOCUS_OUT_EVENT] =
-    g_signal_new ("focus_out_event",
+    g_signal_new (I_("focus_out_event"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, focus_out_event),
@@ -890,7 +890,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_TYPE_BOOLEAN, 1,
                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[MAP_EVENT] =
-    g_signal_new ("map_event",
+    g_signal_new (I_("map_event"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, map_event),
@@ -899,7 +899,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_TYPE_BOOLEAN, 1,
                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[UNMAP_EVENT] =
-    g_signal_new ("unmap_event",
+    g_signal_new (I_("unmap_event"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, unmap_event),
@@ -908,7 +908,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_TYPE_BOOLEAN, 1,
                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[PROPERTY_NOTIFY_EVENT] =
-    g_signal_new ("property_notify_event",
+    g_signal_new (I_("property_notify_event"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, property_notify_event),
@@ -917,7 +917,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_TYPE_BOOLEAN, 1,
                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[SELECTION_CLEAR_EVENT] =
-    g_signal_new ("selection_clear_event",
+    g_signal_new (I_("selection_clear_event"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, selection_clear_event),
@@ -926,7 +926,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_TYPE_BOOLEAN, 1,
                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[SELECTION_REQUEST_EVENT] =
-    g_signal_new ("selection_request_event",
+    g_signal_new (I_("selection_request_event"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, selection_request_event),
@@ -935,7 +935,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_TYPE_BOOLEAN, 1,
                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[SELECTION_NOTIFY_EVENT] =
-    g_signal_new ("selection_notify_event",
+    g_signal_new (I_("selection_notify_event"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, selection_notify_event),
@@ -944,7 +944,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_TYPE_BOOLEAN, 1,
                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[SELECTION_RECEIVED] =
-    g_signal_new ("selection_received",
+    g_signal_new (I_("selection_received"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, selection_received),
@@ -954,7 +954,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  GTK_TYPE_SELECTION_DATA | G_SIGNAL_TYPE_STATIC_SCOPE,
                  G_TYPE_UINT);
   widget_signals[SELECTION_GET] =
-    g_signal_new ("selection_get",
+    g_signal_new (I_("selection_get"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, selection_get),
@@ -965,7 +965,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_TYPE_UINT,
                  G_TYPE_UINT);
   widget_signals[PROXIMITY_IN_EVENT] =
-    g_signal_new ("proximity_in_event",
+    g_signal_new (I_("proximity_in_event"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, proximity_in_event),
@@ -974,7 +974,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_TYPE_BOOLEAN, 1,
                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[PROXIMITY_OUT_EVENT] =
-    g_signal_new ("proximity_out_event",
+    g_signal_new (I_("proximity_out_event"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, proximity_out_event),
@@ -994,7 +994,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
    * undo highlighting with gtk_drag_unhighlight()
    */
   widget_signals[DRAG_LEAVE] =
-    g_signal_new ("drag_leave",
+    g_signal_new (I_("drag_leave"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, drag_leave),
@@ -1014,7 +1014,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
    * gtk_drag_source_set_icon().
    */
   widget_signals[DRAG_BEGIN] =
-    g_signal_new ("drag_begin",
+    g_signal_new (I_("drag_begin"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, drag_begin),
@@ -1032,7 +1032,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
    * A typical reason to connect to this signal is to undo things done in ::drag-begin.
    */
   widget_signals[DRAG_END] =
-    g_signal_new ("drag_end",
+    g_signal_new (I_("drag_end"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, drag_end),
@@ -1052,7 +1052,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
    * operation. 
    */
   widget_signals[DRAG_DATA_DELETE] =
-    g_signal_new ("drag_data_delete",
+    g_signal_new (I_("drag_data_delete"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, drag_data_delete),
@@ -1148,7 +1148,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
    * </programlisting></informalexample>
    */
   widget_signals[DRAG_MOTION] =
-    g_signal_new ("drag_motion",
+    g_signal_new (I_("drag_motion"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, drag_motion),
@@ -1179,7 +1179,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
    * supported targets.
    */
   widget_signals[DRAG_DROP] =
-    g_signal_new ("drag_drop",
+    g_signal_new (I_("drag_drop"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, drag_drop),
@@ -1205,7 +1205,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
    * gtk_selection_data_set_text().
    */
   widget_signals[DRAG_DATA_GET] =
-    g_signal_new ("drag_data_get",
+    g_signal_new (I_("drag_data_get"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, drag_data_get),
@@ -1278,7 +1278,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
  * </programlisting></informalexample>
  */
   widget_signals[DRAG_DATA_RECEIVED] =
-    g_signal_new ("drag_data_received",
+    g_signal_new (I_("drag_data_received"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, drag_data_received),
@@ -1292,7 +1292,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_TYPE_UINT,
                  G_TYPE_UINT);
   widget_signals[VISIBILITY_NOTIFY_EVENT] =
-    g_signal_new ("visibility_notify_event",
+    g_signal_new (I_("visibility_notify_event"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, visibility_notify_event),
@@ -1301,7 +1301,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_TYPE_BOOLEAN, 1,
                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[CLIENT_EVENT] =
-    g_signal_new ("client_event",
+    g_signal_new (I_("client_event"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, client_event),
@@ -1310,7 +1310,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_TYPE_BOOLEAN, 1,
                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[NO_EXPOSE_EVENT] =
-    g_signal_new ("no_expose_event",
+    g_signal_new (I_("no_expose_event"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, no_expose_event),
@@ -1319,7 +1319,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_TYPE_BOOLEAN, 1,
                  GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
   widget_signals[WINDOW_STATE_EVENT] =
-    g_signal_new ("window_state_event",
+    g_signal_new (I_("window_state_event"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, window_state_event),
@@ -1345,7 +1345,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
    * Since: 2.8
    */
   widget_signals[GRAB_BROKEN] =
-    g_signal_new ("grab_broken_event",
+    g_signal_new (I_("grab_broken_event"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, grab_broken_event),
@@ -1366,7 +1366,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
  * example of how to use this signal.
  */
   widget_signals[POPUP_MENU] =
-    g_signal_new ("popup_menu",
+    g_signal_new (I_("popup_menu"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                  G_STRUCT_OFFSET (GtkWidgetClass, popup_menu),
@@ -1374,7 +1374,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  _gtk_marshal_BOOLEAN__VOID,
                  G_TYPE_BOOLEAN, 0);
   widget_signals[SHOW_HELP] =
-    g_signal_new ("show_help",
+    g_signal_new (I_("show_help"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                  G_STRUCT_OFFSET (GtkWidgetClass, show_help),
@@ -1383,7 +1383,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  G_TYPE_BOOLEAN, 1,
                  GTK_TYPE_WIDGET_HELP_TYPE);
   widget_signals[ACCEL_CLOSURES_CHANGED] =
-    g_signal_new ("accel_closures_changed",
+    g_signal_new (I_("accel_closures_changed"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  0,
                  0,
@@ -1391,7 +1391,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                  _gtk_marshal_NONE__NONE,
                  G_TYPE_NONE, 0);
   widget_signals[SCREEN_CHANGED] =
-    g_signal_new ("screen_changed",
+    g_signal_new (I_("screen_changed"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, screen_changed),
@@ -1412,7 +1412,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
  * for determining whether an accelerator can be activated.
  */
   widget_signals[CAN_ACTIVATE_ACCEL] =
-    g_signal_new ("can_activate_accel",
+     g_signal_new (I_("can_activate_accel"),
                  G_TYPE_FROM_CLASS (gobject_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GtkWidgetClass, can_activate_accel),
@@ -7519,7 +7519,7 @@ gtk_requisition_get_type (void)
   static GType our_type = 0;
   
   if (our_type == 0)
-    our_type = g_boxed_type_register_static (g_intern_static_string ("GtkRequisition"),
+    our_type = g_boxed_type_register_static (I_("GtkRequisition"),
                                             (GBoxedCopyFunc) gtk_requisition_copy,
                                             (GBoxedFreeFunc) gtk_requisition_free);
 
index 31dddfe3fff7a01f743109c6b329d29171c1ea9d..20750b8a501ed1674ad14ccaa5c2244e836af2c3 100644 (file)
@@ -148,7 +148,7 @@ gtk_decorated_window_init (GtkWindow   *window)
   deco->maximizable = FALSE;
   deco->real_inner_move = FALSE;
  
-  g_object_set_data_full (G_OBJECT (window), g_intern_static_string ("gtk-window-decoration"), deco,
+  g_object_set_data_full (G_OBJECT (window), I_("gtk-window-decoration"), deco,
                          (GDestroyNotify) gtk_decoration_free);
   
   gtk_window_set_has_frame (window, TRUE);
index c5279a7ec97dbab1f42f681135432296361cf296..904c12c09ea8ee4a3c08365683ac5bd23b6f6496 100644 (file)
@@ -317,7 +317,7 @@ gtk_window_get_type (void)
        (GInstanceInitFunc) gtk_window_init,
       };
 
-      window_type = g_type_register_static (GTK_TYPE_BIN, g_intern_static_string ("GtkWindow"),
+      window_type = g_type_register_static (GTK_TYPE_BIN, I_("GtkWindow"),
                                            &window_info, 0);
     }
 
@@ -670,7 +670,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                                                      GTK_PARAM_READWRITE));
 
   window_signals[SET_FOCUS] =
-    g_signal_new ("set_focus",
+    g_signal_new (I_("set_focus"),
                   G_TYPE_FROM_CLASS (gobject_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkWindowClass, set_focus),
@@ -680,7 +680,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                   GTK_TYPE_WIDGET);
   
   window_signals[FRAME_EVENT] =
-    g_signal_new ("frame_event",
+    g_signal_new (I_("frame_event"),
                   G_TYPE_FROM_CLASS (gobject_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET(GtkWindowClass, frame_event),
@@ -690,7 +690,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                   GDK_TYPE_EVENT);
 
   window_signals[ACTIVATE_FOCUS] =
-    g_signal_new ("activate_focus",
+    g_signal_new (I_("activate_focus"),
                   G_TYPE_FROM_CLASS (gobject_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                   G_STRUCT_OFFSET (GtkWindowClass, activate_focus),
@@ -700,7 +700,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                   0);
 
   window_signals[ACTIVATE_DEFAULT] =
-    g_signal_new ("activate_default",
+    g_signal_new (I_("activate_default"),
                   G_TYPE_FROM_CLASS (gobject_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                   G_STRUCT_OFFSET (GtkWindowClass, activate_default),
@@ -710,7 +710,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                   0);
 
   window_signals[MOVE_FOCUS] =
-    g_signal_new ("move_focus",
+    g_signal_new (I_("move_focus"),
                   G_TYPE_FROM_CLASS (gobject_class),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
                   G_STRUCT_OFFSET (GtkWindowClass, move_focus),
@@ -721,7 +721,7 @@ gtk_window_class_init (GtkWindowClass *klass)
                   GTK_TYPE_DIRECTION_TYPE);
 
   window_signals[KEYS_CHANGED] =
-    g_signal_new ("keys_changed",
+    g_signal_new (I_("keys_changed"),
                   G_TYPE_FROM_CLASS (gobject_class),
                   G_SIGNAL_RUN_FIRST,
                   G_STRUCT_OFFSET (GtkWindowClass, keys_changed),
@@ -1731,7 +1731,7 @@ gtk_window_add_embedded_xid (GtkWindow *window, guint xid)
   embedded_windows = g_list_prepend (embedded_windows,
                                     GUINT_TO_POINTER (xid));
 
-  g_object_set_data_full (G_OBJECT (window), g_intern_static_string ("gtk-embedded"), 
+  g_object_set_data_full (G_OBJECT (window), I_("gtk-embedded"), 
                          embedded_windows,
                          embedded_windows ?
                            (GDestroyNotify) g_list_free : NULL);
@@ -1757,7 +1757,7 @@ gtk_window_remove_embedded_xid (GtkWindow *window, guint xid)
       g_list_free_1 (node);
     }
   
-  g_object_set_data_full (G_OBJECT (window), g_intern_static_string ("gtk-embedded"),
+  g_object_set_data_full (G_OBJECT (window), I_("gtk-embedded"),
                          embedded_windows,
                          embedded_windows ?
                            (GDestroyNotify) g_list_free : NULL);
@@ -2558,7 +2558,7 @@ ensure_icon_info (GtkWindow *window)
     {
       info = g_new0 (GtkWindowIconInfo, 1);
       g_object_set_data_full (G_OBJECT (window),
-                              g_intern_static_string ("gtk-window-icon-info"),
+                              I_("gtk-window-icon-info"),
                               info,
                               (GDestroyNotify)free_icon_info);
     }
@@ -2580,7 +2580,7 @@ get_screen_icon_info (GdkScreen *screen)
   if (!info)
     {
       info = g_new0 (ScreenIconInfo, 1);
-      g_object_set_data (G_OBJECT (screen), g_intern_static_string ("gtk-window-default-icon-pixmap"), info);
+      g_object_set_data (G_OBJECT (screen), I_("gtk-window-default-icon-pixmap"), info);
     }
 
   if (info->serial != default_icon_serial)
@@ -6940,7 +6940,7 @@ gtk_window_group_get_type (void)
        (GInstanceInitFunc) NULL,
       };
 
-      window_group_type = g_type_register_static (G_TYPE_OBJECT, g_intern_static_string ("GtkWindowGroup"), 
+      window_group_type = g_type_register_static (G_TYPE_OBJECT, I_("GtkWindowGroup"), 
                                                  &window_group_info, 0);
     }
 
@@ -7523,7 +7523,7 @@ gtk_window_get_key_hash (GtkWindow *window)
   key_hash = _gtk_key_hash_new (gdk_keymap_get_for_display (gdk_screen_get_display (screen)),
                                (GDestroyNotify)g_free);
   _gtk_window_keys_foreach (window, add_to_key_hash, key_hash);
-  g_object_set_data (G_OBJECT (window), g_intern_static_string ("gtk-window-key-hash"), key_hash);
+  g_object_set_data (G_OBJECT (window), I_("gtk-window-key-hash"), key_hash);
 
   return key_hash;
 }