Move map tile repository handling to map widget lib

diff --git a/libs/libgtkmap/Makefile.am b/libs/libgtkmap/Makefile.am
index a09a1a0e55a83d3aeeb833df5544bf49359adbf6..31988f155e00bec9a1c96583116ae3061e531e89 100644 (file)
--- a/libs/libgtkmap/Makefile.am
+++ b/libs/libgtkmap/Makefile.am
@@ -28,12 +28,13 @@ lib_LTLIBRARIES = libgtkmap.la
 libgtkmap_la_SOURCES = gtkmap.c gtkmap.h \
        gtkmap-marshal.c gtkmap-marshal.h \
        path.c path.h position.c position.h \
+       tilerepo.c tilerepo.h \
        $(TOPDIR)/latlon.c $(TOPDIR)/image-cache.c
 libgtkmap_la_CFLAGS = $(GLIBGTK_CFLAGS) $(GNOME_VFS_CFLAGS) $(LIBXML2_CFLAGS) $(GTKGLEXT_CFLAGS) $(defines) 
 libgtkmap_la_LIBADD = $(GLIBGTK_LIBS) $(GNOME_VFS_LIBS) $(LIBXML2_LIBS) $(GTKGLEXT_LIBS)
 libgtkmap_la_LDFLAGS = -lm -no-undefined
 
-map_widget_test_SOURCES = map-widget-test.c $(TOPDIR)/map-tile-repo.c
+map_widget_test_SOURCES = map-widget-test.c
 map_widget_test_LDADD = $(GLIBGTK_LIBS) $(GTKHTML_LIBS) $(CAIRO_LIBS) $(GTKGLEXT_LIBS) -lm libgtkmap.la
 map_widget_test_CFLAGS = $(GLIBGTK_CFLAGS) $(GTKHTML_CFLAGS) $(CAIRO_CFLAGS) $(GTKGLEXT_CFLAGS)
 

diff --git a/libs/libgtkmap/gtkmap.c b/libs/libgtkmap/gtkmap.c
index 1fa1e7a1b987fa09fbc1fc9f45a970ef9461b2f0..050a49f2a4c3bcb59b763efbd2cba23e153763aa 100644 (file)
--- a/libs/libgtkmap/gtkmap.c
+++ b/libs/libgtkmap/gtkmap.c
@@ -41,8 +41,9 @@
 #include <gtk/gtkgl.h>
 #endif
 
+#include "tilerepo.h"
+
 #include "image-cache.h"
-#include "map-tile-repo.h"
 #include "latlon.h"
 #include "gtkmap.h"
 

diff --git a/libs/libgtkmap/gtkmap.h b/libs/libgtkmap/gtkmap.h
index 999e5c989f610758ba82e143799d18edd0c2a0d3..78be206dde5a539f46bed211f04817d63fd8e516 100644 (file)
--- a/libs/libgtkmap/gtkmap.h
+++ b/libs/libgtkmap/gtkmap.h
@@ -23,7 +23,7 @@
 #include <gtk/gtk.h>
 #include "path.h"
 #include "position.h"
-#include "map-tile-repo.h"
+#include "tilerepo.h"
 
 /**
  * GtkMapCenterMode:

diff --git a/libs/libgtkmap/map-widget-test.c b/libs/libgtkmap/map-widget-test.c
index 48ae8d8edc91dd18b80875f74bf1a9edaff8b74d..54ab216c2ee0e5290075000cc39ff3d981b77d53 100644 (file)
--- a/libs/libgtkmap/map-widget-test.c
+++ b/libs/libgtkmap/map-widget-test.c
@@ -2,7 +2,7 @@
 #include <gtk/gtk.h>
 
 #include "gtkmap.h"
-#include "map-tile-repo.h"
+#include "tilerepo.h"
 
 #define TESTREPO "/home/milang/MyDocs/.documents/Maps/OpenStreet"
 

diff --git a/src/map-tile-repo.c b/libs/libgtkmap/tilerepo.c
similarity index 99%
rename from src/map-tile-repo.c
rename to libs/libgtkmap/tilerepo.c
index 11099bcc61a469abb2a3a27ba105cfdc30f8e0b6..5b64c54db7ff92d239dd06707cece898a217f823 100644 (file)
--- a/src/map-tile-repo.c
+++ b/libs/libgtkmap/tilerepo.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <glib.h>
 
-#include "map-tile-repo.h"
+#include "tilerepo.h"
 
 /**
  * map_tile_repo_new:

diff --git a/src/map-tile-repo.h b/libs/libgtkmap/tilerepo.h
similarity index 100%
rename from src/map-tile-repo.h
rename to libs/libgtkmap/tilerepo.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 577c23d708455e18afca8b976f47bb2275bf9df4..3761b0687544e239a1704ebd5a62466dfa94fdc3 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -75,8 +75,6 @@ mapper_SOURCES = \
        map-download.h \
        map-poi.c \
        map-poi.h \
-       map-tile-repo.c \
-       map-tile-repo.h \
        map-repo-manager.c \
        map-repo-manager.h \
        mapper.c \

diff --git a/src/config-gconf.c b/src/config-gconf.c
index 48d1e8b342b59383e4f2939758b6c002bd3a6170..0e818d4067a0f4d20445e4a422920ecf88158b63 100644 (file)
--- a/src/config-gconf.c
+++ b/src/config-gconf.c
@@ -53,7 +53,7 @@
 #include "filter.h"
 #include "dialogs.h"
 #include "map-repo-manager.h"
-#include "map-tile-repo.h"
+#include "tilerepo.h"
 
 #define PROXY_PORT (8080)
 

diff --git a/src/map-repo-manager.c b/src/map-repo-manager.c
index 42efc4c5ca81bec1abd8647629d039cd6787af9f..f8602319c87e8e29e7af7ad07cedc986de202698 100644 (file)
--- a/src/map-repo-manager.c
+++ b/src/map-repo-manager.c
@@ -50,7 +50,7 @@
 #include "dialogs.h"
 #include "help.h"
 #include "path.h"
-#include "map-tile-repo.h"
+#include "tilerepo.h"
 #include "gtkmap.h"
 
 #define MAP_REPO_LIST_URL "http://www.gnuite.com/nokia770/maemo-mapper/repos.txt"

diff --git a/src/map-repo-manager.h b/src/map-repo-manager.h
index 224826c11b12a38f870f7a1291e967ca04e49158..d3967b6421799b6a0a8270b4bba9613cc3684dae 100644 (file)
--- a/src/map-repo-manager.h
+++ b/src/map-repo-manager.h
@@ -1,7 +1,7 @@
 #ifndef _MAP_REPO_H
 #define _MAP_REPO_H
 
-#include "map-tile-repo.h"
+#include "tilerepo.h"
 
 GList *_repo_list;
 RepoData *_curr_repo;