navit-cvs-commit — CVS commit mailing list

[Navit-cvs-commit] navit/src navit.c,1.82,1.83

[Michael F. <ho...@us...>]

Update of /cvsroot/navit/navit/src
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25848

Modified Files:
	navit.c 
Log Message:
Core:Fix:Fix compiler warning

Index: navit.c
===================================================================
RCS file: /cvsroot/navit/navit/src/navit.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** navit.c	19 Feb 2008 13:04:13 -0000	1.82
--- navit.c	19 Feb 2008 13:23:24 -0000	1.83
***************
*** 792,796 ****
  }
  
! void
  navit_textfile_debug_log(struct navit *this_, const char *fmt, ...)
  {
--- 792,796 ----
  }
  
! static void
  navit_textfile_debug_log(struct navit *this_, const char *fmt, ...)
  {

[Navit-cvs-commit] navit/src/gui/sdl cegui_keyboard.h,1.1,1.2

[Michael F. <ho...@us...>]

Update of /cvsroot/navit/navit/src/gui/sdl
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18049/gui/sdl

Modified Files:
	cegui_keyboard.h 
Log Message:
SDL:Fix:Fix no new line ... warning

Index: cegui_keyboard.h
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/sdl/cegui_keyboard.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** cegui_keyboard.h	23 Nov 2007 17:34:57 -0000	1.1
--- cegui_keyboard.h	19 Feb 2008 13:06:19 -0000	1.2
***************
*** 2,4 ****
  void Add_KeyBoard_key(CEGUI::String key,int x,int y,int w);
  void BuildKeyboard();
! bool Handle_Virtual_Key_Down(const CEGUI::EventArgs& event);
\ No newline at end of file
--- 2,5 ----
  void Add_KeyBoard_key(CEGUI::String key,int x,int y,int w);
  void BuildKeyboard();
! bool Handle_Virtual_Key_Down(const CEGUI::EventArgs& event);
! 

[Navit-cvs-commit] navit/src/gui/gtk gui_gtk_statusbar.c, 1.12, 1.13

[Michael F. <ho...@us...>]

Update of /cvsroot/navit/navit/src/gui/gtk
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17010/gui/gtk

Modified Files:
	gui_gtk_statusbar.c 
Log Message:
core:Add:Merge callback lists into one callback list.

Index: gui_gtk_statusbar.c
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/gtk/gui_gtk_statusbar.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** gui_gtk_statusbar.c	14 Jan 2008 23:45:08 -0000	1.12
--- gui_gtk_statusbar.c	19 Feb 2008 13:04:14 -0000	1.13
***************
*** 163,168 ****
  	gtk_box_pack_end(GTK_BOX(gui->vbox), this->hbox, FALSE, FALSE, 0);
  	gtk_widget_show_all(this->hbox);
! 	this->vehicle_cb=callback_new_1(callback_cast(statusbar_route_update), this);
! 	navit_add_vehicle_cb(gui->nav, this->vehicle_cb);
  	return this;
  }
--- 163,169 ----
  	gtk_box_pack_end(GTK_BOX(gui->vbox), this->hbox, FALSE, FALSE, 0);
  	gtk_widget_show_all(this->hbox);
! 	/* add a callback for position updates */
! 	this->vehicle_cb=callback_new_attr_1(callback_cast(statusbar_route_update), attr_position_coord_geo, this);
! 	navit_add_callback(gui->nav, this->vehicle_cb);
  	return this;
  }

[Navit-cvs-commit] navit/src/osd/core osd_core.c,1.3,1.4

[Michael F. <ho...@us...>]

Update of /cvsroot/navit/navit/src/osd/core
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17010/osd/core

Modified Files:
	osd_core.c 
Log Message:
core:Add:Merge callback lists into one callback list.

Index: osd_core.c
===================================================================
RCS file: /cvsroot/navit/navit/src/osd/core/osd_core.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** osd_core.c	3 Jan 2008 11:13:37 -0000	1.3
--- osd_core.c	19 Feb 2008 13:04:14 -0000	1.4
***************
*** 154,158 ****
  	if (attr)
  		this->p.y=attr->u.num;
! 	navit_add_init_cb(nav, callback_new_1(osd_compass_init, this));
  	return (struct osd_priv *) this;
  }
--- 154,158 ----
  	if (attr)
  		this->p.y=attr->u.num;
! 	navit_add_callback(nav, callback_new_attr_1(osd_compass_init, attr_navit, this));
  	return (struct osd_priv *) this;
  }

[Navit-cvs-commit] navit/src/gui/sdl gui_sdl_window.cpp,1.51,1.52

[Michael F. <ho...@us...>]

Update of /cvsroot/navit/navit/src/gui/sdl
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17010/gui/sdl

Modified Files:
	gui_sdl_window.cpp 
Log Message:
core:Add:Merge callback lists into one callback list.

Index: gui_sdl_window.cpp
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/sdl/gui_sdl_window.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** gui_sdl_window.cpp	14 Feb 2008 18:26:35 -0000	1.51
--- gui_sdl_window.cpp	19 Feb 2008 13:04:14 -0000	1.52
***************
*** 898,904 ****
  
  	//gui_sdl_window.cpp:710: error: invalid conversion from 'void (*)(vehicle*)' to 'void (*)()'
! 	struct callback *cb=callback_new_0(callback_cast(vehicle_callback_handler));
  
! 	navit_add_vehicle_cb(nav,cb);
  	this_->nav=nav;
  	
--- 898,906 ----
  
  	//gui_sdl_window.cpp:710: error: invalid conversion from 'void (*)(vehicle*)' to 'void (*)()'
! 	
! 	/* add callback for position updates */
! 	struct callback *cb=callback_new_attr_0(callback_cast(vehicle_callback_handler), attr_position_coord_geo);
  
! 	navit_add_callback(nav,cb);
  	this_->nav=nav;
  	

[Navit-cvs-commit] navit/src navit.c, 1.81, 1.82 navit.h, 1.28, 1.29 callback.h, 1.13, 1.14

[Michael F. <ho...@us...>]

Update of /cvsroot/navit/navit/src
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17010

Modified Files:
	navit.c navit.h callback.h 
Log Message:
core:Add:Merge callback lists into one callback list.

Index: callback.h
===================================================================
RCS file: /cvsroot/navit/navit/src/callback.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** callback.h	4 Jan 2008 09:30:48 -0000	1.13
--- callback.h	19 Feb 2008 13:04:13 -0000	1.14
***************
*** 2,5 ****
--- 2,8 ----
  #define NAVIT_CALLBACK_H
  
+ #include "item.h"
+ #include "attr.h"
+ 
  #ifdef __cplusplus
  extern "C" {
***************
*** 23,26 ****
--- 26,34 ----
  /* end of prototypes */
  
+ static inline struct callback *callback_new_attr_0(void (*func)(void), enum attr_type type)
+ {
+ 	return callback_new_attr(func, type, 0, NULL);
+ }
+ 
  static inline struct callback *callback_new_0(void (*func)(void))
  {
***************
*** 28,31 ****
--- 36,46 ----
  }
  
+ static inline struct callback *callback_new_attr_1(void (*func)(void), enum attr_type type, void *p1)
+ {
+ 	void *p[1];
+ 	p[0]=p1;
+ 	return callback_new_attr(func, type, 1, p);
+ }
+ 
  static inline struct callback *callback_new_1(void (*func)(void), void *p1)
  {
***************
*** 69,72 ****
--- 84,93 ----
  }
  
+ static inline void callback_list_call_attr_1(struct callback_list *l, enum attr_type type, void *p1)
+ {
+ 	void *p[1];
+ 	p[0]=p1;
+ 	callback_list_call_attr(l, type, 1, p);
+ }
  
  static inline void callback_list_call_1(struct callback_list *l, void *p1)
***************
*** 77,80 ****
--- 98,109 ----
  }
  
