ekiga r7370 - in trunk: . lib/engine/addressbook/call-history lib/engine/addressbook/evolution lib/engine/addressbook/ldap lib/engine/addressbook/skel lib/engine/gui/gtk-core lib/engine/gui/gtk-frontend lib/engine/presence/avahi lib/engine/presence/local-roster lib/gui src/endpoints src/gui

From: dsandras svn gnome org
To: svn-commits-list gnome org
Subject: ekiga r7370 - in trunk: . lib/engine/addressbook/call-history lib/engine/addressbook/evolution lib/engine/addressbook/ldap lib/engine/addressbook/skel lib/engine/gui/gtk-core lib/engine/gui/gtk-frontend lib/engine/presence/avahi lib/engine/presence/local-roster lib/gui src/endpoints src/gui
Date: Sun, 16 Nov 2008 12:33:47 +0000 (UTC)
Author: dsandras
Date: Sun Nov 16 12:33:47 2008
New Revision: 7370
URL: http://svn.gnome.org/viewvc/ekiga?rev=7370&view=rev

Log:
Cleanup : only include common.h and config.h when absolutely
needed. Use glib/gi18n.h for i18n and not our custom definitions in
config.h.


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/lib/engine/addressbook/call-history/Makefile.am
   trunk/lib/engine/addressbook/call-history/history-contact.cpp
   trunk/lib/engine/addressbook/evolution/Makefile.am
   trunk/lib/engine/addressbook/evolution/evolution-book.cpp
   trunk/lib/engine/addressbook/evolution/evolution-contact.cpp
   trunk/lib/engine/addressbook/ldap/ldap-book.h
   trunk/lib/engine/addressbook/skel/Makefile.am
   trunk/lib/engine/addressbook/skel/contact-core.cpp
   trunk/lib/engine/gui/gtk-core/form-dialog-gtk.cpp
   trunk/lib/engine/gui/gtk-frontend/addressbook-window.cpp
   trunk/lib/engine/gui/gtk-frontend/book-view-gtk.cpp
   trunk/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
   trunk/lib/engine/gui/gtk-frontend/chat-area.cpp
   trunk/lib/engine/gui/gtk-frontend/chat-window.cpp
   trunk/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
   trunk/lib/engine/presence/avahi/avahi-heap.cpp
   trunk/lib/engine/presence/local-roster/Makefile.am
   trunk/lib/engine/presence/local-roster/local-cluster.cpp
   trunk/lib/engine/presence/local-roster/local-heap.cpp
   trunk/lib/engine/presence/local-roster/local-presentity.cpp
   trunk/lib/engine/presence/local-roster/local-roster-bridge.cpp
   trunk/lib/gui/codecsbox.h
   trunk/lib/gui/gmdialog.c
   trunk/src/endpoints/h323-endpoint.cpp
   trunk/src/endpoints/h323-endpoint.h
   trunk/src/endpoints/opal-account.cpp
   trunk/src/endpoints/opal-bank.cpp
   trunk/src/endpoints/opal-call-manager.cpp
   trunk/src/endpoints/opal-call-manager.h
   trunk/src/endpoints/opal-call.cpp
   trunk/src/endpoints/opal-call.h
   trunk/src/endpoints/opal-gmconf-bridge.cpp
   trunk/src/endpoints/opal-main.cpp
   trunk/src/endpoints/pcss-endpoint.cpp
   trunk/src/endpoints/sip-endpoint.cpp
   trunk/src/endpoints/sip-endpoint.h
   trunk/src/gui/accounts.cpp
   trunk/src/gui/accounts.h
   trunk/src/gui/assistant.cpp
   trunk/src/gui/dialpad.cpp
   trunk/src/gui/main.cpp
   trunk/src/gui/main.h
   trunk/src/gui/misc.cpp
   trunk/src/gui/misc.h
   trunk/src/gui/statusicon.cpp
   trunk/src/gui/statusicon.h
   trunk/src/gui/statusmenu.cpp
   trunk/src/gui/statusmenu.h

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun Nov 16 12:33:47 2008
@@ -721,18 +721,6 @@
   AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${DATADIRNAME}/locale",[fix])
 fi
 
