Revision: 1858
http://geeqie.svn.sourceforge.net/geeqie/?rev=1858&view=rev
Author: nadvornik
Date: 2009-09-25 20:39:15 +0000 (Fri, 25 Sep 2009)
Log Message:
-----------
require libchamplain 0.4
- check for libchamplain 0.4
- dropped libchamplain 0.3.x support
http://sourceforge.net/tracker/index.php?func=detail&aid=2861847&group_id=222125&atid=1054680
Modified Paths:
--------------
trunk/configure.in
trunk/src/bar_gps.c
trunk/src/main.c
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2009-09-24 21:52:44 UTC (rev 1857)
+++ trunk/configure.in 2009-09-25 20:39:15 UTC (rev 1858)
@@ -343,7 +343,7 @@
[libgps=$enableval], [libgps=auto])
if test "x${libgps}" = "xyes"; then
- PKG_CHECK_MODULES(LIBCHAMPLAIN, [champlain-0.3 >= 0.3],
+ PKG_CHECK_MODULES(LIBCHAMPLAIN, [champlain-0.4 >= 0.4],
[
HAVE_LIBCHAMPLAIN=yes
AC_DEFINE(HAVE_LIBCHAMPLAIN, 1, [define to enable use of GPS maps])
@@ -357,7 +357,7 @@
fi
if test "x${libgps}" = "xyes"; then
- PKG_CHECK_MODULES(LIBCHAMPLAIN_GTK, [champlain-gtk-0.3 >= 0.3],
+ PKG_CHECK_MODULES(LIBCHAMPLAIN_GTK, [champlain-gtk-0.4 >= 0.4],
[
HAVE_LIBCHAMPLAIN_GTK=yes
AC_DEFINE(HAVE_LIBCHAMPLAIN_GTK, 1, [define to enable use of GPS maps])
Modified: trunk/src/bar_gps.c
===================================================================
--- trunk/src/bar_gps.c 2009-09-24 21:52:44 UTC (rev 1857)
+++ trunk/src/bar_gps.c 2009-09-25 20:39:15 UTC (rev 1858)
@@ -25,7 +25,7 @@
#include "thumb.h"
#include "ui_menu.h"
-#include <clutter-gtk/gtk-clutter-embed.h>
+#include <clutter-gtk/clutter-gtk.h>
#include <champlain/champlain.h>
#include <champlain-gtk/champlain-gtk.h>
@@ -72,7 +72,7 @@
if (fd->thumb_pixbuf != NULL)
{
actor = clutter_texture_new();
- gtk_clutter_texture_set_from_pixbuf(CLUTTER_TEXTURE(actor),
fd->thumb_pixbuf);
+ gtk_clutter_texture_set_from_pixbuf(CLUTTER_TEXTURE(actor),
fd->thumb_pixbuf, NULL);
champlain_marker_set_image(CHAMPLAIN_MARKER(marker), actor);
}
thumb_loader_free(tl);
@@ -127,7 +127,7 @@
if (fd->thumb_pixbuf != NULL)
{
actor = clutter_texture_new();
-
gtk_clutter_texture_set_from_pixbuf(CLUTTER_TEXTURE(actor), fd->thumb_pixbuf);
+
gtk_clutter_texture_set_from_pixbuf(CLUTTER_TEXTURE(actor), fd->thumb_pixbuf,
NULL);
champlain_marker_set_image(CHAMPLAIN_MARKER(marker), actor);
}
else if (fd->pixbuf != NULL)
@@ -152,7 +152,7 @@
gtk_clutter_texture_set_from_pixbuf(CLUTTER_TEXTURE(actor),
gdk_pixbuf_rotate_simple(gdk_pixbuf_scale_simple(fd->pixbuf, THUMB_SIZE, height
* THUMB_SIZE / width,
-
GDK_INTERP_NEAREST), rotate));
+
GDK_INTERP_NEAREST), rotate), NULL);
champlain_marker_set_image(CHAMPLAIN_MARKER(marker), actor);
}
else
@@ -345,11 +345,7 @@
ChamplainMapSource *map_source;
ChamplainMapSourceFactory *map_factory;
-#if CHAMPLAIN_CHECK_VERSION(0,3,2)
map_factory = champlain_map_source_factory_dup_default();
-#else
- map_factory = champlain_map_source_factory_get_default();
-#endif
map_source = champlain_map_source_factory_create(map_factory, map_id);
if (map_source != NULL)
@@ -571,13 +567,8 @@
menu = popup_menu_short_lived();
-#if CHAMPLAIN_CHECK_VERSION(0,3,2)
map_factory = champlain_map_source_factory_dup_default();
map_list = champlain_map_source_factory_dup_list(map_factory);
-#else
- map_factory = champlain_map_source_factory_get_default();
- map_list = champlain_map_source_factory_get_list(map_factory);
-#endif
current = bar_pane_gps_get_map_id(pgd);
while (map_list)
@@ -705,13 +696,8 @@
scrolled = gtk_scrolled_window_new(NULL, NULL);
vbox = gtk_vbox_new(FALSE, 0);
-#ifdef GTK_CHAMPLAIN_EMBED
gpswidget = gtk_champlain_embed_new();
view = gtk_champlain_embed_get_view(GTK_CHAMPLAIN_EMBED(gpswidget));
-#else
- view = champlain_view_new();
- gpswidget = champlain_view_embed_new(view);
-#endif
viewport = gtk_viewport_new(NULL, NULL);
gtk_container_add(GTK_CONTAINER(viewport), gpswidget);
Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c 2009-09-24 21:52:44 UTC (rev 1857)
+++ trunk/src/main.c 2009-09-25 20:39:15 UTC (rev 1858)
@@ -48,7 +48,7 @@
#ifdef HAVE_LIBCHAMPLAIN
#ifdef HAVE_LIBCHAMPLAIN_GTK
-#include <clutter-gtk/gtk-clutter-embed.h>
+#include <clutter-gtk/clutter-gtk.h>
#endif
#endif
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Geeqie-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/geeqie-svn