+ static inline void callback_list_call_attr_2(struct callback_list *l, enum attr_type type, void *p1, void *p2)
+ {
+ 	void *p[2];
+ 	p[0]=p1;
+ 	p[1]=p2;
+ 	callback_list_call_attr(l, type, 2, p);
+ }
+ 
  static inline void callback_list_call_2(struct callback_list *l, void *p1, void *p2)
  {

Index: navit.c
===================================================================
RCS file: /cvsroot/navit/navit/src/navit.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** navit.c	14 Feb 2008 18:09:41 -0000	1.81
--- navit.c	19 Feb 2008 13:04:13 -0000	1.82
***************
*** 86,91 ****
  	GList *windows_items;
  	struct navit_vehicle *vehicle;
- 	struct callback_list *vehicle_cbl;
- 	struct callback_list *init_cbl;
  	struct callback_list *attr_cbl;
  	int pid;
--- 86,89 ----
***************
*** 337,342 ****
  	this_->self.type=attr_navit;
  	this_->self.u.navit=this_;
- 	this_->vehicle_cbl=callback_list_new();
- 	this_->init_cbl=callback_list_new();
  	this_->attr_cbl=callback_list_new();
  
--- 335,338 ----
***************
*** 1185,1190 ****
  		this_->nav_speech_cb=callback_new_1(callback_cast(navit_speak), this_);
  		navigation_register_callback(this_->navigation, attr_navigation_speech, this_->nav_speech_cb);
- #if 0
- #endif
  	}
  	if (this_->menubar) {
--- 1181,1184 ----
***************
*** 1200,1204 ****
  #endif
  	navit_debug(this_);
! 	callback_list_call_1(this_->init_cbl, this_);
  }
  
--- 1194,1198 ----
  #endif
  	navit_debug(this_);
! 	callback_list_call_attr_1(this_->attr_cbl, attr_navit, this_);
  }
  
***************
*** 1306,1315 ****
  	}
  	if (attr_updated) {
! 		void *p[2];
! 
! 		p[0] = this_;
! 		p[1] = attr;
! 
! 		callback_list_call_attr(this_->attr_cbl, attr->type, 2, p);
  	}
  	return 1;
--- 1300,1304 ----
  	}
  	if (attr_updated) {
! 		callback_list_call_attr_2(this_->attr_cbl, attr->type, this_, attr);
  	}
  	return 1;
***************
*** 1340,1345 ****
  
  static int