-AH_BOTTOM(
-#ifndef _
-#include <libintl.h>
-#define _(x) gettext(x)
-#ifdef gettext_noop
-#define N_(String) gettext_noop (String)
-#else
-#define N_(String) (String)
-#endif
-#endif
-)
-
 
 dnl ###########################################################################
 dnl  Data and configuration directories for the system

Modified: trunk/lib/engine/addressbook/call-history/Makefile.am
==============================================================================
--- trunk/lib/engine/addressbook/call-history/Makefile.am	(original)
+++ trunk/lib/engine/addressbook/call-history/Makefile.am	Sun Nov 16 12:33:47 2008
@@ -24,4 +24,4 @@
 libcall_history_la_LIBADD = \
 	$(top_builddir)/lib/engine/addressbook/skel/libgmaddressbook.la
 
-libcall_history_la_LDFLAGS = -export-dynamic -no-undefined
+libcall_history_la_LDFLAGS = -export-dynamic -no-undefined $(XML_LIBS) $(SIGC_LIBS) $(GLIB_LIBS)

Modified: trunk/lib/engine/addressbook/call-history/history-contact.cpp
==============================================================================
--- trunk/lib/engine/addressbook/call-history/history-contact.cpp	(original)
+++ trunk/lib/engine/addressbook/call-history/history-contact.cpp	Sun Nov 16 12:33:47 2008
@@ -36,6 +36,7 @@
 #include "config.h"
 
 #include <iostream>
+#include <glib/gi18n.h>
 #include <glib.h>
 
 #include "robust-xml.h"

Modified: trunk/lib/engine/addressbook/evolution/Makefile.am
==============================================================================
--- trunk/lib/engine/addressbook/evolution/Makefile.am	(original)
+++ trunk/lib/engine/addressbook/evolution/Makefile.am	Sun Nov 16 12:33:47 2008
@@ -2,7 +2,7 @@
 
 evolution_dir = $(top_srcdir)/lib/engine/addressbook/evolution
 
-AM_CXXFLAGS = $(SIGC_CFLAGS) $(EDS_CFLAGS)
+AM_CXXFLAGS = $(SIGC_CFLAGS) $(EDS_CFLAGS) $(GLIB_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmref \
@@ -22,4 +22,4 @@
 libgmevolution_la_LIBADD = \
 	$(top_builddir)/lib/engine/addressbook/skel/libgmaddressbook.la
 
-libgmevolution_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(EDS_LIBS)
+libgmevolution_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(EDS_LIBS) $(GLIB_LIBS)

Modified: trunk/lib/engine/addressbook/evolution/evolution-book.cpp
==============================================================================
--- trunk/lib/engine/addressbook/evolution/evolution-book.cpp	(original)
+++ trunk/lib/engine/addressbook/evolution/evolution-book.cpp	Sun Nov 16 12:33:47 2008
@@ -37,8 +37,7 @@
 
 #include <iostream>
 #include <string>
-
-#include "config.h"
+#include <glib/gi18n.h>
 
 #include "form-request-simple.h"
 

Modified: trunk/lib/engine/addressbook/evolution/evolution-contact.cpp
==============================================================================
--- trunk/lib/engine/addressbook/evolution/evolution-contact.cpp	(original)
+++ trunk/lib/engine/addressbook/evolution/evolution-contact.cpp	Sun Nov 16 12:33:47 2008
@@ -36,8 +36,7 @@
  */
 
 #include <iostream>
-
-#include "config.h"
+#include <glib/gi18n.h>
 
 #include "evolution-contact.h"
 #include "form-request-simple.h"

Modified: trunk/lib/engine/addressbook/ldap/ldap-book.h
==============================================================================
--- trunk/lib/engine/addressbook/ldap/ldap-book.h	(original)
+++ trunk/lib/engine/addressbook/ldap/ldap-book.h	Sun Nov 16 12:33:47 2008
@@ -41,6 +41,7 @@
 
 #include <vector>
 #include <libxml/tree.h>
+#include <glib/gi18n.h>
 
 #include "runtime.h"
 #include "book-impl.h"

Modified: trunk/lib/engine/addressbook/skel/Makefile.am
==============================================================================
--- trunk/lib/engine/addressbook/skel/Makefile.am	(original)
+++ trunk/lib/engine/addressbook/skel/Makefile.am	Sun Nov 16 12:33:47 2008
@@ -2,7 +2,7 @@
 
 addressbook_dir = $(top_srcdir)/lib/engine/addressbook/skel
 
-AM_CXXFLAGS = $(SIGC_CFLAGS)
+AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmref \
@@ -17,4 +17,4 @@
 	$(addressbook_dir)/contact-core.h		\
 	$(addressbook_dir)/contact-core.cpp
 
-libgmaddressbook_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS)
+libgmaddressbook_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS)

