gnome-desktop r5418 - trunk/libgnome-desktop

[vuntz svn gnome org]

Author: vuntz
Date: Tue Mar  3 17:19:07 2009
New Revision: 5418
URL: http://svn.gnome.org/viewvc/gnome-desktop?rev=5418&view=rev

Log:
2009-03-03  Vincent Untz  <vuntz gnome org>

	Make sure the translations of gnome-desktop can be used for the randr
	stuff. Fix bug #573744.

	* private.h: new file
	* gnome-desktop-utils.c:
	(_gnome_desktop_init_i18n): add _gnome_desktop_init_i18n() to init the
	i18n system.
	* gnome-desktop-item.c: (gnome_desktop_item_new): call
	_gnome_desktop_init_i18n() instead of init_i18n()
	(init_i18n): killed
	* gnome-desktop-utils.c:
	(gnome_desktop_prepend_terminal_to_vector): call
	_gnome_desktop_init_i18n()
	* gnome-rr.c: (gnome_rr_screen_new): call _gnome_desktop_init_i18n()


Added:
   trunk/libgnome-desktop/private.h
Modified:
   trunk/libgnome-desktop/ChangeLog
   trunk/libgnome-desktop/gnome-desktop-item.c
   trunk/libgnome-desktop/gnome-desktop-utils.c
   trunk/libgnome-desktop/gnome-rr.c

Modified: trunk/libgnome-desktop/gnome-desktop-item.c
==============================================================================
--- trunk/libgnome-desktop/gnome-desktop-item.c	(original)
+++ trunk/libgnome-desktop/gnome-desktop-item.c	Tue Mar  3 17:19:07 2009
@@ -59,6 +59,8 @@
 #include <libgnome/gnome-desktop-item.h>
 #include <libgnome/gnome-desktop-utils.h>
 
+#include "private.h"
+
 struct _GnomeDesktopItem {
 	int refcount;
 
@@ -347,19 +349,6 @@
 	return GNOME_DESKTOP_ITEM_TYPE_OTHER;
 }
 
-static void
-init_i18n (void) {
-	static gboolean initialized = FALSE;
-	
-	if (!initialized) {
-		bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
-#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
-		bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-#endif
-		initialized = TRUE;
-	}
-}
-
 /**
  * gnome_desktop_item_new:
  *
@@ -372,7 +361,7 @@
 {
 	GnomeDesktopItem *retval;
 
-	init_i18n ();
+	_gnome_desktop_init_i18n ();
 
 	retval = g_new0 (GnomeDesktopItem, 1);
 

Modified: trunk/libgnome-desktop/gnome-desktop-utils.c
==============================================================================
--- trunk/libgnome-desktop/gnome-desktop-utils.c	(original)
+++ trunk/libgnome-desktop/gnome-desktop-utils.c	Tue Mar  3 17:19:07 2009
@@ -32,6 +32,7 @@
 #define GNOME_DESKTOP_USE_UNSTABLE_API
 #include <libgnome/gnome-desktop-utils.h>
 
+#include "private.h"
 
 /**
  * gnome_desktop_prepend_terminal_to_vector:
@@ -65,6 +66,8 @@
         g_return_if_fail (argc != NULL);
         g_return_if_fail (argv != NULL);
 
+        _gnome_desktop_init_i18n ();
+
 	/* sanity */
         if(*argv == NULL)
                 *argc = 0;
@@ -159,3 +162,17 @@
 	g_warning ("gnome_prepend_terminal_to_vector: Not implemented");
 #endif
 }
+
+void
+_gnome_desktop_init_i18n (void) {
+	static gboolean initialized = FALSE;
+	
+	if (!initialized) {
+		bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
+		bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+#endif
+		initialized = TRUE;
+	}
+}
+

Modified: trunk/libgnome-desktop/gnome-rr.c
==============================================================================
--- trunk/libgnome-desktop/gnome-rr.c	(original)
+++ trunk/libgnome-desktop/gnome-rr.c	Tue Mar  3 17:19:07 2009
@@ -34,6 +34,8 @@
 #include <gdk/gdkx.h>
 #include <X11/Xatom.h>
 
+#include "private.h"
+
 #define DISPLAY(o) ((o)->info->screen->xdisplay)
 
 typedef struct ScreenInfo ScreenInfo;
@@ -537,6 +539,8 @@
 
     g_return_val_if_fail (error == NULL || *error == NULL, NULL);
     
+    _gnome_desktop_init_i18n ();
+
     if (XRRQueryExtension (dpy, &event_base, &ignore))
     {
 	GnomeRRScreen *screen = g_new0 (GnomeRRScreen, 1);

Added: trunk/libgnome-desktop/private.h
==============================================================================
--- (empty file)
+++ trunk/libgnome-desktop/private.h	Tue Mar  3 17:19:07 2009
@@ -0,0 +1,34 @@
+/* gnome-bg-crossfade.h - fade window background between two pixmaps
+
+   Copyright 2009, Novell, Inc.
+
+   This file is part of the Gnome Library.
+
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Author: Vincent Untz <vuntz gnome org>
+*/
+
+#ifndef __GNOME_DESKTOP_PRIVATE_H__
+#define __GNOME_DESKTOP_PRIVATE_H__
+
+G_BEGIN_DECLS
+
+void _gnome_desktop_init_i18n (void);
+
+G_END_DECLS
+
+#endif