Commit 00473507 authored by Richard Hult's avatar Richard Hult Committed by Richard Hult

Remove mrp-intl.h Change mrp-intl.h to glib/gi18n.h. Change

2004-08-09  Richard Hult  <richard@imendio.com>

	* libplanner/Makefile.am: Remove mrp-intl.h
	* libplanner/*.c: Change mrp-intl.h to glib/gi18n.h.
	* src/*.c: Change libgnome/gnome-i18n.h to glib/gi18n.h.
parent 15fc89d8
2004-08-09 Richard Hult <richard@imendio.com>
* libplanner/Makefile.am: Remove mrp-intl.h
* libplanner/*.c: Change mrp-intl.h to glib/gi18n.h.
* src/*.c: Change libgnome/gnome-i18n.h to glib/gi18n.h.
2004-08-09 Richard Hult <richard@imendio.com>
* configure.in:
......
......@@ -30,8 +30,7 @@ libplanner_1_la_SOURCES = \
mrp-private.h \
mrp-property.c \
mrp-time.c \
mrp-error.c \
mrp-intl.h
mrp-error.c
libplannerinclude_HEADERS = \
planner.h \
......
......@@ -25,7 +25,7 @@
#include <stdlib.h>
#include "mrp-intl.h"
#include <glib/gi18n.h>
#include "mrp-file-module.h"
#include "mrp-private.h"
#include "mrp-application.h"
......
......@@ -22,7 +22,7 @@
#include <config.h>
#include "mrp-intl.h"
#include <glib/gi18n.h>
#include "mrp-task.h"
#include "mrp-resource.h"
#include "mrp-marshal.h"
......
......@@ -25,7 +25,7 @@
#include <string.h>
#include "mrp-marshal.h"
#include "mrp-intl.h"
#include <glib/gi18n.h>
#include "mrp-private.h"
#include "mrp-time.h"
#include "mrp-calendar.h"
......
......@@ -21,7 +21,7 @@
*/
#include "mrp-private.h"
#include "mrp-intl.h"
#include <glib/gi18n.h>
#include "mrp-day.h"
struct _MrpDay {
......
......@@ -23,7 +23,7 @@
#include <config.h>
#include <string.h>
#include "mrp-intl.h"
#include <glib/gi18n.h>
#include "mrp-file-module.h"
static MrpFileModule *
......
......@@ -22,7 +22,7 @@
#include <config.h>
#include "string.h"
#include "mrp-intl.h"
#include <glib/gi18n.h>
#include "mrp-group.h"
struct _MrpGroupPriv {
......
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* Copyright (C) 2001-2002 CodeFactory AB
* Copyright (C) 2001-2002 Richard Hult <richard@imendio.com>
* Copyright (C) 2001-2002 Mikael Hallendal <micke@imendio.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This 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
* General Public License for more details.
*
* You should have received a copy of the GNU 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.
*/
#ifndef __MRP_INTL_H__
#define __MRP_INTL_H__
#include "config.h"
#ifdef ENABLE_NLS
#include<libintl.h>
#define _(String) dgettext(GETTEXT_PACKAGE,String)
#ifdef gettext_noop
#define N_(String) gettext_noop(String)
#else
#define N_(String) (String)
#endif
#else /* NLS is disabled */
#define _(String) (String)
#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
#endif
......@@ -28,7 +28,7 @@
#include <stdlib.h>
#include "mrp-private.h"
#include "mrp-error.h"
#include "mrp-intl.h"
#include <glib/gi18n.h>
#include "mrp-task.h"
#include "mrp-resource.h"
#include "mrp-group.h"
......
......@@ -34,7 +34,7 @@
#include <libxml/xmlmemory.h>
#include "mrp-private.h"
#include "mrp-error.h"
#include "mrp-intl.h"
#include <glib/gi18n.h>
#include "mrp-task.h"
#include "mrp-resource.h"
#include "mrp-group.h"
......
......@@ -25,7 +25,7 @@
#include <config.h>
#include <string.h>
#include "mrp-error.h"
#include "mrp-intl.h"
#include <glib/gi18n.h>
#include "mrp-marshal.h"
#include "mrp-task-manager.h"
#include "mrp-storage-module-factory.h"
......
......@@ -24,7 +24,7 @@
#include <config.h>
#include "mrp-private.h"
#include "mrp-intl.h"
#include <glib/gi18n.h>
#include "mrp-project.h"
#include "mrp-property.h"
......
......@@ -23,7 +23,7 @@
#include <config.h>
#include <string.h>
#include "mrp-intl.h"
#include <glib/gi18n.h>
#include "mrp-types.h"
#include "mrp-marshal.h"
#include "mrp-relation.h"
......
......@@ -26,7 +26,7 @@
#include <string.h>
#include "mrp-private.h"
#include "mrp-marshal.h"
#include "mrp-intl.h"
#include <glib/gi18n.h>
#include "mrp-assignment.h"
#include "mrp-group.h"
#include "mrp-task.h"
......
......@@ -25,9 +25,9 @@
#include <string.h>
#include <stdlib.h>
#include <glib.h>
#include <glib/gi18n.h>
#include <libgda/libgda.h>
#include <libplanner/planner.h>
#include <libplanner/mrp-intl.h>
#include <libplanner/mrp-private.h>
#include "mrp-storage-sql.h"
#include "mrp-sql.h"
......
......@@ -27,7 +27,7 @@
#include "mrp-error.h"
#include "mrp-storage-module.h"
#include "mrp-private.h"
#include "mrp-intl.h"
#include <glib/gi18n.h>
#include "mrp-storage-sql.h"
#include "mrp-sql.h"
......
......@@ -26,7 +26,7 @@
#include <time.h>
#include <math.h>
#include <glib-object.h>
#include "mrp-intl.h"
#include <glib/gi18n.h>
#include "mrp-marshal.h"
#include "mrp-storage-module.h"
#include "mrp-task-manager.h"
......
......@@ -23,7 +23,7 @@
#include <config.h>
#include <string.h>
#include "mrp-marshal.h"
#include "mrp-intl.h"
#include <glib/gi18n.h>
#include "mrp-private.h"
#include "mrp-resource.h"
#include "mrp-error.h"
......
......@@ -28,7 +28,7 @@
#include <langinfo.h>
#include "mrp-time.h"
#include "mrp-types.h"
#include "mrp-intl.h"
#include <glib/gi18n.h>
#include "mrp-private.h"
static const gchar *short_month_names[12];
......
......@@ -22,6 +22,7 @@
#include <config.h>
#include <glib.h>
#include <glib/gi18n.h>
#include <gmodule.h>
#include <libgnomevfs/gnome-vfs.h>
#include <libxslt/xslt.h>
......@@ -31,21 +32,21 @@
#include <string.h>
#include <libplanner/mrp-file-module.h>
#include <libplanner/mrp-private.h>
#include <libplanner/mrp-intl.h>
void init (MrpFileModule *module,
MrpApplication *application);
static gboolean html_write (MrpFileWriter *writer,
MrpProject *project,
const gchar *uri,
gboolean force,
GError **error);
static gboolean xml_planner_pre012_write (MrpFileWriter *writer,
MrpProject *project,
const gchar *uri,
gboolean force,
GError **error);
void init (MrpFileModule *module,
MrpApplication *application);
static gboolean html_write (MrpFileWriter *writer,
MrpProject *project,
const gchar *uri,
gboolean force,
GError **error);
static gboolean xml_planner_pre012_write (MrpFileWriter *writer,
MrpProject *project,
const gchar *uri,
gboolean force,
GError **error);
static gboolean
html_write (MrpFileWriter *writer,
......@@ -67,7 +68,7 @@ html_write (MrpFileWriter *writer,
mrp_project_save_to_xml (project, &xml_project, NULL);
/* libxml housekeeping */
xmlSubstituteEntitiesDefault(1);
xmlSubstituteEntitiesDefault (1);
xmlLoadExtDtdDefaultValue = 1;
exsltRegisterAll ();
......
......@@ -24,7 +24,7 @@
#include <config.h>
#include <gtk/gtkmain.h>
#include <gtk/gtkstock.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include "planner-window.h"
#include "planner-application.h"
......
......@@ -22,7 +22,7 @@
#include <config.h>
#include <gtk/gtktreemodel.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include <libplanner/mrp-assignment.h>
#include <libplanner/mrp-resource.h>
#include "planner-assignment-model.h"
......
......@@ -23,7 +23,7 @@
*/
#include <config.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include <glade/glade.h>
#include <gtk/gtk.h>
#include <libplanner/mrp-day.h>
......
......@@ -21,7 +21,7 @@
*/
#include <config.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include <glade/glade.h>
#include <gtk/gtk.h>
#include <libplanner/mrp-day.h>
......
......@@ -39,7 +39,7 @@
#include <gtk/gtkhbbox.h>
#include <gtk/gtkstock.h>
#include <gtk/gtkcalendar.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include "planner-marshal.h"
#include "planner-format.h"
#include "planner-cell-renderer-date.h"
......
......@@ -20,7 +20,7 @@
#include <config.h>
#include <glib.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include "planner-cmd-manager.h"
#include "planner-marshal.h"
......
......@@ -22,7 +22,7 @@
*/
#include <config.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include <glade/glade.h>
#include <gtk/gtk.h>
#include <libplanner/mrp-project.h>
......
......@@ -22,7 +22,7 @@
*/
#include <config.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include <glade/glade.h>
#include <gtk/gtk.h>
#include <libplanner/mrp-project.h>
......
......@@ -26,7 +26,7 @@
#include <locale.h>
#include <math.h>
#include <glib.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include "planner-format.h"
gchar *
......
......@@ -24,7 +24,7 @@
#include <math.h>
#include <time.h>
#include <string.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include <libplanner/mrp-project.h>
#include <libplanner/mrp-time.h>
#include "planner-gantt-background.h"
......
......@@ -28,7 +28,7 @@
#include <math.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include <libplanner/mrp-task.h>
#include "planner-marshal.h"
#include "planner-conf.h"
......
......@@ -24,7 +24,7 @@
#include <string.h>
#include <time.h>
#include <math.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include <gtk/gtkcontainer.h>
#include <gtk/gtktreemodel.h>
#include <libplanner/mrp-time.h>
......
......@@ -27,7 +27,7 @@
#include <glib.h>
#include <gtk/gtktreemodel.h>
#include <gtk/gtktreednd.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include <libplanner/mrp-task.h>
#include "planner-marshal.h"
#include "planner-gantt-model.h"
......
......@@ -27,7 +27,7 @@
#include <libplanner/mrp-project.h>
#include <libplanner/mrp-task.h>
#include <libplanner/mrp-resource.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include <libgnomeprint/gnome-print.h>
#include "planner-print-job.h"
#include "planner-format.h"
......
......@@ -28,7 +28,7 @@
#include <libplanner/mrp-project.h>
#include <libplanner/mrp-resource.h>
#include <libplanner/mrp-task.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include <libgnomecanvas/gnome-canvas.h>
#include "planner-marshal.h"
#include "planner-format.h"
......
......@@ -40,7 +40,7 @@
#include <gtk/gtkscrolledwindow.h>
#include <gtk/gtkmessagedialog.h>
#include <gtk/gtktoggleaction.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include <libplanner/mrp-task.h>
#include "planner-view.h"
#include "planner-cell-renderer-date.h"
......
......@@ -23,7 +23,7 @@
#include <config.h>
#include <stdlib.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include <glade/glade.h>
#include <gtk/gtk.h>
#include "planner-marshal.h"
......
......@@ -23,7 +23,7 @@
#include <config.h>
#include <gtk/gtktreemodel.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include "planner-group-model.h"
struct _PlannerGroupModelPriv {
......
......@@ -29,7 +29,7 @@
#include <gtk/gtkmessagedialog.h>
#include <gtk/gtkentry.h>
#include <gtk/gtkstock.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include <libgnomeui/gnome-file-entry.h>
#include "planner-window.h"
#include "planner-plugin.h"
......
......@@ -23,7 +23,7 @@
#include <config.h>
#include <gtk/gtktreemodel.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include <string.h>
#include "planner-list-model.h"
......
......@@ -27,7 +27,7 @@
#include <popt.h>
#include <gtk/gtkwidget.h>
#include <gtk/gtkmain.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include <libgnome/gnome-program.h>
#include <libgnomeui/gnome-ui-init.h>
#include <libgnomeui/gnome-window-icon.h>
......
......@@ -23,7 +23,7 @@
#include <config.h>
#include <string.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include <glade/glade.h>
#include <gtk/gtk.h>
#include <libplanner/mrp-project.h>
......
......@@ -23,7 +23,7 @@
#include <config.h>
#include <string.h>
#include <glib.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include "planner-plugin.h"
#include "planner-plugin-loader.h"
......
......@@ -23,7 +23,7 @@
#include <config.h>
#include <gtk/gtktreemodel.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include "planner-predecessor-model.h"
struct _PlannerPredecessorModelPriv {
......
......@@ -28,7 +28,7 @@
#include <unistd.h>
#include <string.h>
#include <libgnome/libgnome.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include <libgnomeprint/gnome-print.h>
#include <libgnomeprint/gnome-print-job.h>
......
......@@ -30,7 +30,7 @@
#include <time.h>
#include <glade/glade.h>
#include <gtk/gtk.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include <libplanner/mrp-project.h>
#include <libplanner/mrp-time.h>
#include "planner-calendar-selector.h"
......
......@@ -27,7 +27,7 @@
#include <ctype.h>
#include <string.h>
#include <stdlib.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include <glade/glade.h>
#include <gtk/gtkdialog.h>
#include <gtk/gtkentry.h>
......
......@@ -23,7 +23,7 @@
#include <config.h>
#include <string.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include <gtk/gtkliststore.h>
#include <libplanner/mrp-property.h>
#include "planner-property-model.h"
......
......@@ -32,7 +32,7 @@
#include <gtk/gtkstock.h>
#include <gtk/gtkfilesel.h>
#include <libgnome/libgnome.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include <libgnomeui/gnome-file-entry.h>
#include "planner-window.h"
#include "planner-plugin.h"
......
......@@ -19,7 +19,7 @@
*/
#include <config.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include "planner-resource-cmd.h"
typedef struct {
......
......@@ -40,7 +40,7 @@
#include <gtk/gtkcellrenderertoggle.h>
#include <gtk/gtktextview.h>
#include <gtk/gtktextbuffer.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include <libplanner/mrp-resource.h>
#include <libplanner/mrp-calendar.h>
#include <libplanner/mrp-time.h>
......
......@@ -23,7 +23,7 @@
#include <config.h>
#include <glade/glade.h>
#include <gtk/gtk.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include "planner-marshal.h"
#include "planner-resource-input-dialog.h"
#include "planner-resource-cmd.h"
......
......@@ -29,7 +29,7 @@
#include <glib.h>
#include <gobject/gvaluecollector.h>
#include <gmodule.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include <gtk/gtkmain.h>
#include <gtk/gtktreeview.h>
#include <gtk/gtktreeselection.h>
......
......@@ -22,7 +22,7 @@
#include <config.h>
#include <math.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include "planner-scale-utils.h"
#define WEEK (60*60*24*7)
......
......@@ -24,7 +24,7 @@
#include <math.h>
#include <gtk/gtk.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include "planner-sidebar.h"
struct _PlannerSidebarPriv {
......
......@@ -26,7 +26,7 @@
#include <string.h>
#include <stdlib.h>
#include <glib.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include <libgnomeui/gnome-entry.h>
#include <glade/glade.h>
#include <gtk/gtk.h>
......
......@@ -25,7 +25,7 @@
#include <string.h>
#include <gtk/gtk.h>
#include <libplanner/planner.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include <libgnomeprint/gnome-print.h>
#include "planner-print-job.h"
#include "planner-table-print-sheet.h"
......
......@@ -19,7 +19,7 @@
*/
#include <config.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include "planner-task-cmd.h"
#include "planner-task-tree.h"
......
......@@ -26,7 +26,7 @@
#include <time.h>
#include <string.h>
#include <stdlib.h> /* for atoi */
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include <glade/glade.h>
#include <gtk/gtk.h>
#include <libplanner/mrp-object.h>
......
......@@ -21,7 +21,7 @@
#include <gtk/gtkiconfactory.h>
#include <gtk/gtkstock.h>
#include <gtk/gtkmenu.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include "planner-task-tree.h"
#include "planner-task-popup.h"
......
......@@ -36,7 +36,7 @@
#include <gtk/gtkiconfactory.h>
#include <gtk/gtkstock.h>
#include <gtk/gtkmessagedialog.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include "planner-format.h"
#include "planner-marshal.h"
#include "planner-cell-renderer-date.h"
......
......@@ -39,7 +39,7 @@
#include <gtk/gtkscrolledwindow.h>
#include <gtk/gtkmessagedialog.h>
#include <gtk/gtktoggleaction.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include <libplanner/mrp-task.h>
#include "planner-view.h"
#include "planner-conf.h"
......
......@@ -29,7 +29,7 @@
#include <math.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include <libplanner/mrp-task.h>
#include <libplanner/mrp-resource.h>
#include <libplanner/mrp-assignment.h>
......
......@@ -29,7 +29,7 @@
#include <stdio.h>
#include <gtk/gtktreemodel.h>
#include <gtk/gtktreednd.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include <libplanner/mrp-task.h>
#include "planner-marshal.h"
#include "planner-ttable-model.h"
......
......@@ -27,7 +27,7 @@
#include <libplanner/mrp-project.h>
#include <libplanner/mrp-task.h>
#include <libplanner/mrp-resource.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include <libgnomeprint/gnome-print.h>
#include "planner-print-job.h"
#include "planner-format.h"
......
......@@ -31,7 +31,7 @@
#include <libplanner/mrp-project.h>
#include <libplanner/mrp-resource.h>
#include <libplanner/mrp-task.h>
#include <libgnome/gnome-i18n.h>
#include <glib/gi18n.h>
#include <libgnomecanvas/gnome-canvas.h>
#include <libgnomecanvas/gnome-canvas-util.h>
#include "planner-marshal.h"
......
......@@ -36,7 +36,7 @@
#include <gtk/gtkiconfactory.h>
#include <gtk/gtkstock.h>
#include <gtk/gtkmessagedialog.h>
#include <libgnome/gnome-i18n.h>