Modified: trunk/lib/engine/addressbook/skel/contact-core.cpp
==============================================================================
--- trunk/lib/engine/addressbook/skel/contact-core.cpp	(original)
+++ trunk/lib/engine/addressbook/skel/contact-core.cpp	Sun Nov 16 12:33:47 2008
@@ -34,6 +34,7 @@
  */
 
 #include <iostream>
+#include <glib/gi18n.h>
 
 #include "config.h"
 

Modified: trunk/lib/engine/gui/gtk-core/form-dialog-gtk.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-core/form-dialog-gtk.cpp	(original)
+++ trunk/lib/engine/gui/gtk-core/form-dialog-gtk.cpp	Sun Nov 16 12:33:47 2008
@@ -33,11 +33,11 @@
  *
  */
 
-#include "config.h"
 
 #include <algorithm>
 #include <cstring>
 #include <iostream>
+#include <glib/gi18n.h>
 
 #include "toolbox.h"
 #include "form-dialog-gtk.h"

Modified: trunk/lib/engine/gui/gtk-frontend/addressbook-window.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/addressbook-window.cpp	(original)
+++ trunk/lib/engine/gui/gtk-frontend/addressbook-window.cpp	Sun Nov 16 12:33:47 2008
@@ -35,6 +35,7 @@
 #include <iostream>
 #include <map>
 #include <vector>
+#include <glib/gi18n.h>
 
 #include "gmstockicons.h"
 

Modified: trunk/lib/engine/gui/gtk-frontend/book-view-gtk.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/book-view-gtk.cpp	(original)
+++ trunk/lib/engine/gui/gtk-frontend/book-view-gtk.cpp	Sun Nov 16 12:33:47 2008
@@ -35,10 +35,10 @@
  *
  */
 
-#include "config.h"
 
 #include <algorithm>
 #include <iostream>
+#include <glib/gi18n.h>
 
 #include "book-view-gtk.h"
 

Modified: trunk/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp	(original)
+++ trunk/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp	Sun Nov 16 12:33:47 2008
@@ -38,6 +38,7 @@
 #include <sstream>
 #include <iostream>
 #include <iomanip>
+#include <glib/gi18n.h>
 
 #include "call-history-view-gtk.h"
 

Modified: trunk/lib/engine/gui/gtk-frontend/chat-area.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/chat-area.cpp	(original)
+++ trunk/lib/engine/gui/gtk-frontend/chat-area.cpp	Sun Nov 16 12:33:47 2008
@@ -36,7 +36,6 @@
  *
  */
 
-#include "config.h"
 
 #include "chat-area.h"
 #include "gm-text-buffer-enhancer.h"
@@ -51,6 +50,7 @@
 #include <string.h>
 #include <stdarg.h>
 
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 
 class ChatAreaHelper;

Modified: trunk/lib/engine/gui/gtk-frontend/chat-window.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/chat-window.cpp	(original)
+++ trunk/lib/engine/gui/gtk-frontend/chat-window.cpp	Sun Nov 16 12:33:47 2008
@@ -35,9 +35,8 @@
  *
  */
 
