This patch upgrades the D-BUS version of maemo-af-desktop
--
Philip Van Hoof, software developer at x-tend
home: me at pvanhoof dot be
gnome: pvanhoof at gnome dot org
work: vanhoof at x-tend dot be
http://www.pvanhoof.be - http://www.x-tend.be
Index: hildon-status-bar/hildon-status-bar-main.c
===================================================================
--- hildon-status-bar/hildon-status-bar-main.c (revision 1007)
+++ hildon-status-bar/hildon-status-bar-main.c (working copy)
@@ -298,8 +298,7 @@
val[0]->type != DBUS_TYPE_STRING ||
val[1]->type != DBUS_TYPE_INT32 ||
val[2]->type != DBUS_TYPE_INT32 ||
- ( val[3]->type != DBUS_TYPE_STRING &&
- val[3]->type != DBUS_TYPE_NIL ) )
+ ( val[3]->type != DBUS_TYPE_STRING ) )
{
retval->type = DBUS_TYPE_STRING;
if( arguments->len < 4 )
@@ -313,7 +312,7 @@
val[3]->type,
DBUS_TYPE_STRING, DBUS_TYPE_INT32,
DBUS_TYPE_INT32, DBUS_TYPE_STRING,
- DBUS_TYPE_NIL);
+ DBUS_TYPE_INT32);
}
osso_log( LOG_ERR, retval->value.s );
if(retval->value.s){
@@ -354,8 +353,7 @@
val[1]->type != DBUS_TYPE_INT32 ||
val[2]->type != DBUS_TYPE_INT32 ||
val[3]->type != DBUS_TYPE_STRING ||
- (arguments->len == 5 && val[5]->type != DBUS_TYPE_NIL
- ) )
+ (arguments->len == 5 ) )
{
retval->type = DBUS_TYPE_STRING;
if( arguments->len < 5 ) {
Index: hildon-navigator/others-menu.c
===================================================================
--- hildon-navigator/others-menu.c (revision 1007)
+++ hildon-navigator/others-menu.c (working copy)
@@ -413,7 +413,7 @@
static void others_menu_changed_cb( char *path, _om_changed_cb_data_t *data )
{
/* Remove callbacks */
- hildon_dnotify_remove_every_cb();
+ /* TODO: hildon_dnotify_remove_every_cb(); */
/* Destroy the menu */
gtk_widget_destroy( data->widget );
Index: hildon-navigator/osso-manager.c
===================================================================
--- hildon-navigator/osso-manager.c (revision 1007)
+++ hildon-navigator/osso-manager.c (working copy)
@@ -241,7 +241,7 @@
con = (DBusConnection *)osso_get_dbus_connection(man->osso);
dbus_error_init(&error);
- n = dbus_bus_service_exists(con,buf,&error);
+ n = dbus_bus_name_has_owner(con,buf,&error);
if (dbus_error_is_set(&error))
{
_______________________________________________
maemo-developers mailing list
[email protected]
https://maemo.org/mailman/listinfo/maemo-developers
