libepc r246 - in trunk: . libepc libepc-ui

[hasselmm svn gnome org]

Author: hasselmm
Date: Sun Oct 19 20:11:15 2008
New Revision: 246
URL: http://svn.gnome.org/viewvc/libepc?rev=246&view=rev

Log:
Remove redundant epc_gettext() function.

* Makefile.am:
* libepc/i18n.c:
* libepc/i18n.h:
  Remove libepc/i18n.[ch].

* libepc/consumer.c:
* libepc/publisher.c:
* libepc/tls.c:
* libepc-ui/password-dialog.c:
* libepc-ui/progress-window.c:
* libepc/shell.c (epc_shell_init()):
  Include <glib/gi18n-lib.h> instead of "libepc/i18n.h".
  Bind localedir in epc_shell_init() instead of epc_gettext().


Removed:
   trunk/libepc/i18n.c
   trunk/libepc/i18n.h
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/NEWS
   trunk/libepc-ui/password-dialog.c
   trunk/libepc-ui/progress-window.c
   trunk/libepc/consumer.c
   trunk/libepc/publisher.c
   trunk/libepc/shell.c
   trunk/libepc/tls.c

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Sun Oct 19 20:11:15 2008
@@ -69,8 +69,6 @@
 	$(srcdir)/libepc/service-type.h \
 	$(srcdir)/libepc/shell.h \
 	$(srcdir)/libepc/tls.h
-noinst_HEADERS = \
-	$(srcdir)/libepc/i18n.h
 libepc_include_HEADERS = \
 	$(libepc_headers) \
 	libepc/enums.h \
@@ -107,7 +105,6 @@
 	libepc/enums.c \
 	libepc/enums.c.in \
 	libepc/enums.h.in \
-	libepc/i18n.c \
 	libepc/marshal.c \
 	libepc/marshal.list \
 	libepc/protocol.c \
@@ -134,7 +131,8 @@
 	-DG_DISABLE_DEPRECATED=1 \
 	-DGDK_DISABLE_DEPRECATED=1 \
 	-DGTK_DISABLE_DEPRECATED=1 \
-	-DLOCALEDIR=\"$(localedir)\"
+	-DLOCALEDIR=\"$(localedir)\" \
+	-DGETTEXT_PACKAGE=\"@GETTEXT_PACKAGE \"
 
 libepc_libepc_1_0_la_CFLAGS			= $(AM_CFLAGS) $(LIBEPC_CFLAGS) -DG_LOG_DOMAIN=\"libepc\"
 libepc_libepc_1_0_la_LDFLAGS			= $(LIBEPC_LIBS) -version-info $(LT_VERSION_INFO)

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Sun Oct 19 20:11:15 2008
@@ -1,8 +1,13 @@
+Release 0.3.x
+=============
+
+	* Drop redundant epc_gettext() function (Mathias Hasselmann).
+
 Release 0.3.7
 =============
 
-	* Fix the examples and tests build on some platforms.
-	(GÃtz Waschk, Murray Cumming) Bug #556689
+	* Fix the examples and tests build on some platforms
+	  (GÃtz Waschk, Murray Cumming) Bug #556689.
 
 Release 0.3.6
 =============

Modified: trunk/libepc-ui/password-dialog.c
==============================================================================
--- trunk/libepc-ui/password-dialog.c	(original)
+++ trunk/libepc-ui/password-dialog.c	Sun Oct 19 20:11:15 2008
@@ -20,8 +20,8 @@
  */
 
 #include "password-dialog.h"
-#include "libepc/i18n.h"
 
+#include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 
 /**

Modified: trunk/libepc-ui/progress-window.c
==============================================================================
--- trunk/libepc-ui/progress-window.c	(original)
+++ trunk/libepc-ui/progress-window.c	Sun Oct 19 20:11:15 2008
@@ -20,9 +20,9 @@
  */
 
 #include "progress-window.h"
-#include "libepc/i18n.h"
+#include "libepc/shell.h"
 
-#include <libepc/shell.h>
+#include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 #include <string.h>
 

Modified: trunk/libepc/consumer.c
==============================================================================
--- trunk/libepc/consumer.c	(original)
+++ trunk/libepc/consumer.c	Sun Oct 19 20:11:15 2008
@@ -22,11 +22,11 @@
 #include "libepc/consumer.h"
 
 #include "libepc/enums.h"
-#include "libepc/i18n.h"
 #include "libepc/marshal.h"
 #include "libepc/service-monitor.h"
 #include "libepc/shell.h"
 
+#include <glib/gi18n-lib.h>
 #include <libsoup/soup.h>
 #include <string.h>
 

Modified: trunk/libepc/publisher.c
==============================================================================
--- trunk/libepc/publisher.c	(original)
+++ trunk/libepc/publisher.c	Sun Oct 19 20:11:15 2008
@@ -22,11 +22,10 @@
 #include "libepc/publisher.h"
 #include "libepc/dispatcher.h"
 #include "libepc/enums.h"
-#include "libepc/i18n.h"
 #include "libepc/shell.h"
 #include "libepc/tls.h"
 
-#include <glibconfig.h>
+#include <glib/gi18n-lib.h>
 #include <libsoup/soup.h>
 #include <string.h>
 

Modified: trunk/libepc/shell.c
==============================================================================
--- trunk/libepc/shell.c	(original)
+++ trunk/libepc/shell.c	Sun Oct 19 20:11:15 2008
@@ -19,12 +19,12 @@
  *      Mathias Hasselmann
  */
 #include "libepc/shell.h"
-#include "libepc/i18n.h"
 
 #include <avahi-common/error.h>
 #include <avahi-glib/glib-malloc.h>
 #include <avahi-glib/glib-watch.h>
 
+#include <glib/gi18n-lib.h>
 #include <glib-object.h>
 #include <gmodule.h>
 
@@ -121,6 +121,9 @@
 
       epc_shell_avahi_poll = avahi_glib_poll_new (NULL, G_PRIORITY_DEFAULT);
       g_assert (NULL != epc_shell_avahi_poll);
+
+      bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+      bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
     }
 }
 

Modified: trunk/libepc/tls.c
==============================================================================
--- trunk/libepc/tls.c	(original)
+++ trunk/libepc/tls.c	Sun Oct 19 20:11:15 2008
@@ -19,7 +19,6 @@
  *      Mathias Hasselmann
  */
 #include "libepc/tls.h"
-#include "libepc/i18n.h"
 #include "libepc/shell.h"
 
 #include <sys/types.h>
@@ -29,6 +28,7 @@
 #include <string.h>
 #include <unistd.h>
 
+#include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
 #include <uuid/uuid.h>