-#include "config.h"
-
 #include <gdk/gdkkeysyms.h>
+#include <glib/gi18n.h>
 
 #include "chat-window.h"
 #include "simple-chat-page.h"

Modified: trunk/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp	(original)
+++ trunk/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp	Sun Nov 16 12:33:47 2008
@@ -38,6 +38,7 @@
 #include <algorithm>
 #include <iostream>
 #include <vector>
+#include <glib/gi18n.h>
 
 #include "gm-refcounted-boxed.h"
 #include "gm-cell-renderer-bitext.h"

Modified: trunk/lib/engine/presence/avahi/avahi-heap.cpp
==============================================================================
--- trunk/lib/engine/presence/avahi/avahi-heap.cpp	(original)
+++ trunk/lib/engine/presence/avahi/avahi-heap.cpp	Sun Nov 16 12:33:47 2008
@@ -36,8 +36,7 @@
  */
 
 #include <cstdlib>
-
-#include "config.h"
+#include <glib/gi18n.h>
 
 #include "avahi-heap.h"
 

Modified: trunk/lib/engine/presence/local-roster/Makefile.am
==============================================================================
--- trunk/lib/engine/presence/local-roster/Makefile.am	(original)
+++ trunk/lib/engine/presence/local-roster/Makefile.am	Sun Nov 16 12:33:47 2008
@@ -2,7 +2,7 @@
 
 local_roster_dir = $(top_srcdir)/lib/engine/presence/local-roster
 
