X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=glib%2Fgi18n-lib.h;h=150a2686d16c3612bb28e8101ff74c49a85fef30;hb=35eaf037bdfca985abf5d349e7355f1d2ed9c77b;hp=dc1a6208e99f2ff4c9de9f7c634d0276fb74d9dd;hpb=2807b4e6eb29c52ac8bd4e9f59c5c58580a9a4e3;p=platform%2Fupstream%2Fglib.git

diff --git a/glib/gi18n-lib.h b/glib/gi18n-lib.h
index dc1a620..150a268 100644
--- a/glib/gi18n-lib.h
+++ b/glib/gi18n-lib.h
@@ -12,44 +12,25 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
+
 #ifndef __G_I18N_LIB_H__
 #define __G_I18N_LIB_H__
 
-#include <glib/gstrfuncs.h>
-
-#ifdef ENABLE_NLS
+#include <glib.h>
 
 #include <libintl.h>
+#include <string.h>
 
 #ifndef GETTEXT_PACKAGE
-#error You must define GETTEXT_PACKAGE before including gi18n-lib.h.
-#endif
-
-#define _(String) dgettext (GETTEXT_PACKAGE, String)
-#define Q_(String) g_strip_context ((String), dgettext (GETTEXT_PACKAGE, String))
-#ifdef gettext_noop
-#define N_(String) gettext_noop (String)
-#else
-#define N_(String) (String)
+#error You must define GETTEXT_PACKAGE before including gi18n-lib.h.  Did you forget to include config.h?
 #endif
 
-#else /* NLS is disabled */
-
-#define _(String) (String)
-#define Q_(String) (String)
+#define  _(String) ((char *) g_dgettext (GETTEXT_PACKAGE, String))
+#define Q_(String) g_dpgettext (GETTEXT_PACKAGE, String, 0)
 #define N_(String) (String)
-#define textdomain(String) (String)
-#define gettext(String) (String)
-#define dgettext(Domain,String) (String)
-#define dcgettext(Domain,String,Type) (String)
-#define bindtextdomain(Domain,Directory) (Domain) 
-
-#endif
+#define C_(Context,String) g_dpgettext (GETTEXT_PACKAGE, Context "\004" String, strlen (Context) + 1)
+#define NC_(Context, String) (String)
 
 #endif  /* __G_I18N_LIB_H__ */
-
-