! navit_add_log(struct navit *this_, struct log *log,
!                 struct attr **attrs)
  {
  	struct attr *type;
--- 1329,1333 ----
  
  static int
! navit_add_log(struct navit *this_, struct log *log, struct attr **attrs)
  {
  	struct attr *type;
***************
*** 1357,1362 ****
  
  int
! navit_add_attr(struct navit *this_, struct attr *attr,
!                  struct attr **attrs)
  {
  	switch (attr->type) {
--- 1345,1349 ----
  
  int
! navit_add_attr(struct navit *this_, struct attr *attr, struct attr **attrs)
  {
  	switch (attr->type) {
***************
*** 1370,1374 ****
  
  void
! navit_add_attr_cb(struct navit *this_, struct callback *cb)
  {
  	callback_list_add(this_->attr_cbl, cb);
--- 1357,1361 ----
  
  void
! navit_add_callback(struct navit *this_, struct callback *cb)
  {
  	callback_list_add(this_->attr_cbl, cb);
***************
*** 1376,1380 ****
  
  void
! navit_remove_attr_cb(struct navit *this_, struct callback *cb)
  {
  	callback_list_remove(this_->attr_cbl, cb);
--- 1363,1367 ----
  
  void
! navit_remove_callback(struct navit *this_, struct callback *cb)
  {
  	callback_list_remove(this_->attr_cbl, cb);
***************
*** 1479,1483 ****
  	else
  		nv->update_curr=nv->update;
! 	callback_list_call_2(this_->vehicle_cbl, this_, nv->vehicle);
  	if (pnt)
  		navit_vehicle_draw(this_, nv, pnt);
--- 1466,1470 ----
  	else
  		nv->update_curr=nv->update;
! 	callback_list_call_attr_2(this_->attr_cbl, attr_position_coord_geo, this_, nv->vehicle);
  	if (pnt)
  		navit_vehicle_draw(this_, nv, pnt);
***************
*** 1542,1569 ****
  
  void
- navit_add_vehicle_cb(struct navit *this_, struct callback *cb)
- {
- 	callback_list_add(this_->vehicle_cbl, cb);
- }
- 
- void
- navit_remove_vehicle_cb(struct navit *this_, struct callback *cb)
- {
- 	callback_list_remove(this_->vehicle_cbl, cb);
- }
- 
- void
- navit_add_init_cb(struct navit *this_, struct callback *cb)
- {
- 	callback_list_add(this_->init_cbl, cb);
- }
- 
- void
- navit_remove_init_cb(struct navit *this_, struct callback *cb)
- {
- 	callback_list_remove(this_->init_cbl, cb);
- }
- 
- void
  navit_set_vehicle(struct navit *this_, struct navit_vehicle *nv)
  {
--- 1529,1532 ----

Index: navit.h
===================================================================
RCS file: /cvsroot/navit/navit/src/navit.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** navit.h	8 Jan 2008 11:44:43 -0000	1.28
--- navit.h	19 Feb 2008 13:04:13 -0000	1.29
***************
*** 64,75 ****
  int navit_set_attr(struct navit *this_, struct attr *attr);
  int navit_get_attr(struct navit *this_, enum attr_type type, struct attr *attr);
! void navit_add_attr_cb(struct navit *this_, struct callback *cb);
! void navit_remove_attr_cb(struct navit *this_, struct callback *cb);
  void navit_set_position(struct navit *this_, struct pcoord *c);
  struct navit_vehicle *navit_add_vehicle(struct navit *this_, struct vehicle *v, struct attr **attrs);
- void navit_add_vehicle_cb(struct navit *this_, struct callback *cb);
- void navit_remove_vehicle_cb(struct navit *this_, struct callback *cb);
- void navit_add_init_cb(struct navit *this_, struct callback *cb);
- void navit_remove_init_cb(struct navit *this_, struct callback *cb);
  void navit_set_vehicle(struct navit *this_, struct navit_vehicle *nv);
  void navit_tracking_add(struct navit *this_, struct tracking *tracking);
--- 64,72 ----
  int navit_set_attr(struct navit *this_, struct attr *attr);
  int navit_get_attr(struct navit *this_, enum attr_type type, struct attr *attr);
! int navit_add_attr(struct navit *this_, struct attr *attr, struct attr **attrs);
! void navit_add_callback(struct navit *this_, struct callback *cb);
! void navit_remove_callback(struct navit *this_, struct callback *cb);
  void navit_set_position(struct navit *this_, struct pcoord *c);
  struct navit_vehicle *navit_add_vehicle(struct navit *this_, struct vehicle *v, struct attr **attrs);
  void navit_set_vehicle(struct navit *this_, struct navit_vehicle *nv);
  void navit_tracking_add(struct navit *this_, struct tracking *tracking);

[Navit-cvs-commit] navit/src/xpm shopping.xpm,1.1,1.2

[Matt C. <mat...@us...>]

Update of /cvsroot/navit/navit/src/xpm
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28615

Modified Files:
	shopping.xpm 
Log Message:
Fix:Core:Add transparency to shopping icon

Index: shopping.xpm
===================================================================
RCS file: /cvsroot/navit/navit/src/xpm/shopping.xpm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** shopping.xpm	7 Feb 2008 11:04:56 -0000	1.1
--- shopping.xpm	19 Feb 2008 00:42:46 -0000	1.2
***************
*** 1,21 ****
  /* XPM */
  static char * shopping_xpm[] = {
! "16 16 2 1",
! " 	g #FFFFFF",
! ".	g #000000",
! "                ",
! "                ",
! "  ...           ",
! "  .  .........  ",
! "   .         .  ",
! "   . . . . . .  ",
! "   .         .  ",
! "   .  . . . .   ",
! "   .       .    ",
! "   ........     ",
! "                ",
! "   .            ",
! "   ........     ",
! "   ..    ..     ",
  "                ",
  "                "};
--- 1,22 ----
  /* XPM */
  static char * shopping_xpm[] = {
! "16 16 3 1",
! " 	c None",
! ".	c #FFFFFF",
! "+	c #000000",
  "                ",
+ " .....          ",
+ " .+++.......... ",
+ " .+..+++++++++. ",
+ "  .+.........+. ",
+ "  .+.+.+.+.+.+. ",
+ "  .+.........+. ",
+ "  .+..+.+.+.+.  ",
+ "  .+.......+.   ",
+ "  .++++++++.    ",
+ "  .........     ",
+ "  .+........    ",
+ "  .++++++++.    ",
+ "  .++....++.    ",
+ "  ....  ....    ",
  "                "};

[Navit-cvs-commit] navit/src attr_def.h,1.30,1.31

[Matt C. <mat...@us...>]

Update of /cvsroot/navit/navit/src
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24161

Modified Files:
	attr_def.h 
Log Message:
Fix:Core:Add connection retry to gpsd. Fixes ticket #68

Index: attr_def.h
===================================================================
RCS file: /cvsroot/navit/navit/src/attr_def.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** attr_def.h	14 Feb 2008 11:45:49 -0000	1.30
--- attr_def.h	19 Feb 2008 00:31:55 -0000	1.31
***************
*** 37,40 ****
--- 37,41 ----
  ATTR(position_qual)
  ATTR(zoom)
+ ATTR(retry_interval)
  ATTR2(0x00028000,type_boolean_begin)
  /* boolean */

[Navit-cvs-commit] navit/src/vehicle/gpsd vehicle_gpsd.c,1.6,1.7

[Matt C. <mat...@us...>]

Update of /cvsroot/navit/navit/src/vehicle/gpsd
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24161/vehicle/gpsd

Modified Files:
	vehicle_gpsd.c 
Log Message:
Fix:Core:Add connection retry to gpsd. Fixes ticket #68

Index: vehicle_gpsd.c
===================================================================
RCS file: /cvsroot/navit/navit/src/vehicle/gpsd/vehicle_gpsd.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** vehicle_gpsd.c	17 Feb 2008 21:23:46 -0000	1.6
--- vehicle_gpsd.c	19 Feb 2008 00:31:55 -0000	1.7
***************
*** 15,18 ****
--- 15,19 ----
  	struct callback_list *cbl;
  	GIOChannel *iochan;
+ 	guint retry_interval;
  	guint watch;
  	struct gps_data_t *gps;
***************
*** 26,29 ****
--- 27,33 ----
  } *vehicle_last;
  
+ #define DEFAULT_RETRY_INTERVAL 10 // seconds
+ #define MIN_RETRY_INTERVAL 1 // seconds
+ 
  static gboolean vehicle_gpsd_io(GIOChannel * iochan,
  				GIOCondition condition, gpointer t);
***************
*** 76,82 ****
  }
  
! static int
! vehicle_gpsd_open(struct vehicle_priv *priv)
  {
  	char *source = g_strdup(priv->source);
  	char *colon = index(source + 7, ':');
--- 80,92 ----
  }
  
! /**
!  * Attempt to open the gps device.
!  * Return FALSE if retry not required
!  * Return TRUE to try again
!  */
! static gboolean
! vehicle_gpsd_try_open(gpointer *data)
  {
+ 	struct vehicle_priv *priv = (struct vehicle_priv *)data;
  	char *source = g_strdup(priv->source);
  	char *colon = index(source + 7, ':');
***************
*** 87,93 ****
  		priv->gps = gps_open(source + 7, NULL);
  	g_free(source);
  	if (!priv->gps){
! 		dbg(0, "gps_open failed. Have you started gpsd?\n");
! 		return 0;
  	}
  	gps_query(priv->gps, "w+x\n");
--- 97,104 ----
  		priv->gps = gps_open(source + 7, NULL);
  	g_free(source);
+ 
  	if (!priv->gps){
! 		g_warning("gps_open failed for '%s'. Retrying in %d seconds. Have you started gpsd?\n", priv->source, priv->retry_interval);
! 		return TRUE;
  	}
  	gps_query(priv->gps, "w+x\n");
***************
*** 97,101 ****
  	    g_io_add_watch(priv->iochan, G_IO_IN | G_IO_ERR | G_IO_HUP,
  			   vehicle_gpsd_io, priv);
! 	return 1;
  }
  
--- 108,124 ----
  	    g_io_add_watch(priv->iochan, G_IO_IN | G_IO_ERR | G_IO_HUP,
  			   vehicle_gpsd_io, priv);
! 	dbg(0,"Connected to gpsd\n");
! 	return FALSE;
! }
! 
! /**
!  * Open a connection to gpsd. Will re-try the connection if it fails
!  */
! static void
! vehicle_gpsd_open(struct vehicle_priv *priv)
! {
! 	if (vehicle_gpsd_try_open((gpointer *)priv)) {
! 		g_timeout_add(priv->retry_interval*1000, (GSourceFunc)vehicle_gpsd_try_open, (gpointer *)priv);
! 	}
  }
  
***************
*** 129,133 ****
  			vehicle_last = priv;
                          if (gps_poll(priv->gps)) {
!                                dbg(0, "gps_poll failed\n");
                                 vehicle_gpsd_close(priv);
                                 vehicle_gpsd_open(priv);
--- 152,156 ----
  			vehicle_last = priv;
                          if (gps_poll(priv->gps)) {
!                                g_warning("gps_poll failed\n");
                                 vehicle_gpsd_close(priv);
                                 vehicle_gpsd_open(priv);
***************
*** 189,193 ****
  {
  	struct vehicle_priv *ret;
! 	struct attr *source;
  
  	dbg(1, "enter\n");
--- 212,216 ----
  {
  	struct vehicle_priv *ret;
! 	struct attr *source, *retry_int;
  
  	dbg(1, "enter\n");
***************
*** 195,205 ****
  	ret = g_new0(struct vehicle_priv, 1);
  	ret->source = g_strdup(source->u.str);
  	ret->cbl = cbl;
  	*meth = vehicle_gpsd_methods;
! 	if (vehicle_gpsd_open(ret))
! 		return ret;
! 	dbg(0, "Failed to open '%s'\n", ret->source);
! 	vehicle_gpsd_destroy(ret);
! 	return NULL;
  }
  
--- 218,236 ----
  	ret = g_new0(struct vehicle_priv, 1);
  	ret->source = g_strdup(source->u.str);
+ 	retry_int = attr_search(attrs, NULL, attr_retry_interval);
+ 	if (retry_int) {
+ 		ret->retry_interval = retry_int->u.num;
+ 		if (ret->retry_interval < MIN_RETRY_INTERVAL) {
+ 			dbg(0, "Retry interval %d too small, setting to %d\n", ret->retry_interval, MIN_RETRY_INTERVAL);
+ 			ret->retry_interval = MIN_RETRY_INTERVAL;
+ 		}
+ 	} else {
+ 		dbg(0, "Retry interval not defined, setting to %d\n", DEFAULT_RETRY_INTERVAL);
+ 		ret->retry_interval = DEFAULT_RETRY_INTERVAL;
+ 	}
  	ret->cbl = cbl;
  	*meth = vehicle_gpsd_methods;
! 	vehicle_gpsd_open(ret);
! 	return ret;
  }
  

[Navit-cvs-commit] navit configure.in,1.76,1.77

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18184

Modified Files:
	configure.in 
Log Message:
Fix:Core:Cleanup of configure.in and binding Makefile.am

Index: configure.in
===================================================================
RCS file: /cvsroot/navit/navit/configure.in,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** configure.in	18 Feb 2008 15:51:38 -0000	1.76
--- configure.in	18 Feb 2008 17:03:12 -0000	1.77
***************
*** 82,89 ****
  AC_SUBST(NAVIT_LIBS)
  
- PKG_CHECK_MODULES(DBUS, [dbus-glib-1], [dbus_pkgconfig=yes], [dbus_pkgconfig=no])
- AC_SUBST(DBUS_CFLAGS)
- AC_SUBST(DBUS_LIBS)
- 
  AC_CHECK_HEADER(
  	zlib.h,
--- 82,85 ----
***************
*** 333,370 ****
  
  
! AC_ARG_ENABLE(binding-python, [  --disable-binding-python             don't create binding python ], MODULE_BINDING_PYTHON=$enableval, MODULE_BINDING_PYTHON=yes)
! if test "$cross_compiling" = no; then
! 	if test "x$MODULE_BINDING_PYTHON" = "xyes"; then
! 		AC_PATH_PROG(_PATH_PYTHON,[python])
! 		dnl Libraries and flags for embedded Python.
! 		dnl FIXME: I wish there was a less icky way to get this.
! 		if test x"$_PATH_PYTHON" != x ; then
! 			AC_MSG_CHECKING(for Python linkage)
! 			py_prefix=`$_PATH_PYTHON -c 'import sys; print sys.prefix'`
! 			py_ver=`$_PATH_PYTHON -c 'import sys; print sys.version[[:3]]'`
! 			py_libdir="${py_prefix}/lib/python${py_ver}"
! 			PYTHON_CFLAGS="-I${py_prefix}/include/python${py_ver}"
! 			if test -f $py_libdir/config/Makefile -a -f $py_prefix/include/python${py_ver}/Python.h; then
! 				py_libs=`grep '^LIBS=' $py_libdir/config/Makefile | sed -e 's/^.*=//'`
! 				py_libc=`grep '^LIBC=' $py_libdir/config/Makefile | sed -e 's/^.*=//'`
! 				py_libm=`grep '^LIBM=' $py_libdir/config/Makefile | sed -e 's/^.*=//'`
! 				py_liblocalmod=`grep '^LOCALMODLIBS=' $py_libdir/config/Makefile | sed -e 's/^.*=//'`
! 				py_libbasemod=`grep '^BASEMODLIBS=' $py_libdir/config/Makefile | sed -e 's/^.*=//'`
! 				PYTHON_LIBS="-L$py_libdir/config $py_libs $py_libc $py_libm -lpython$py_ver $py_liblocalmod $py_libbasemod"
! 				PYTHON_LIBS=`echo $PYTHON_LIBS | sed -e 's/[ \\t]*/ /g'`
! 				AC_DEFINE(HAVE_PYTHON, 1, [Define to 1 if you have python])
! 				python=yes
! 				AC_MSG_RESULT($py_libdir)
! 			else
! 				AC_MSG_WARN([$py_libdir/config/Makefile or $py_prefix/include/python${py_ver}/Python.h missing, support for python disabled])
! 			fi
  		fi
  	fi
- else
- 	AC_MSG_WARN([*** cross compiling, support for python disabled])
  fi
! AC_SUBST(PYTHON_CFLAGS)
! AC_SUBST(PYTHON_LIBS)
! AM_CONDITIONAL(BINDING_PYTHON, [test "x$python" = "xyes"])
  
  # NLS
--- 329,387 ----
  
  
! # binding python
! AC_ARG_ENABLE(binding-python, [  --disable-binding-python             don't create binding python], enable_binding_python=$enableval, enable_binding_python=yes)
! if test "x${enable_binding_python}" = "xyes" ; then
! 	if test "x${cross_compiling}" = "xyes" ; then
! 		AC_MSG_WARN([*** cross compiling, support for python disabled])
! 		enable_binding_python="no"
! 	fi
! fi
! if test "x${enable_binding_python}" = "xyes"; then
! 	AC_PATH_PROG(_PATH_PYTHON,[python])
! 	dnl Libraries and flags for embedded Python.
! 	dnl FIXME: I wish there was a less icky way to get this.
! 	if test "x${_PATH_PYTHON}" != "x" ; then
! 		AC_MSG_CHECKING(for Python linkage)
! 		py_prefix=`$_PATH_PYTHON -c 'import sys; print sys.prefix'`
! 		py_ver=`$_PATH_PYTHON -c 'import sys; print sys.version[[:3]]'`
! 		py_libdir="${py_prefix}/lib/python${py_ver}"
! 		PYTHON_CFLAGS="-I${py_prefix}/include/python${py_ver}"
! 		if test -f $py_libdir/config/Makefile -a -f $py_prefix/include/python${py_ver}/Python.h; then
! 			py_libs=`grep '^LIBS=' $py_libdir/config/Makefile | sed -e 's/^.*=//'`
! 			py_libc=`grep '^LIBC=' $py_libdir/config/Makefile | sed -e 's/^.*=//'`
! 			py_libm=`grep '^LIBM=' $py_libdir/config/Makefile | sed -e 's/^.*=//'`
! 			py_liblocalmod=`grep '^LOCALMODLIBS=' $py_libdir/config/Makefile | sed -e 's/^.*=//'`
! 			py_libbasemod=`grep '^BASEMODLIBS=' $py_libdir/config/Makefile | sed -e 's/^.*=//'`
! 			PYTHON_LIBS="-L$py_libdir/config $py_libs $py_libc $py_libm -lpython$py_ver $py_liblocalmod $py_libbasemod"
! 			PYTHON_LIBS=`echo $PYTHON_LIBS | sed -e 's/[ \\t]*/ /g'`
! 			AC_DEFINE(HAVE_PYTHON, 1, [Define to 1 if you have python])
! 			python=yes
! 			AC_MSG_RESULT($py_libdir)
! 		else
! 			AC_MSG_WARN([$py_libdir/config/Makefile or $py_prefix/include/python${py_ver}/Python.h missing, support for python disabled])
  		fi
+ 	else
+ 		AC_MSG_WARN([no python found, support for python disabled])
+ 		enable_binding_python="no"
  	fi
  fi
! if test "x${enable_binding_python}" = xyes ; then
! 	AC_DEFINE(USE_BINDING_PYTHON, 1, [Build with binding python])
! 	AC_SUBST(PYTHON_CFLAGS)
! 	AC_SUBST(PYTHON_LIBS)
! fi
! AM_CONDITIONAL(USE_BINDING_PYTHON, test "x${enable_binding_python}" = "xyes")
! 
! # binding dbus
! AC_ARG_ENABLE(binding-dbus,   [  --disable-binding-dbus               don't create binding dbus], enable_binding_dbus=$enableval, enable_binding_dbus=yes)
! if test "x${enable_binding_dbus}" = "xyes" ; then
! 	PKG_CHECK_MODULES(DBUS, [dbus-glib-1], ,enable_binding_dbus=no);
! fi
! if test "x${enable_binding_dbus}" = "xyes" ; then
! 	AC_DEFINE(USE_BINDING_DBUS, 1, [Build with binding dbus])
! 	AC_SUBST(DBUS_CFLAGS)
! 	AC_SUBST(DBUS_LIBS)
! fi
! AM_CONDITIONAL(USE_BINDING_DBUS, test "x${enable_binding_dbus}" = "xyes")
  
  # NLS

[Navit-cvs-commit] navit/src/binding Makefile.am,1.3,1.4

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/src/binding
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18184/src/binding

Modified Files:
	Makefile.am 
Log Message:
Fix:Core:Cleanup of configure.in and binding Makefile.am

Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/src/binding/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.am	5 Nov 2007 14:42:45 -0000	1.3
--- Makefile.am	18 Feb 2008 17:03:13 -0000	1.4
***************
*** 1,7 ****
  SUBDIRS=
! if BINDING_PYTHON
    SUBDIRS+=python
  endif
  
! DIST_SUBDIRS=python
  
--- 1,10 ----
  SUBDIRS=
! if USE_BINDING_PYTHON
    SUBDIRS+=python
  endif
+ if USE_BINDING_DBUS
+   SUBDIRS+=dbus
+ endif
  
! DIST_SUBDIRS=python dbus
  

[Navit-cvs-commit] navit/src/binding/dbus binding_dbus.c, 1.1, 1.2 test.py, 1.1, 1.2

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/src/binding/dbus
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21496

Modified Files:
	binding_dbus.c test.py 
Log Message:
Fix:binding_dbus:Fixed a few bugs

Index: binding_dbus.c
===================================================================
RCS file: /cvsroot/navit/navit/src/binding/dbus/binding_dbus.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** binding_dbus.c	18 Feb 2008 15:40:16 -0000	1.1
--- binding_dbus.c	18 Feb 2008 16:13:38 -0000	1.2
***************
*** 3,6 ****
--- 3,7 ----
  #include <dbus/dbus-glib.h>
  #include <dbus/dbus-glib-lowlevel.h>
+ #include "config.h"
  #include "main.h"
  #include "navit.h"
***************
*** 146,150 ****
  }
  static int
! coord_get_from_message(DBusMessage *message, struct coord *c)
  {
  	DBusMessageIter iter,iter2;
--- 147,151 ----
  }
  static int
! pcoord_get_from_message(DBusMessage *message, struct pcoord *pc)
  {
  	DBusMessageIter iter,iter2;
***************
*** 156,164 ****
  	if (dbus_message_iter_get_arg_type(&iter2) != DBUS_TYPE_INT32)
  		return 0;
! 	dbus_message_iter_get_basic(&iter2, &c->x);
  	dbus_message_iter_next(&iter2);
  	if (dbus_message_iter_get_arg_type(&iter2) != DBUS_TYPE_INT32)
  		return 0;
! 	dbus_message_iter_get_basic(&iter2, &c->y);
  	dbus_message_iter_next(&iter2);
  	if (dbus_message_iter_get_arg_type(&iter2) != DBUS_TYPE_INVALID)
--- 157,169 ----
  	if (dbus_message_iter_get_arg_type(&iter2) != DBUS_TYPE_INT32)
  		return 0;
! 	dbus_message_iter_get_basic(&iter2, &pc->pro);
  	dbus_message_iter_next(&iter2);
  	if (dbus_message_iter_get_arg_type(&iter2) != DBUS_TYPE_INT32)
  		return 0;
! 	dbus_message_iter_get_basic(&iter2, &pc->x);
! 	dbus_message_iter_next(&iter2);
! 	if (dbus_message_iter_get_arg_type(&iter2) != DBUS_TYPE_INT32)
! 		return 0;
! 	dbus_message_iter_get_basic(&iter2, &pc->y);
  	dbus_message_iter_next(&iter2);
  	if (dbus_message_iter_get_arg_type(&iter2) != DBUS_TYPE_INVALID)
***************
*** 170,181 ****
  request_navit_set_center(DBusConnection *connection, DBusMessage *message)
  {
! 	struct coord c;
  	struct navit *navit;
  	navit=object_get_from_message(message, "navit");
  	if (! navit)
  		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
! 	if (!coord_get_from_message(message, &c))
  		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
! 	navit_set_center(navit, &c);
  	return empty_reply(connection, message);
  }
--- 175,186 ----
  request_navit_set_center(DBusConnection *connection, DBusMessage *message)
  {
! 	struct pcoord pc;
  	struct navit *navit;
  	navit=object_get_from_message(message, "navit");
  	if (! navit)
  		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
! 	if (!pcoord_get_from_message(message, &pc))
  		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
! 	navit_set_center(navit, &pc);
  	return empty_reply(connection, message);
  }
***************
*** 211,215 ****
  		return request_main_get_navit(connection, message);
  	if (dbus_message_is_method_call (message, "org.navit_project.navit.navit", "set_center") &&
! 		dbus_message_has_signature(message,"(ii)")) 
  		return request_navit_set_center(connection, message);
  
--- 216,220 ----
  		return request_main_get_navit(connection, message);
  	if (dbus_message_is_method_call (message, "org.navit_project.navit.navit", "set_center") &&
! 		dbus_message_has_signature(message,"(iii)")) 
  		return request_navit_set_center(connection, message);
  

Index: test.py
===================================================================
RCS file: /cvsroot/navit/navit/src/binding/dbus/test.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test.py	18 Feb 2008 15:40:19 -0000	1.1
--- test.py	18 Feb 2008 16:13:38 -0000	1.2
***************
*** 9,11 ****
  iface.iter_destroy(iter);
  navit_iface = dbus.Interface(navit, dbus_interface='org.navit_project.navit.navit');
! navit_iface.set_center((0x138a4a,0x5d773f));
--- 9,11 ----
  iface.iter_destroy(iter);
  navit_iface = dbus.Interface(navit, dbus_interface='org.navit_project.navit.navit');
! navit_iface.set_center((1,0x138a4a,0x5d773f));

[Navit-cvs-commit] navit/src/binding/dbus Makefile.am,1.1,1.2

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/src/binding/dbus
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12835

Modified Files:
	Makefile.am 
Log Message:
Fix:binding_dbus:Fixed old makefile

Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/src/binding/dbus/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.am	18 Feb 2008 15:40:14 -0000	1.1
--- Makefile.am	18 Feb 2008 15:58:38 -0000	1.2
***************
*** 1,4 ****
  include $(top_srcdir)/Makefile.inc
! AM_CPPFLAGS = @NAVIT_CFLAGS@ @DBUS_CFLAGS@ -I$(top_srcdir)/src -DMODULE=\"binding_dbus\"
  modulebinding_LTLIBRARIES = libbinding_dbus.la
  libbinding_dbus_la_SOURCES = binding_dbus.c
--- 1,4 ----
  include $(top_srcdir)/Makefile.inc
! AM_CPPFLAGS = @NAVIT_CFLAGS@ @DBUS_CFLAGS@ -I$(top_srcdir)/src -DMODULE=binding_dbus
  modulebinding_LTLIBRARIES = libbinding_dbus.la
  libbinding_dbus_la_SOURCES = binding_dbus.c

[Navit-cvs-commit] navit configure.in,1.75,1.76

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8979

Modified Files:
	configure.in 
Log Message:
Add:binding_dbus:Created new binding

Index: configure.in
===================================================================
RCS file: /cvsroot/navit/navit/configure.in,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** configure.in	14 Feb 2008 20:16:25 -0000	1.75
--- configure.in	18 Feb 2008 15:51:38 -0000	1.76
***************
*** 82,85 ****
--- 82,89 ----
  AC_SUBST(NAVIT_LIBS)
  
+ PKG_CHECK_MODULES(DBUS, [dbus-glib-1], [dbus_pkgconfig=yes], [dbus_pkgconfig=no])
+ AC_SUBST(DBUS_CFLAGS)
+ AC_SUBST(DBUS_LIBS)
+ 
  AC_CHECK_HEADER(
  	zlib.h,
***************
*** 437,440 ****
--- 441,445 ----
  src/binding/Makefile
  src/binding/python/Makefile
+ src/binding/dbus/Makefile
  src/data/Makefile
  src/data/mg/Makefile

[Navit-cvs-commit] navit/src main.c,1.27,1.28 main.h,1.4,1.5

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/src
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1228

Modified Files:
	main.c main.h 
Log Message:
Add:binding_dbus:Created new binding


Index: main.c
===================================================================
RCS file: /cvsroot/navit/navit/src/main.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** main.c	7 Jan 2008 23:32:33 -0000	1.27
--- main.c	18 Feb 2008 15:40:13 -0000	1.28
***************
*** 68,71 ****
--- 68,106 ----
  #endif
  
+ struct iter {
+ 	GList *list;
+ };
+ 
+ struct iter *
+ main_iter_new(void)
+ {
+ 	struct iter *ret=g_new0(struct iter, 1);
+ 	ret->list=navit;
+ 	return ret;
+ }
+ 
+ void
+ main_iter_destroy(struct iter *iter)
+ {
+ 	g_free(iter);
+ }
+ 
+ struct navit *
+ main_get_navit(struct iter *iter)
+ {
+ 	GList *list;
+ 	struct navit *ret=NULL;
+ 	if (iter)
+ 		list=iter->list;
+ 	else
+ 		list=navit;
+ 	if (list) {
+ 		ret=(struct navit *)(list->data);
+ 		if (iter)
+ 			iter->list=g_list_next(iter->list);
+ 	}
+ 	return ret;
+ 	
+ }
  void
  main_add_navit(struct navit *nav)

Index: main.h
===================================================================
RCS file: /cvsroot/navit/navit/src/main.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** main.h	9 Oct 2007 16:48:35 -0000	1.4
--- main.h	18 Feb 2008 15:40:14 -0000	1.5
***************
*** 4,7 ****
--- 4,11 ----
  /* prototypes */
  struct navit;
+ struct iter;
+ struct iter * main_iter_new(void);
+ void main_iter_destroy(struct iter *iter);
+ struct navit * main_get_navit(struct iter *iter);
  void main_add_navit(struct navit *nav);
  void main_remove_navit(struct navit *nav);

[Navit-cvs-commit] navit/src/binding/dbus Makefile.am, NONE, 1.1 binding_dbus.c, NONE, 1.1 navit.introspect, NONE, 1.1 test.py, NONE, 1.1

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/src/binding/dbus
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1228/binding/dbus

Added Files:
	Makefile.am binding_dbus.c navit.introspect test.py 
Log Message:
Add:binding_dbus:Created new binding


--- NEW FILE: navit.introspect ---
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<node>
  <interface name="org.navit_project.navit">
    <method name="iter_new">
      <arg name="iter" type="o" direction="out"/>
    </method>
    <method name="get_navit">
      <arg name="iter" type="o" direction="in"/>
      <arg name="navit" type="o" direction="out"/>
    </method>
    <method name="iter_destroy">
      <arg name="iter" type="o" direction="in"/>
    </method>
  </interface>
</node>

--- NEW FILE: test.py ---
#! /usr/bin/python
import dbus
bus = dbus.SessionBus()
conn = bus.get_object('org.navit-project.navit',
                       '/org/navit_project/navit')
iface = dbus.Interface(conn, dbus_interface='org.navit_project.navit');
iter=iface.iter();
navit=bus.get_object('org.navit-project.navit', conn.get_navit(iter));
iface.iter_destroy(iter);
navit_iface = dbus.Interface(navit, dbus_interface='org.navit_project.navit.navit');
navit_iface.set_center((0x138a4a,0x5d773f));

--- NEW FILE: Makefile.am ---
include $(top_srcdir)/Makefile.inc
AM_CPPFLAGS = @NAVIT_CFLAGS@ @DBUS_CFLAGS@ -I$(top_srcdir)/src -DMODULE=\"binding_dbus\"
modulebinding_LTLIBRARIES = libbinding_dbus.la
libbinding_dbus_la_SOURCES = binding_dbus.c
libbinding_dbus_la_LIBADD = @DBUS_LIBS@

--- NEW FILE: binding_dbus.c ---
#include <string.h>
#include <dbus/dbus.h>
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
#include "main.h"
#include "navit.h"
#include "coord.h"
#include "plugin.h"
#include "debug.h"


static DBusConnection *connection;

static char *service_name="org.navit-project.navit";
static char *object_path="/org/navit_project/navit";

GHashTable *object_hash;
GHashTable *object_count;

static char *
object_new(char *type, void *object)
{
	int id;
	char *ret;
	dbg(0,"enter %s\n", type);
	id=(int)g_hash_table_lookup(object_count, type);
	g_hash_table_insert(object_count, type, (void *)(id+1));
	ret=g_strdup_printf("%s/%s/%d", object_path, type, id);
	g_hash_table_insert(object_hash, ret, object);
	dbg(0,"return %s\n", ret);
	return (ret);
}

static void *
object_get(const char *path)
{
	return g_hash_table_lookup(object_hash, path);
}

static void *
object_get_from_message_arg(DBusMessage *message, char *type)
{
	char *opath;
	char *prefix;
	DBusError error;
	void *ret=NULL;

	dbus_error_init(&error);
	if (!dbus_message_get_args(message, &error, DBUS_TYPE_OBJECT_PATH, &opath, DBUS_TYPE_INVALID)) {
		dbus_error_free(&error);
		dbg(0,"wrong arg type\n");
		return NULL;
	}
	prefix=g_strdup_printf("%s/%s/", object_path, type);
	if (!strncmp(prefix, opath, strlen(prefix)))
		ret=object_get(opath);
	else
		dbg(0,"wrong object type\n");
	g_free(prefix);
	return ret;
}

static void *
object_get_from_message(DBusMessage *message, char *type)
{
	const char *opath=dbus_message_get_path(message);
	char *prefix;
	void *ret=NULL;

	prefix=g_strdup_printf("%s/%s/", object_path, type);
	if (!strncmp(prefix, opath, strlen(prefix)))
		ret=object_get(opath);
	else
		dbg(0,"wrong object type\n");
	g_free(prefix);
	return ret;
}

static DBusHandlerResult
empty_reply(DBusConnection *connection, DBusMessage *message)
{
	DBusMessage *reply;

	reply = dbus_message_new_method_return(message);
	dbus_connection_send (connection, reply, NULL);
	dbus_message_unref (reply);

	return DBUS_HANDLER_RESULT_HANDLED;
}

static DBusHandlerResult
request_main_get_navit(DBusConnection *connection, DBusMessage *message)
{
	DBusMessage *reply;
	DBusError error;
	struct iter *iter;
	struct navit *navit;
	char *opath;

	dbus_error_init(&error);

	if (!dbus_message_get_args(message, &error, DBUS_TYPE_OBJECT_PATH, &opath, DBUS_TYPE_INVALID)) {
            dbg(0,"Error parsing\n");
		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
        }
	dbg(0,"opath=%s\n", opath);
	iter=object_get(opath);
	navit=main_get_navit(iter);
	if (navit) {
		reply = dbus_message_new_method_return(message);
		opath=object_new("navit",navit);
		dbus_message_append_args(reply, DBUS_TYPE_OBJECT_PATH, &opath, DBUS_TYPE_INVALID);
		dbus_connection_send (connection, reply, NULL);
		dbus_message_unref (reply);
		return DBUS_HANDLER_RESULT_HANDLED;
	}
		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}

static DBusHandlerResult
request_main_iter(DBusConnection *connection, DBusMessage *message)
{
	DBusMessage *reply;
	struct iter *iter=main_iter_new();
	dbg(0,"iter=%p\n", iter);
	char *opath=object_new("main_iter",iter);
	reply = dbus_message_new_method_return(message);
	dbus_message_append_args(reply, DBUS_TYPE_OBJECT_PATH, &opath, DBUS_TYPE_INVALID);
	dbus_connection_send (connection, reply, NULL);
	dbus_message_unref (reply);

	return DBUS_HANDLER_RESULT_HANDLED;
}

static DBusHandlerResult
request_main_iter_destroy(DBusConnection *connection, DBusMessage *message)
{
	struct iter *iter;
	
	iter=object_get_from_message_arg(message, "main_iter");
	if (! iter)
		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
	main_iter_destroy(iter);

	return empty_reply(connection, message);
}
static int
coord_get_from_message(DBusMessage *message, struct coord *c)
{
	DBusMessageIter iter,iter2;

	dbus_message_iter_init(message, &iter);
	dbg(0,"%s\n", dbus_message_iter_get_signature(&iter));
	dbus_message_iter_recurse(&iter, &iter2);

	if (dbus_message_iter_get_arg_type(&iter2) != DBUS_TYPE_INT32)
		return 0;
	dbus_message_iter_get_basic(&iter2, &c->x);
	dbus_message_iter_next(&iter2);
	if (dbus_message_iter_get_arg_type(&iter2) != DBUS_TYPE_INT32)
		return 0;
	dbus_message_iter_get_basic(&iter2, &c->y);
	dbus_message_iter_next(&iter2);
	if (dbus_message_iter_get_arg_type(&iter2) != DBUS_TYPE_INVALID)
		return 0;
	return 1;
}

static DBusHandlerResult
request_navit_set_center(DBusConnection *connection, DBusMessage *message)
{
	struct coord c;
	struct navit *navit;
	navit=object_get_from_message(message, "navit");
	if (! navit)
		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
	if (!coord_get_from_message(message, &c))
		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
	navit_set_center(navit, &c);
	return empty_reply(connection, message);
}

static DBusHandlerResult
navit_handler_func(DBusConnection *connection, DBusMessage *message, void *user_data)
{
	dbg(0,"type=%s interface=%s path=%s member=%s signature=%s\n", dbus_message_type_to_string(dbus_message_get_type(message)), dbus_message_get_interface(message), dbus_message_get_path(message), dbus_message_get_member(message), dbus_message_get_signature(message));
#if 0
	if (dbus_message_is_method_call (message, "org.freedesktop.DBus.Introspectable", "Introspect")) {
		DBusMessage *reply;
		gchar *idata;
		dbg(0,"Introspect\n");
		if (! strcmp(dbus_message_get_path(message), "/org/navit_project/navit")) {
			g_file_get_contents("binding/dbus/navit.introspect", &idata, NULL, NULL);
			reply = dbus_message_new_method_return(message);
			dbus_message_append_args(reply, DBUS_TYPE_STRING, &idata, DBUS_TYPE_INVALID);
			dbus_connection_send (connection, reply, NULL);
			dbus_message_unref (reply);
			g_free(idata);
			return DBUS_HANDLER_RESULT_HANDLED;
		}
	}
#endif
	if (dbus_message_is_method_call (message, "org.navit_project.navit", "iter") &&
		dbus_message_has_signature(message, ""))
		return request_main_iter(connection, message);
	if (dbus_message_is_method_call (message, "org.navit_project.navit", "iter_destroy") &&
		dbus_message_has_signature(message, "o"))
		return request_main_iter_destroy(connection, message);
	if (dbus_message_is_method_call (message, "org.navit_project.navit", "get_navit") &&
		dbus_message_has_signature(message,"o")) 
		return request_main_get_navit(connection, message);
	if (dbus_message_is_method_call (message, "org.navit_project.navit.navit", "set_center") &&
		dbus_message_has_signature(message,"(ii)")) 
		return request_navit_set_center(connection, message);

	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}

static DBusObjectPathVTable dbus_navit_vtable = {
	NULL,
	navit_handler_func,
	NULL
};

#if 0
DBusHandlerResult
filter(DBusConnection *connection, DBusMessage *message, void *user_data)
{
	dbg(0,"type=%s interface=%s path=%s member=%s signature=%s\n", dbus_message_type_to_string(dbus_message_get_type(message)), dbus_message_get_interface(message), dbus_message_get_path(message), dbus_message_get_member(message), dbus_message_get_signature(message));
	if (dbus_message_is_signal(message, DBUS_INTERFACE_DBUS, "NameOwnerChanged")) {
	}
	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
#endif

void plugin_init(void)
{
	DBusError error;

	object_hash=g_hash_table_new(g_str_hash, g_str_equal);
	object_count=g_hash_table_new(g_str_hash, g_str_equal);
	dbg(0,"enter 1\n");
	dbus_error_init(&error);
	connection = dbus_bus_get(DBUS_BUS_SESSION, &error);
	if (!connection) {
		dbg(0,"Failed to open connection to session message bus: %s", error.message);
		dbus_error_free(&error);
		return;
	}
	dbus_connection_setup_with_g_main(connection, NULL);
#if 0
	dbus_connection_add_filter(connection, filter, NULL, NULL);
	dbus_bus_add_match(connection, "type='signal',""interface='" DBUS_INTERFACE_DBUS  "'", &error);
#endif
	dbus_connection_register_fallback(connection, object_path, &dbus_navit_vtable, NULL);
	dbus_bus_request_name(connection, service_name, 0, &error);
	if (dbus_error_is_set(&error)) {
		dbg(0,"Failed to request name: %s", error.message);
		dbus_error_free (&error);
	}
}

[Navit-cvs-commit] navit/src/binding/dbus - New directory

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/src/binding/dbus
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32739/dbus

Log Message:
Directory /cvsroot/navit/navit/src/binding/dbus added to the repository

[Navit-cvs-commit] navit/src/vehicle/gpsd vehicle_gpsd.c,1.5,1.6

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/src/vehicle/gpsd
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10240

Modified Files:
	vehicle_gpsd.c 
Log Message:
Add:vehicle_gpsd:Improve debugging output

Index: vehicle_gpsd.c
===================================================================
RCS file: /cvsroot/navit/navit/src/vehicle/gpsd/vehicle_gpsd.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** vehicle_gpsd.c	28 Jan 2008 10:43:08 -0000	1.5
--- vehicle_gpsd.c	17 Feb 2008 21:23:46 -0000	1.6
***************
*** 36,44 ****
  {
  	struct vehicle_priv *priv = vehicle_last;
  	// If data->fix.speed is NAN, then the drawing gets jumpy. 
  	if (isnan(data->fix.speed)) {
  		return;
  	}
! 
  	if (data->set & SPEED_SET) {
  		priv->speed = data->fix.speed * 3.6;
--- 36,45 ----
  {
  	struct vehicle_priv *priv = vehicle_last;
+ 	dbg(1,"data->set=0x%x\n", data->set);
  	// If data->fix.speed is NAN, then the drawing gets jumpy. 
  	if (isnan(data->fix.speed)) {
  		return;
  	}
! 	dbg(2,"speed ok\n");
  	if (data->set & SPEED_SET) {
  		priv->speed = data->fix.speed * 3.6;

[Navit-cvs-commit] navit/src graphics.c,1.31,1.32

[Alexander A. <za...@us...>]

Update of /cvsroot/navit/navit/src
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21902

Modified Files:
	graphics.c 
Log Message:
Fix: really destroy graphics context

Index: graphics.c
===================================================================
RCS file: /cvsroot/navit/navit/src/graphics.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** graphics.c	17 Feb 2008 19:52:02 -0000	1.31
--- graphics.c	17 Feb 2008 20:33:12 -0000	1.32
***************
*** 119,122 ****
--- 119,123 ----
  {
  	gc->meth.gc_destroy(gc->priv);
+ 	g_free(gc);
  }
  

[Navit-cvs-commit] navit/src graphics.c,1.30,1.31

[Alexander A. <za...@us...>]

Update of /cvsroot/navit/navit/src
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6117

Modified Files:
	graphics.c 
Log Message:
Fix: do not leak graphics contexts. Use g_object_unref to destroy pixbufs

Index: graphics.c
===================================================================
RCS file: /cvsroot/navit/navit/src/graphics.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** graphics.c	17 Feb 2008 16:58:16 -0000	1.30
--- graphics.c	17 Feb 2008 19:52:02 -0000	1.31
***************
*** 340,348 ****
  	GList *l,*ls,*es,*types;
  	enum item_type type;
! 	struct graphics_gc *gc;
  	struct graphics_image *img;
  	struct point p;
  
! 	es=itm->elements;	
  	while (es) {
  		e=es->data;
--- 340,348 ----
  	GList *l,*ls,*es,*types;
  	enum item_type type;
! 	struct graphics_gc *gc = NULL;
  	struct graphics_image *img;
  	struct point p;
  
! 	es=itm->elements;
  	while (es) {
  		e=es->data;
***************
*** 352,355 ****
--- 352,357 ----
  			ls=g_hash_table_lookup(display_list, GINT_TO_POINTER(type));
  			l=ls;
+ 			if (gc)
+ 				graphics_gc_destroy(gc);
  			gc=NULL;
  			img=NULL;
***************
*** 416,423 ****
  				l=g_list_next(l);
  			}
! 			types=g_list_next(types);	
  		}
  		es=g_list_next(es);
! 	}	
  }
  
--- 418,427 ----
  				l=g_list_next(l);
  			}
! 			types=g_list_next(types);
  		}
  		es=g_list_next(es);
! 	}
! 	if (gc)
! 		graphics_gc_destroy(gc);
  }
  

[Navit-cvs-commit] navit/src/graphics/gtk_drawing_area graphics_gtk_drawing_area.c, 1.31, 1.32

[Alexander A. <za...@us...>]

Update of /cvsroot/navit/navit/src/graphics/gtk_drawing_area
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6117/graphics/gtk_drawing_area

Modified Files:
	graphics_gtk_drawing_area.c 
Log Message:
Fix: do not leak graphics contexts. Use g_object_unref to destroy pixbufs

Index: graphics_gtk_drawing_area.c
===================================================================
RCS file: /cvsroot/navit/navit/src/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** graphics_gtk_drawing_area.c	17 Feb 2008 16:58:16 -0000	1.31
--- graphics_gtk_drawing_area.c	17 Feb 2008 19:52:03 -0000	1.32
***************
*** 248,252 ****
  {
  	if (priv->pixbuf)
! 		gdk_pixbuf_unref(priv->pixbuf);
  	g_free(priv);
  }
--- 248,252 ----
  {
  	if (priv->pixbuf)
! 		g_object_unref(priv->pixbuf);
  	g_free(priv);
  }

[Navit-cvs-commit] navit/src graphics.h, 1.13, 1.14 graphics.c, 1.29, 1.30

[Alexander A. <za...@us...>]

Update of /cvsroot/navit/navit/src
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25652

Modified Files:
	graphics.h graphics.c 
Log Message:
Fix: Memory leak - icon's pixbufs were not destroyed

Index: graphics.c
===================================================================
RCS file: /cvsroot/navit/navit/src/graphics.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** graphics.c	12 Feb 2008 14:32:14 -0000	1.29
--- graphics.c	17 Feb 2008 16:58:16 -0000	1.30
***************
*** 153,156 ****
--- 153,163 ----
  }
  
+ void graphics_image_free(struct graphics *gra, struct graphics_image *img)
+ {
+ 	if (gra->meth.image_free)
+ 		gra->meth.image_free(gra->priv, img->priv);
+ 	g_free(img);
+ }
+ 
  void
  graphics_draw_restore(struct graphics *this_, struct point *p, int w, int h)
***************
*** 395,398 ****
--- 402,407 ----
  						p.y=di->pnt[0].y - img->hot.y;
  						gra->meth.draw_image(gra->priv, gra->gc[0]->priv, &p, img->priv);
+ 						graphics_image_free(gra, img);
+ 						img = NULL;
  					}
  					break;
***************
*** 585,589 ****
  	profile(0,NULL);
  	do_draw(displaylist, trans, mapsets, order);
! 	profile(1,"do_draw");
  	graphics_displaylist_draw(gra, displaylist, trans, l);
  	profile(1,"xdisplay_draw");
--- 594,598 ----
  	profile(0,NULL);
  	do_draw(displaylist, trans, mapsets, order);
! //	profile(1,"do_draw");
  	graphics_displaylist_draw(gra, displaylist, trans, l);
  	profile(1,"xdisplay_draw");

Index: graphics.h
===================================================================
RCS file: /cvsroot/navit/navit/src/graphics.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** graphics.h	12 Feb 2008 14:32:14 -0000	1.13
--- graphics.h	17 Feb 2008 16:58:16 -0000	1.14
***************
*** 47,50 ****
--- 47,51 ----
  	void (*register_button_callback)(struct graphics_priv *gr, void (*callback)(void *data, int pressed, int button, struct point *p), void *data);
  	void (*register_motion_callback)(struct graphics_priv *gr, void (*callback)(void *data, struct point *p), void *data);
+ 	void (*image_free)(struct graphics_priv *gr, struct graphics_image_priv *priv);
  };
  
***************
*** 112,115 ****
--- 113,117 ----
  void graphics_gc_set_linewidth(struct graphics_gc *gc, int width);
  struct graphics_image *graphics_image_new(struct graphics *gra, char *path);
+ void graphics_image_free(struct graphics *gra, struct graphics_image *img);
  void graphics_draw_restore(struct graphics *this_, struct point *p, int w, int h);
  void graphics_draw_mode(struct graphics *this_, enum draw_mode_num mode);

[Navit-cvs-commit] navit/src/graphics/opengl graphics_opengl.c, 1.14, 1.15

[Alexander A. <za...@us...>]

Update of /cvsroot/navit/navit/src/graphics/opengl
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25652/graphics/opengl

Modified Files:
	graphics_opengl.c 
Log Message:
Fix: Memory leak - icon's pixbufs were not destroyed

Index: graphics_opengl.c
===================================================================
RCS file: /cvsroot/navit/navit/src/graphics/opengl/graphics_opengl.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** graphics_opengl.c	23 Jan 2008 19:27:38 -0000	1.14
--- graphics_opengl.c	17 Feb 2008 16:58:16 -0000	1.15
***************
*** 777,780 ****
--- 777,781 ----
  	register_button_callback,
  	register_motion_callback,
+ 	NULL,	// image_free
  };
  

[Navit-cvs-commit] navit/src/graphics/gtk_drawing_area graphics_gtk_drawing_area.c, 1.30, 1.31

[Alexander A. <za...@us...>]

Update of /cvsroot/navit/navit/src/graphics/gtk_drawing_area
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25652/graphics/gtk_drawing_area

Modified Files:
	graphics_gtk_drawing_area.c 
Log Message:
Fix: Memory leak - icon's pixbufs were not destroyed

Index: graphics_gtk_drawing_area.c
===================================================================
RCS file: /cvsroot/navit/navit/src/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** graphics_gtk_drawing_area.c	7 Feb 2008 10:21:31 -0000	1.30
--- graphics_gtk_drawing_area.c	17 Feb 2008 16:58:16 -0000	1.31
***************
*** 244,247 ****
--- 244,255 ----
  }
  
+ static void 
+ image_free(struct graphics_priv *gr, struct graphics_image_priv *priv)
+ {
+ 	if (priv->pixbuf)
+ 		gdk_pixbuf_unref(priv->pixbuf);
+ 	g_free(priv);
+ }
+ 
  static void
  draw_lines(struct graphics_priv *gr, struct graphics_gc_priv *gc, struct point *p, int count)
***************
*** 823,826 ****
--- 831,835 ----
  	register_button_callback,
  	register_motion_callback,
+ 	image_free,
  };
  

[Navit-cvs-commit] navit/po de.po,1.24,1.25

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/po
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6579

Modified Files:
	de.po 
Log Message:
Add:NLS:Added missing german translations

Index: de.po
===================================================================
RCS file: /cvsroot/navit/navit/po/de.po,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** de.po	14 Feb 2008 20:16:25 -0000	1.24
--- de.po	17 Feb 2008 14:58:59 -0000	1.25
***************
*** 8,12 ****
  "Project-Id-Version: Navit 0.1.0\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2008-02-14 21:09+0100\n"
  "PO-Revision-Date: 2007-07-10 21:53+0200\n"
  "Last-Translator: Martin Schaller <mar...@so...>\n"
--- 8,12 ----
  "Project-Id-Version: Navit 0.1.0\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2008-02-17 15:56+0100\n"
  "PO-Revision-Date: 2007-07-10 21:53+0200\n"
[...1618 lines suppressed...]
  #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83
  msgid "SW"
! msgstr "SW"
  
  #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83
  msgid "W"
! msgstr "W"
  
  #: ../src/gui/gtk/gui_gtk_statusbar.c:48 ../src/gui/gtk/gui_gtk_statusbar.c:83
  msgid "NW"
! msgstr "NW"
  
  #: ../src/gui/gtk/gui_gtk_statusbar.c:105
  #, c-format
  msgid "Route %4.0fkm    %02d:%02d ETA"
! msgstr "Route %4.0fkm    %02d:%02d ETA"
  
  #: ../src/gui/gtk/gui_gtk_statusbar.c:156
  msgid "Route 0000km  0+00:00 ETA"
! msgstr "Route 0000km 0+00:00 ETA"