-AM_CPPFLAGS = $(XML_CFLAGS) $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS)
+AM_CPPFLAGS = $(XML_CFLAGS) $(SIGC_CFLAGS) $(GLIB_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf	 		\
@@ -28,4 +28,4 @@
 	$(top_builddir)/lib/engine/addressbook/skel/libgmaddressbook.la \
 	$(top_builddir)/lib/engine/presence/skel/libgmpresence.la
 
-liblocal_roster_la_LDFLAGS = -export-dynamic -no-undefined $(XML_LIBS) $(SIGC_LIBS) $(GLIB_LIBS) $(GTK_LIBS)
+liblocal_roster_la_LDFLAGS = -export-dynamic -no-undefined $(XML_LIBS) $(SIGC_LIBS) $(GLIB_LIBS)

Modified: trunk/lib/engine/presence/local-roster/local-cluster.cpp
==============================================================================
--- trunk/lib/engine/presence/local-roster/local-cluster.cpp	(original)
+++ trunk/lib/engine/presence/local-roster/local-cluster.cpp	Sun Nov 16 12:33:47 2008
@@ -36,6 +36,7 @@
 #include "config.h"
 
 #include <iostream>
+#include <glib/gi18n.h>
 
 #include "local-cluster.h"
 

Modified: trunk/lib/engine/presence/local-roster/local-heap.cpp
==============================================================================
--- trunk/lib/engine/presence/local-roster/local-heap.cpp	(original)
+++ trunk/lib/engine/presence/local-roster/local-heap.cpp	Sun Nov 16 12:33:47 2008
@@ -35,6 +35,7 @@
 
 #include <iostream>
 #include <set>
+#include <glib/gi18n.h>
 
 #include "config.h"
 

Modified: trunk/lib/engine/presence/local-roster/local-presentity.cpp
==============================================================================
--- trunk/lib/engine/presence/local-roster/local-presentity.cpp	(original)
+++ trunk/lib/engine/presence/local-roster/local-presentity.cpp	Sun Nov 16 12:33:47 2008
@@ -36,8 +36,7 @@
 #include <algorithm>
 #include <iostream>
 #include <set>
-
-#include "config.h"
+#include <glib/gi18n.h>
 
 #include "form-request-simple.h"
 #include "local-cluster.h"

Modified: trunk/lib/engine/presence/local-roster/local-roster-bridge.cpp
==============================================================================
--- trunk/lib/engine/presence/local-roster/local-roster-bridge.cpp	(original)
+++ trunk/lib/engine/presence/local-roster/local-roster-bridge.cpp	Sun Nov 16 12:33:47 2008
@@ -36,8 +36,7 @@
  */
 
 #include <iostream>
-
-#include "config.h"
+#include <glib/gi18n.h>
 
 #include "local-roster-bridge.h"
 #include "contact-core.h"

Modified: trunk/lib/gui/codecsbox.h
==============================================================================
--- trunk/lib/gui/codecsbox.h	(original)
+++ trunk/lib/gui/codecsbox.h	Sun Nov 16 12:33:47 2008
@@ -40,6 +40,7 @@
 #ifndef __CODECS_BOX_H
 #define __CODECS_BOX_H
 
+#include <glib/gi18n.h>
 #include <glib-object.h>
 #include <gtk/gtk.h>
 

Modified: trunk/lib/gui/gmdialog.c
==============================================================================
--- trunk/lib/gui/gmdialog.c	(original)
+++ trunk/lib/gui/gmdialog.c	Sun Nov 16 12:33:47 2008
@@ -43,7 +43,7 @@
 
 
 #include <gtk/gtk.h>
-#include <glib.h>
+#include <glib/gi18n.h>
 
 #include <stdio.h>
 #include <string.h>

Modified: trunk/src/endpoints/h323-endpoint.cpp
==============================================================================
--- trunk/src/endpoints/h323-endpoint.cpp	(original)
+++ trunk/src/endpoints/h323-endpoint.cpp	Sun Nov 16 12:33:47 2008
@@ -36,7 +36,7 @@
  */
 
 
-#include "config.h"
+#include <glib/gi18n.h>
 
 #include "h323-endpoint.h"
 

Modified: trunk/src/endpoints/h323-endpoint.h
==============================================================================
--- trunk/src/endpoints/h323-endpoint.h	(original)
+++ trunk/src/endpoints/h323-endpoint.h	Sun Nov 16 12:33:47 2008
@@ -39,9 +39,7 @@
 #ifndef _H323_ENDPOINT_H_
 #define _H323_ENDPOINT_H_
 
-#include "config.h"
-
-#include "common.h"
+#include <opal/opal.h>
 
 #include "call-core.h"
 #include "account-core.h"

Modified: trunk/src/endpoints/opal-account.cpp
==============================================================================
--- trunk/src/endpoints/opal-account.cpp	(original)
+++ trunk/src/endpoints/opal-account.cpp	Sun Nov 16 12:33:47 2008
@@ -41,9 +41,10 @@
 #include <algorithm>
 #include <sstream>
 
-#include "config.h"
-
-#include "common.h"
+#include <glib/gi18n.h>
+#include <ptlib.h>
+#include <opal/opal.h>
+#include <ptclib/guid.h>
 
 #include "opal-account.h"
 #include "form-request-simple.h"

Modified: trunk/src/endpoints/opal-bank.cpp
==============================================================================
--- trunk/src/endpoints/opal-bank.cpp	(original)
+++ trunk/src/endpoints/opal-bank.cpp	Sun Nov 16 12:33:47 2008
@@ -40,9 +40,7 @@
 #include <iostream>
 #include <sstream>
 
-#include "config.h"
-
-#include "common.h"
+#include <glib/gi18n.h>
 
 #include "menu-builder.h"
 

Modified: trunk/src/endpoints/opal-call-manager.cpp
==============================================================================
--- trunk/src/endpoints/opal-call-manager.cpp	(original)
+++ trunk/src/endpoints/opal-call-manager.cpp	Sun Nov 16 12:33:47 2008
@@ -36,8 +36,7 @@
  */
 
 #include <algorithm>
-
-#include "config.h"
+#include <glib/gi18n.h>
 
 #include "opal-call-manager.h"
 

Modified: trunk/src/endpoints/opal-call-manager.h
==============================================================================
--- trunk/src/endpoints/opal-call-manager.h	(original)
+++ trunk/src/endpoints/opal-call-manager.h	Sun Nov 16 12:33:47 2008
@@ -39,7 +39,16 @@
 #ifndef _ENDPOINT_H_
 #define _ENDPOINT_H_
 
-#include "config.h"
+#include <opal/buildopts.h>
+#include <ptbuildopts.h>
+
+#include <ptlib.h>
+
+#include <opal/manager.h>
+#include <opal/pcss.h>
+
+#include <h323/h323.h>
+#include <sip/sip.h>
 
 #include "common.h"
 

Modified: trunk/src/endpoints/opal-call.cpp
==============================================================================
--- trunk/src/endpoints/opal-call.cpp	(original)
+++ trunk/src/endpoints/opal-call.cpp	Sun Nov 16 12:33:47 2008
@@ -38,18 +38,11 @@
 #include <cctype>
 #include <algorithm>
 
-#include <opal/buildopts.h>
-#include <ptbuildopts.h>
-
-#include <ptlib.h>
-
-#include <opal/manager.h>
-#include <opal/rtpconn.h>
+#include <glib/gi18n.h>
+#include <opal/opal.h>
 #include <opal/pcss.h>
 #include <sip/sippdu.h>
 
-#include "config.h"
-
 #include "opal-call.h"
 #include "call.h"
 

Modified: trunk/src/endpoints/opal-call.h
==============================================================================
--- trunk/src/endpoints/opal-call.h	(original)
+++ trunk/src/endpoints/opal-call.h	Sun Nov 16 12:33:47 2008
@@ -34,11 +34,9 @@
  *
  */
 
-#include <opal/buildopts.h>
-#include <ptbuildopts.h>
 
-#include <ptlib.h>
-#include <opal/manager.h>
+#include <opal/opal.h>
+#include <opal/call.h>
 
 #include "runtime.h"
 #include "services.h"

Modified: trunk/src/endpoints/opal-gmconf-bridge.cpp
==============================================================================
--- trunk/src/endpoints/opal-gmconf-bridge.cpp	(original)
+++ trunk/src/endpoints/opal-gmconf-bridge.cpp	Sun Nov 16 12:33:47 2008
@@ -37,6 +37,8 @@
 #include <iostream>
 #include <sigc++/sigc++.h>
 
+#include "config.h"
+
 #include "gmconf.h"
 
 #include "opal-gmconf-bridge.h"

Modified: trunk/src/endpoints/opal-main.cpp
==============================================================================
--- trunk/src/endpoints/opal-main.cpp	(original)
+++ trunk/src/endpoints/opal-main.cpp	Sun Nov 16 12:33:47 2008
@@ -35,6 +35,8 @@
  *
  */
 
+#include "config.h"
+
 #include "opal-main.h"
 #include "bank.h"
 #include "contact-core.h"

Modified: trunk/src/endpoints/pcss-endpoint.cpp
==============================================================================
--- trunk/src/endpoints/pcss-endpoint.cpp	(original)
+++ trunk/src/endpoints/pcss-endpoint.cpp	Sun Nov 16 12:33:47 2008
@@ -36,7 +36,7 @@
  */
 
 
-#include "common.h"
+#include "config.h"
 
 #include "pcss-endpoint.h"
 #include "opal-call-manager.h"

Modified: trunk/src/endpoints/sip-endpoint.cpp
==============================================================================
--- trunk/src/endpoints/sip-endpoint.cpp	(original)
+++ trunk/src/endpoints/sip-endpoint.cpp	Sun Nov 16 12:33:47 2008
@@ -36,11 +36,13 @@
  */
 
 
-#include "config.h"
-
 #include <algorithm>
 #include <sstream>
 
+#include <glib/gi18n.h>
+
+#include "config.h"
+
 #include "sip-endpoint.h"
 
 #include "opal-bank.h"

Modified: trunk/src/endpoints/sip-endpoint.h
==============================================================================
--- trunk/src/endpoints/sip-endpoint.h	(original)
+++ trunk/src/endpoints/sip-endpoint.h	Sun Nov 16 12:33:47 2008
@@ -39,10 +39,7 @@
 #ifndef _SIP_ENDPOINT_H_
 #define _SIP_ENDPOINT_H_
 
-
-#include "config.h"
-
-#include "common.h"
+#include <opal/opal.h>
 
 #include "presence-core.h"
 #include "call-manager.h"

Modified: trunk/src/gui/accounts.cpp
==============================================================================
--- trunk/src/gui/accounts.cpp	(original)
+++ trunk/src/gui/accounts.cpp	Sun Nov 16 12:33:47 2008
@@ -35,8 +35,6 @@
  *   			    manipulate accounts.
  */
 
-#include "config.h"
-
 #include "accounts.h"
 
 #include "account.h"

Modified: trunk/src/gui/accounts.h
==============================================================================
--- trunk/src/gui/accounts.h	(original)
+++ trunk/src/gui/accounts.h	Sun Nov 16 12:33:47 2008
@@ -39,7 +39,10 @@
 #ifndef _ACCOUNTS_H_
 #define _ACCOUNTS_H_
 
-#include "common.h"
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+
 #include "services.h"
 #include "account.h"
 

Modified: trunk/src/gui/assistant.cpp
==============================================================================
--- trunk/src/gui/assistant.cpp	(original)
+++ trunk/src/gui/assistant.cpp	Sun Nov 16 12:33:47 2008
@@ -36,7 +36,7 @@
  *                          build the druid.
  */
 
-#include "config.h"
+#include <glib/gi18n.h>
 
 #include "framework/services.h"
 #include "account-core.h"

Modified: trunk/src/gui/dialpad.cpp
==============================================================================
--- trunk/src/gui/dialpad.cpp	(original)
+++ trunk/src/gui/dialpad.cpp	Sun Nov 16 12:33:47 2008
@@ -32,9 +32,10 @@
  *   description          : Dial pad widget.
  */
 
-#include "config.h"
 #include "dialpad.h"
+
 #include <gdk/gdkkeysyms.h>
+#include <glib/gi18n.h>
 
 #include <cstring>
 #include <iostream>

Modified: trunk/src/gui/main.cpp
==============================================================================
--- trunk/src/gui/main.cpp	(original)
+++ trunk/src/gui/main.cpp	Sun Nov 16 12:33:47 2008
@@ -66,6 +66,7 @@
 
 #include "platform/gm-platform.h"
 
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 
 #ifdef HAVE_DBUS

Modified: trunk/src/gui/main.h
==============================================================================
--- trunk/src/gui/main.h	(original)
+++ trunk/src/gui/main.h	Sun Nov 16 12:33:47 2008
@@ -39,10 +39,6 @@
 #ifndef _MAIN_INTERFACE_H
 #define _MAIN_INTERFACE_H
 
-#include "config.h"
-
-#include "common.h"
-
 #include "services.h"
 #include "call.h"
 

Modified: trunk/src/gui/misc.cpp
==============================================================================
--- trunk/src/gui/misc.cpp	(original)
+++ trunk/src/gui/misc.cpp	Sun Nov 16 12:33:47 2008
@@ -46,13 +46,13 @@
 #include "gmdialog.h"
 #include "gmconf.h"
 
-
-
 #ifndef WIN32
 #include <gdk/gdkx.h>
 #include <X11/Xlib.h>
 #endif
 
+#include <glib/gi18n.h>
+
 
 /* The functions */
 GtkWidget *
@@ -76,63 +76,6 @@
 }
 
 
