This is an automated email from the git hooks/post-receive script.
ross-guest pushed a commit to branch master
in repository osm-gps-map.
commit a692c3e4ee5d0339c4f8507632b16cb32d3f44ed
Author: David Paleino <da...@debian.org>
Date: Thu Jul 22 08:43:10 2010 +0200
Imported Upstream version 0.7.2
---
Makefile.am | 2 +-
NEWS | 7 +++++++
configure.ac | 4 +++-
docs/reference/libosmgpsmap-sections.txt | 4 ++++
python/configure.ac | 13 ++++++++----
python/osmgpsmap.override | 2 +-
python/osmgpsmapmodule.c | 2 ++
python/setup.py | 2 +-
src/osm-gps-map-image.c | 4 ++--
src/osm-gps-map-osd.c | 2 ++
src/osm-gps-map-point.c | 36 +++++++++++++++++++++++---------
src/osm-gps-map-point.h | 2 ++
src/osm-gps-map-source.c | 2 +-
src/osm-gps-map-widget.c | 11 ++++++++++
src/private.h | 6 +++---
15 files changed, 75 insertions(+), 24 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index fe5e987..02e15c8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,7 +37,7 @@ distclean-local:
ChangeLog:
@echo Creating $@
@if test -d "$(srcdir)/.git"; then \
- (GIT_DIR=$(top_srcdir)/.git ./missing --run git log 0.6.0.. --stat -M
-C --name-status --date=short --no-color) | fmt --split-only > $@.tmp \
+ (GIT_DIR=$(top_srcdir)/.git ./missing --run git log 0.7.1.. --stat -M
-C --name-status --date=short --no-color) | fmt --split-only > $@.tmp \
&& mv -f $@.tmp $@ \
|| ($(RM) $@.tmp; \
echo Failed to generate ChangeLog, your ChangeLog may be outdated
>&2; \
diff --git a/NEWS b/NEWS
index 1ebbf02..492fc30 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+Changes in 0.7.2
+======================
+ * Make osm_gps_map_point_{copy,free} public
+ * Fix build against older gtk and pygtk/pygobject versions (Maemo)
+ * Doc updates
+ * Bug fixes
+
Changes in 0.7.1
======================
* Don't install mapviewer binary
diff --git a/configure.ac b/configure.ac
index 8eda90e..7a93c89 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
AC_PREREQ([2.62])
AC_INIT([osm-gps-map],
- [0.7.1],
+ [0.7.2],
[http://github.com/nzjrs/osm-gps-map/issues],
[osm-gps-map])
AM_INIT_AUTOMAKE([1.10])
@@ -71,4 +71,6 @@ echo $PACKAGE v$VERSION
echo
echo Prefix............... : $prefix
echo libsoup.............. : $soup_ver
+echo Introspection support : ${found_introspection}
+echo gtk-doc documentation : ${enable_gtk_doc}
echo
diff --git a/docs/reference/libosmgpsmap-sections.txt
b/docs/reference/libosmgpsmap-sections.txt
index ba04d98..d012769 100644
--- a/docs/reference/libosmgpsmap-sections.txt
+++ b/docs/reference/libosmgpsmap-sections.txt
@@ -15,7 +15,9 @@ osm_gps_map_source_get_image_format
osm_gps_map_source_get_min_zoom
osm_gps_map_source_get_max_zoom
osm_gps_map_source_is_valid
+osm_gps_map_new
osm_gps_map_download_maps
+osm_gps_map_download_cancel_all
osm_gps_map_get_bbox
osm_gps_map_set_center
osm_gps_map_set_center_and_zoom
@@ -98,6 +100,8 @@ osm_gps_map_point_new_degrees
osm_gps_map_point_new_radians
osm_gps_map_point_set_degrees
osm_gps_map_point_set_radians
+osm_gps_map_point_copy
+osm_gps_map_point_free
</SECTION>
<SECTION>
diff --git a/python/configure.ac b/python/configure.ac
index fc4d345..0ece516 100644
--- a/python/configure.ac
+++ b/python/configure.ac
@@ -1,6 +1,6 @@
AC_PREREQ([2.62])
AC_INIT([python-osmgpsmap],
- [0.7.1],
+ [0.7.2],
[http://github.com/nzjrs/osm-gps-map/issues],
[python-osmgpsmap])
AM_INIT_AUTOMAKE([1.10])
@@ -32,15 +32,20 @@ fi
AM_PATH_PYTHON()
AM_CHECK_PYTHON_HEADERS(,AC_MSG_ERROR([install python-devel]))
-PKG_CHECK_MODULES(PYGTK, [pygtk-2.0 >= 2.10.0 pygobject-2.0 >= 2.16.0])
+PKG_CHECK_MODULES(PYGTK, [pygtk-2.0 >= 2.10.0 pygobject-2.0 >= 2.14.0])
AC_MSG_CHECKING([for pygtk defs])
PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
AC_SUBST(PYGTK_DEFSDIR)
AC_MSG_RESULT($PYGTK_DEFSDIR)
+#codegen was moved from pygtk to pygobject starting with 2.14
+#but we accept both so that we can build against older pygobject/pygtk
+#on maemo
AC_MSG_CHECKING([for codegen])
-CODEGENDIR=`$PKG_CONFIG --variable codegendir pygobject-2.0`
+PKG_CHECK_MODULES(DUMMY, [pygobject-2.0 >= 2.16.0],
+ CODEGENDIR=`$PKG_CONFIG --variable codegendir pygobject-2.0`,
+ CODEGENDIR=`$PKG_CONFIG --variable codegendir pygtk-2.0`)
AC_SUBST([CODEGENDIR])
AC_MSG_RESULT($CODEGENDIR)
@@ -54,7 +59,7 @@ if test -f ../src/libosmgpsmap.la; then
OSMGPSMAP_CFLAGS="-I\$(top_srcdir)/../src/"
OSMGPSMAP_LIBS="\$(top_builddir)/../src/libosmgpsmap.la"
else
- PKG_CHECK_MODULES(OSMGPSMAP, osmgpsmap = 0.7.1)
+ PKG_CHECK_MODULES(OSMGPSMAP, osmgpsmap = 0.7.2)
fi
AC_OUTPUT([Makefile])
diff --git a/python/osmgpsmap.override b/python/osmgpsmap.override
index 6840373..f0207ab 100644
--- a/python/osmgpsmap.override
+++ b/python/osmgpsmap.override
@@ -83,7 +83,7 @@ _wrap_osm_gps_map_download_maps(PyGObject *self, PyObject
*args,
Py_RETURN_NONE;
}
%%
-override osm_gps_map_convert_geographic_to_screen
+override osm_gps_map_convert_geographic_to_screen kwargs
static PyObject *
_wrap_osm_gps_map_convert_geographic_to_screen(PyGObject *self, PyObject
*args, PyObject *kwargs)
{
diff --git a/python/osmgpsmapmodule.c b/python/osmgpsmapmodule.c
index 786f3bb..5898d74 100644
--- a/python/osmgpsmapmodule.c
+++ b/python/osmgpsmapmodule.c
@@ -43,6 +43,8 @@ initosmgpsmap(void)
PyString_FromString(OSM_GPS_MAP_CACHE_DISABLED));
PyModule_AddObject(m, "CACHE_AUTO",
PyString_FromString(OSM_GPS_MAP_CACHE_AUTO));
+ PyModule_AddObject(m, "CACHE_FRIENDLY",
+ PyString_FromString(OSM_GPS_MAP_CACHE_FRIENDLY));
if (PyErr_Occurred()) {
Py_FatalError("can't initialize module osmgpsmap");
diff --git a/python/setup.py b/python/setup.py
index d0efba1..848b93b 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -17,7 +17,7 @@ def get_lib_dirs(pkg):
def get_libs(pkg):
return pkg_config_parse(pkg,'--libs-only-l')
-VERSION = "0.7.1"
+VERSION = "0.7.2"
_osmgpsmap = Extension(name = 'osmgpsmap',
sources= ['osmgpsmapmodule.c','osmgpsmap.c'],
diff --git a/src/osm-gps-map-image.c b/src/osm-gps-map-image.c
index 59d3dbf..5f5fb8f 100644
--- a/src/osm-gps-map-image.c
+++ b/src/osm-gps-map-image.c
@@ -67,7 +67,7 @@ osm_gps_map_image_set_property (GObject *object,
g_object_unref (priv->pixbuf);
priv->pixbuf = g_value_dup_object (value);
priv->w = gdk_pixbuf_get_width(priv->pixbuf);
- priv->h = gdk_pixbuf_get_width(priv->pixbuf);
+ priv->h = gdk_pixbuf_get_height(priv->pixbuf);
break;
case PROP_X_ALIGN:
priv->xalign = g_value_get_float (value);
@@ -183,7 +183,7 @@ osm_gps_map_image_draw (OsmGpsMapImage *object, GdkDrawable
*drawable, GdkGC *gc
priv->h,
GDK_RGB_DITHER_NONE, 0, 0);
rect->width = priv->w;
- rect->height = priv->w;
+ rect->height = priv->h;
}
const OsmGpsMapPoint *
diff --git a/src/osm-gps-map-osd.c b/src/osm-gps-map-osd.c
index 0861a34..7c3774c 100644
--- a/src/osm-gps-map-osd.c
+++ b/src/osm-gps-map-osd.c
@@ -19,6 +19,8 @@
#include <cairo.h>
#include "osd-utils.h"
+#include "private.h"
+
#include "osm-gps-map-layer.h"
#include "osm-gps-map-osd.h"
diff --git a/src/osm-gps-map-point.c b/src/osm-gps-map-point.c
index 6c07ee7..3c5d66c 100644
--- a/src/osm-gps-map-point.c
+++ b/src/osm-gps-map-point.c
@@ -3,6 +3,18 @@
#include "converter.h"
#include "osm-gps-map-point.h"
+GType
+osm_gps_map_point_get_type (void)
+{
+ static GType our_type = 0;
+
+ if (our_type == 0)
+ our_type = g_boxed_type_register_static (g_intern_static_string
("OsmGpsMapPoint"),
+ (GBoxedCopyFunc)osm_gps_map_point_copy,
+
(GBoxedFreeFunc)osm_gps_map_point_free);
+ return our_type;
+}
+
OsmGpsMapPoint *
osm_gps_map_point_new_degrees(float lat, float lon)
{
@@ -49,7 +61,12 @@ osm_gps_map_point_set_radians(OsmGpsMapPoint *point, float
rlat, float rlon)
point->rlon = rlon;
}
-static OsmGpsMapPoint *
+/**
+ * osm_gps_map_point_copy:
+ *
+ * Since: 0.7.2
+ */
+OsmGpsMapPoint *
osm_gps_map_point_copy (const OsmGpsMapPoint *point)
{
OsmGpsMapPoint *result = g_new (OsmGpsMapPoint, 1);
@@ -58,14 +75,13 @@ osm_gps_map_point_copy (const OsmGpsMapPoint *point)
return result;
}
-GType
-osm_gps_map_point_get_type (void)
+/**
+ * osm_gps_map_point_free:
+ *
+ * Since: 0.7.2
+ */
+void
+osm_gps_map_point_free (OsmGpsMapPoint *point)
{
- static GType our_type = 0;
-
- if (our_type == 0)
- our_type = g_boxed_type_register_static (g_intern_static_string
("OsmGpsMapPoint"),
- (GBoxedCopyFunc)osm_gps_map_point_copy,
- (GBoxedFreeFunc)g_free);
- return our_type;
+ g_free(point);
}
diff --git a/src/osm-gps-map-point.h b/src/osm-gps-map-point.h
index a6f0c69..a6590fe 100644
--- a/src/osm-gps-map-point.h
+++ b/src/osm-gps-map-point.h
@@ -27,6 +27,8 @@ void osm_gps_map_point_get_degrees
(OsmGpsMapPoint *point, floa
void osm_gps_map_point_get_radians (OsmGpsMapPoint *point,
float *rlat, float *rlon);
void osm_gps_map_point_set_degrees (OsmGpsMapPoint *point,
float lat, float lon);
void osm_gps_map_point_set_radians (OsmGpsMapPoint *point,
float rlat, float rlon);
+void osm_gps_map_point_free (OsmGpsMapPoint *point);
+OsmGpsMapPoint * osm_gps_map_point_copy (const OsmGpsMapPoint
*point);
G_END_DECLS
diff --git a/src/osm-gps-map-source.c b/src/osm-gps-map-source.c
index d40a8b4..40ed3b4 100644
--- a/src/osm-gps-map-source.c
+++ b/src/osm-gps-map-source.c
@@ -79,7 +79,7 @@ osm_gps_map_source_get_repo_uri(OsmGpsMapSource_t source)
case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
return
"http://mt#R.google.com/vt/lyrs=h@126&hl=en&x=#X&s=&y=#Y&z=#Z";;
case OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE:
- return "http://khm#R.google.com/kh/v=63&x=#X&y=#Y&z=#Z";;
+ return "http://khm#R.google.com/kh/v=65&x=#X&y=#Y&z=#Z";;
case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
return
"http://a#R.ortho.tiles.virtualearth.net/tiles/r#W.jpeg?g=50";;
case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_SATELLITE:
diff --git a/src/osm-gps-map-widget.c b/src/osm-gps-map-widget.c
index 6d294bc..1791711 100644
--- a/src/osm-gps-map-widget.c
+++ b/src/osm-gps-map-widget.c
@@ -2792,6 +2792,17 @@ osm_gps_map_zoom_out (OsmGpsMap *map)
return osm_gps_map_set_zoom(map, map->priv->map_zoom-1);
}
+/**
+ * osm_gps_map_new:
+ *
+ * Returns a new #OsmGpsMap object, defaults to showing data from
+ * <ulink
url="http://www.openstreetmap.org";><citetitle>OpenStreetMap</citetitle></ulink>
+ *
+ * See the properties description for more information about construction
+ * parameters than could be passed to g_object_new()
+ *
+ * Returns: a newly created #OsmGpsMap object.
+ **/
GtkWidget *
osm_gps_map_new (void)
{
diff --git a/src/private.h b/src/private.h
index 49e25e3..637338f 100644
--- a/src/private.h
+++ b/src/private.h
@@ -84,9 +84,9 @@ int g_strcmp0(const char *str1, const char *str2)
#define gtk_widget_get_allocation(widget, alloc) (*(alloc) =
(widget)->allocation)
#define gtk_widget_set_allocation(widget, alloc)
((widget)->allocation = *(alloc))
#define gtk_widget_get_app_paintable(widget)
(GTK_WIDGET_APP_PAINTABLE (widget))
-#define gtk_widget_set_can_default(widget, can_default) ((can_default)
? (GTK_WIDGET_SET_FLAGS (w, GTK_CAN_DEFAULT)) : (GTK_WIDGET_UNSET_FLAGS (w,
GTK_CAN_DEFAULT)))
-#define gtk_widget_set_can_focus(widget, can_focus) ((can_focus) ?
(GTK_WIDGET_SET_FLAGS (w, GTK_CAN_FOCUS)) : (GTK_WIDGET_UNSET_FLAGS (w,
GTK_CAN_FOCUS)))
-#define gtk_widget_set_double_buffered(widget, double_buffered)
((double_buffered) ? (GTK_WIDGET_SET_FLAGS (w, GTK_DOUBLE_BUFFERED)) :
(GTK_WIDGET_UNSET_FLAGS (w, GTK_DOUBLE_BUFFERED)))
+#define gtk_widget_set_can_default(widget, can_default) { if
(can_default) { GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_DEFAULT); } else {
GTK_WIDGET_UNSET_FLAGS (widget, GTK_CAN_DEFAULT); } }
+#define gtk_widget_set_can_focus(widget, can_focus) { if
(can_focus) { GTK_WIDGET_SET_FLAGS ((widget), GTK_CAN_FOCUS); } else {
GTK_WIDGET_UNSET_FLAGS ((widget), GTK_CAN_FOCUS); } }
+#define gtk_widget_set_double_buffered(widget, double_buffered) { if
(double_buffered) { GTK_WIDGET_SET_FLAGS (widget, GTK_DOUBLE_BUFFERED); } else
{ GTK_WIDGET_UNSET_FLAGS (widget, GTK_DOUBLE_BUFFERED); } }
#define gtk_widget_is_drawable(widget)
(GTK_WIDGET_DRAWABLE (widget))
#define gtk_widget_has_focus(widget)
(GTK_WIDGET_HAS_FOCUS (widget))
#define gtk_widget_get_has_window(widget)
(!GTK_WIDGET_NO_WINDOW (widget))
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/osm-gps-map.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
![http://a#R.ortho.tiles.virtualearth.net/tiles/r#W.jpeg?g=50"](http://a#R.ortho.tiles.virtualearth.net/tiles/r#W.jpeg?g=50"){kind=link}