gnome: fixed includes

gnome/src/config/accountlistconfigdialog.c

@@ -30,28 +30,28 @@
  */
 
 
-#include <accountlistconfigdialog.h>
-#include <dbus/dbus.h>
-#include <accountconfigdialog.h>
-#include <actions.h>
-#include <utils.h>
+#include "accountlistconfigdialog.h"
+#include "dbus/dbus.h"
+#include "accountconfigdialog.h"
+#include "actions.h"
+#include "mainwindow.h"
+#include "utils.h"
 #include <string.h>
 #include <libgnome/gnome-help.h>
 
 #define CONTEXT_ID_REGISTRATION 0
 
-GtkWidget *addButton;
-GtkWidget *editButton;
-GtkWidget *deleteButton;
-GtkWidget *restoreButton;
-GtkWidget *accountMoveDownButton;
-GtkWidget *accountMoveUpButton;
-GtkWidget * status_bar;
-GtkListStore * accountStore;
+static GtkWidget *addButton;
+static GtkWidget *editButton;
+static GtkWidget *deleteButton;
+static GtkWidget *accountMoveDownButton;
+static GtkWidget *accountMoveUpButton;
+static GtkWidget * status_bar;
+static GtkListStore * accountStore;
 
-GtkDialog * accountListDialog = NULL;
+static GtkDialog * accountListDialog = NULL;
 
-account_t * selectedAccount = NULL;
+static account_t * selectedAccount = NULL;
 // Account properties
 enum {
     COLUMN_ACCOUNT_ALIAS,
@@ -94,7 +94,6 @@ static void edit_account_cb (void)
  */
 static void add_account_cb (void)
 {
-
     show_account_window (NULL);
 }
 
@@ -103,7 +102,6 @@ static void add_account_cb (void)
  */
 void account_list_config_dialog_fill()
 {
-
     if (accountListDialog == NULL) {
         DEBUG("Config: No account dialog, returning");
         return;
@@ -132,8 +130,7 @@ void account_list_config_dialog_fill()
                             COLUMN_ACCOUNT_DATA, a,   // Pointer
                             -1);
 
-    unsigned int i;
-    for (i = 0; i < account_list_get_size(); i++) {
+    for (size_t i = 0; i < account_list_get_size(); i++) {
         a = account_list_get_nth (i);
 
         if (a == NULL) {

gnome/src/config/preferencesdialog.c

@@ -46,6 +46,7 @@
 #include "hooks-config.h"
 #include "audioconf.h"
 #include "uimanager.h"
+#include "mainwindow.h"
 
 /**
  * Local variables

gnome/src/contacts/addrbookfactory.c

@@ -32,6 +32,7 @@
 #include "addressbook-config.h"
 
 #include "calltab.h"
+#include "calltree.h"
 
 #include <glib.h>
 #include <dlfcn.h>

gnome/tests/Makefile.am

@@ -27,7 +27,7 @@ check_config_LDADD =		$(SFLPHONE_LIBS) @CHECK_LIBS@ @LIBSEXY_LIBS@
 
 ###########################################################
 
-check_dbus_SOURCES =		check_dbus.c $(top_srcdir)/src/logger.c $(top_srcdir)/src/accountlist.c $(top_srcdir)/src/actions.c $(top_srcdir)/src/codeclist.c $(top_srcdir)/src/dialpad.c $(top_srcdir)/src/errors.c $(top_srcdir)/src/mainwindow.c $(top_srcdir)/src/reqaccount.c $(top_srcdir)/src/sflnotify.c $(top_srcdir)/src/sliders.c $(top_srcdir)/src/statusicon.c $(top_srcdir)/src/callable_obj.c $(top_srcdir)/src/eel-gconf-extensions.c $(top_srcdir)/src/uimanager.c $(top_srcdir)/src/conference_obj.c $(top_srcdir)/src/shortcuts.c $(top_srcdir)/src/imwindow.c
+check_dbus_SOURCES =		check_dbus.c $(top_srcdir)/src/logger.c $(top_srcdir)/src/accountlist.c $(top_srcdir)/src/actions.c $(top_srcdir)/src/codeclist.c $(top_srcdir)/src/dialpad.c $(top_srcdir)/src/mainwindow.c $(top_srcdir)/src/reqaccount.c $(top_srcdir)/src/sflnotify.c $(top_srcdir)/src/sliders.c $(top_srcdir)/src/statusicon.c $(top_srcdir)/src/callable_obj.c $(top_srcdir)/src/eel-gconf-extensions.c $(top_srcdir)/src/uimanager.c $(top_srcdir)/src/conference_obj.c $(top_srcdir)/src/shortcuts.c $(top_srcdir)/src/imwindow.c
 
 check_dbus_CFLAGS = 		@CHECK_CFLAGS@ @SFLGTK_CFLAGS@ @DBUSGLIB_CFLAGS@ @WEBKIT_CFLAGS@ @LIBGNOMEUI_CFLAGS@
 check_dbus_LDADD =			$(SFLPHONE_LIBS) @CHECK_LIBS@ @LIBSEXY_LIBS@ $(top_builddir)/src/widget/libwidget.la $(top_builddir)/src/icons/libicons.la