-
-/* This function overrides from a pwlib function */
-#ifndef STATIC_LIBS_USED
-static gboolean
-assert_error_msg (gpointer data)
-{
-  GtkWidget *main_window = NULL;
-
-  main_window = GnomeMeeting::Process ()->GetMainWindow ();
-
-  
-  //gdk_threads_enter ();
-  std::cout << "FIXME" << std::endl << std::flush;
-  //FIXME Should use a signal in the runtime.
-  gnomemeeting_error_dialog (GTK_WINDOW (main_window), 
-			     _("Error"),
-			     "%s", (gchar *) data);
-  //gdk_threads_leave ();
-
-  return FALSE;
-}
-
-
-void 
-PAssertFunc (G_GNUC_UNUSED const char *file,
-	     G_GNUC_UNUSED int line,
-	     G_GNUC_UNUSED const char *className,
-	     const char *msg)
-{
-  g_idle_add_full (G_PRIORITY_HIGH, assert_error_msg, g_strdup (msg), g_free);
-}
-#endif
-
-
-
-PString
-gnomemeeting_pstring_cut (PString s)
-{
-  PString s2 = s;
-
-  if (s.IsEmpty ())
-    return s2;
-
-  PINDEX bracket = s2.Find('[');                                          
-                                                                               
-  if (bracket != P_MAX_INDEX)                                                
-    s2 = s2.Left (bracket);                                            
-
-  bracket = s2.Find('(');                                                 
-                                                                               
-  if (bracket != P_MAX_INDEX)                                                
-    s2 = s2.Left (bracket);     
-
-  return s2.Trim ();
-}
-    
-
 /* Stolen from GDK */
 #ifndef WIN32
 static void

