|
 |
9bf800f |
--- gnome-desktop-2.10.0/libgnome-desktop/gnome-desktop-item.c.init-i18n 2005-05-23 11:18:59.000000000 -0400
|
|
|
9bf800f |
+++ gnome-desktop-2.10.0/libgnome-desktop/gnome-desktop-item.c 2005-05-23 11:18:59.000000000 -0400
|
|
|
b9ddcdd |
@@ -38,7 +38,7 @@
|
|
|
b9ddcdd |
#include <unistd.h>
|
|
|
b9ddcdd |
#include <time.h>
|
|
|
b9ddcdd |
#include <string.h>
|
|
|
b9ddcdd |
-#include <glib/gi18n.h>
|
|
|
b9ddcdd |
+#include <glib/gi18n-lib.h>
|
|
|
b9ddcdd |
#include <libgnome/gnome-util.h>
|
|
|
b9ddcdd |
#include <libgnome/gnome-exec.h>
|
|
|
b9ddcdd |
#include <libgnome/gnome-url.h>
|
|
|
9bf800f |
@@ -337,6 +337,20 @@
|
|
|
9bf800f |
return GNOME_DESKTOP_ITEM_TYPE_OTHER;
|
|
|
9bf800f |
}
|
|
|
9bf800f |
|
|
|
9bf800f |
+static void
|
|
|
9bf800f |
+init_i18n (void) {
|
|
|
9bf800f |
+ static gboolean initialized = FALSE;
|
|
|
9bf800f |
+
|
|
|
b9ddcdd |
+ /* initialize i18n if needed */
|
|
|
9bf800f |
+ if (!initialized) {
|
|
|
b9ddcdd |
+ bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
|
|
|
9bf800f |
+#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
|
|
|
b9ddcdd |
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
|
|
|
9bf800f |
+#endif
|
|
|
9bf800f |
+ initialized = TRUE;
|
|
|
b9ddcdd |
+ }
|
|
|
9bf800f |
+}
|
|
|
9bf800f |
+
|
|
|
9bf800f |
/**
|
|
|
9bf800f |
* gnome_desktop_item_new:
|
|
|
9bf800f |
*
|
|
|
9bf800f |
@@ -349,6 +363,8 @@
|
|
|
9bf800f |
{
|
|
|
9bf800f |
GnomeDesktopItem *retval;
|
|
|
b9ddcdd |
|
|
|
9bf800f |
+ init_i18n ();
|
|
|
9bf800f |
+
|
|
|
b9ddcdd |
retval = g_new0 (GnomeDesktopItem, 1);
|
|
|
b9ddcdd |
|
|
|
9bf800f |
retval->refcount++;
|
|
|
9bf800f |
--- gnome-desktop-2.10.0/libgnome-desktop/gnome-ditem-edit.c.init-i18n 2004-11-18 12:42:53.000000000 -0500
|
|
|
9bf800f |
+++ gnome-desktop-2.10.0/libgnome-desktop/gnome-ditem-edit.c 2005-05-23 11:20:17.000000000 -0400
|
|
|
9bf800f |
@@ -28,7 +28,7 @@
|
|
|
9bf800f |
#include <stdio.h>
|
|
|
9bf800f |
#include <ctype.h>
|
|
|
9bf800f |
#include <string.h>
|
|
|
9bf800f |
-#include <glib/gi18n.h>
|
|
|
9bf800f |
+#include <glib/gi18n-lib.h>
|
|
|
9bf800f |
#include <gtk/gtk.h>
|
|
|
9bf800f |
|
|
|
9bf800f |
#include <libgnome/gnome-macros.h>
|
|
|
9bf800f |
@@ -124,6 +124,9 @@
|
|
|
9bf800f |
object_class = (GtkObjectClass*) klass;
|
|
|
9bf800f |
gobject_class = (GObjectClass*) klass;
|
|
|
9bf800f |
|
|
|
9bf800f |
+ bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
|
|
|
9bf800f |
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
|
|
|
9bf800f |
+
|
|
|
9bf800f |
ditem_edit_signals[CHANGED] =
|
|
|
9bf800f |
g_signal_new ("changed",
|
|
|
9bf800f |
G_TYPE_FROM_CLASS (object_class),
|