Modified: trunk/src/gui/misc.h
==============================================================================
--- trunk/src/gui/misc.h	(original)
+++ trunk/src/gui/misc.h	Sun Nov 16 12:33:47 2008
@@ -40,7 +40,7 @@
 #ifndef _MISC_H_
 #define _MISC_H_
 
-#include "common.h"
+#include <gtk/gtk.h>
 
 
 /* DESCRIPTION  :  / 
@@ -53,15 +53,6 @@
 			 GtkWidget *pixmap);
 
 
-/* DESCRIPTION   :  /
- * BEHAVIOR      : Takes a PString and returns the Left part before a [ or a (.
- * PRE           : An non-empty PString.
- */
-PString 
-gnomemeeting_pstring_cut (PString s);
-
-
-
 void gdk_window_set_always_on_top (GdkWindow *window, 
 				   gboolean enable);
 

Modified: trunk/src/gui/statusicon.cpp
==============================================================================
--- trunk/src/gui/statusicon.cpp	(original)
+++ trunk/src/gui/statusicon.cpp	Sun Nov 16 12:33:47 2008
@@ -35,6 +35,7 @@
  */
 
 
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 
 #include "statusicon.h"

Modified: trunk/src/gui/statusicon.h
==============================================================================
--- trunk/src/gui/statusicon.h	(original)
+++ trunk/src/gui/statusicon.h	Sun Nov 16 12:33:47 2008
@@ -38,9 +38,9 @@
 #ifndef _STATUSICON_H_
 #define _STATUSICON_H_
 
-#include "common.h"
 #include "services.h"
 
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/src/gui/statusmenu.cpp
==============================================================================
--- trunk/src/gui/statusmenu.cpp	(original)
+++ trunk/src/gui/statusmenu.cpp	Sun Nov 16 12:33:47 2008
@@ -36,25 +36,17 @@
  */
 
 
-/*
- * The StatusMenu can be seen as an extended preferences window. 
- * It can thus directly react to GMConf key changes and write in the GMConf 
- * database.
- *
- * It does not need to listen to sigc++ signals to react to key changes.
- *
- */
 
-#include "config.h"
 #include "statusmenu.h"
 
+#include "common.h"
 #include "personal-details.h"
 
 #include "gmconf.h"
 #include "gmstockicons.h"
 
-#include "common.h"
-
+#include <glib/gi18n.h>
+#include <vector>
 
 struct _StatusMenuPrivate
 {

Modified: trunk/src/gui/statusmenu.h
==============================================================================
--- trunk/src/gui/statusmenu.h	(original)
+++ trunk/src/gui/statusmenu.h	Sun Nov 16 12:33:47 2008
@@ -40,12 +40,8 @@
 #ifndef __STATUS_MENU_H
 #define __STATUS_MENU_H
 
-#include <glib-object.h>
 #include <gtk/gtk.h>
 
-#include <ptlib.h>
-#include <opal/manager.h>
-
 #include "call.h"
 #include "services.h"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]