This patch upgrades the D-BUS version of hildon-control-panel
--
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-control-panel-main.c
===================================================================
--- hildon-control-panel-main.c (revision 1007)
+++ hildon-control-panel-main.c (working copy)
@@ -905,12 +905,13 @@
confirm_dialog = hildon_note_new_confirmation
(GTK_WINDOW(state_data.window),
RESET_FACTORY_SETTINGS_INFOBANNER);
-
+ /* TODO:
hildon_note_set_button_texts
(HILDON_NOTE(confirm_dialog),
RESET_FACTORY_SETTINGS_INFOBANNER_CLOSE_ALL,
RESET_FACTORY_SETTINGS_INFOBANNER_CANCEL);
-
+ */
+
gtk_widget_show_all(confirm_dialog);
i = gtk_dialog_run(GTK_DIALOG(confirm_dialog));
@@ -929,6 +930,7 @@
GtkWidget *pw_dialog = (hildon_get_password_dialog_new(
GTK_WINDOW(state_data.window), FALSE));
+/* TODO
hildon_get_password_dialog_set_title
(HILDON_GET_PASSWORD_DIALOG(pw_dialog),
RESET_FACTORY_SETTINGS_PASSWORD_DIALOG_TITLE);
@@ -936,7 +938,7 @@
hildon_get_password_dialog_set_caption
(HILDON_GET_PASSWORD_DIALOG(pw_dialog),
RESET_FACTORY_SETTINGS_PASSWORD_DIALOG_CAPTION);
-/*
+
hildon_get_password_dialog_set_max_characters
(HILDON_GET_PASSWORD_DIALOG(pw_dialog),
HILDON_CP_ASSUMED_LOCKCODE_MAXLENGTH);
@@ -1228,7 +1230,7 @@
if(first_arg_type != DBUS_TYPE_INVALID)
_append_args(msg, first_arg_type, var_args);
- dbus_message_set_auto_activation(msg, FALSE);
+ dbus_message_set_auto_start(msg, FALSE);
dbus_error_init(&err);
timeout_retval = osso_rpc_get_timeout(osso, &timeout);
@@ -1300,15 +1302,11 @@
case DBUS_TYPE_STRING:
s = va_arg(var_args, gchar *);
if(s == NULL)
- dbus_message_append_args(msg, DBUS_TYPE_NIL,
+ dbus_message_append_args(msg, DBUS_TYPE_INT32,
DBUS_TYPE_INVALID);
else
dbus_message_append_args(msg, type, s, DBUS_TYPE_INVALID);
break;
- case DBUS_TYPE_NIL:
- dbus_message_append_args(msg, DBUS_TYPE_NIL,
- DBUS_TYPE_INVALID);
- break;
default:
break;
}
@@ -1325,33 +1323,36 @@
retval->type = dbus_message_iter_get_arg_type(iter);
switch(retval->type) {
case DBUS_TYPE_INT32:
- retval->value.i = dbus_message_iter_get_int32(iter);
+ dbus_message_iter_get_basic (iter, &retval->value.i);
dprint("got INT32:%d",retval->value.i);
break;
case DBUS_TYPE_UINT32:
- retval->value.u = dbus_message_iter_get_uint32(iter);
+ dbus_message_iter_get_basic(iter, &retval->value.u);
dprint("got UINT32:%u",retval->value.u);
break;
case DBUS_TYPE_BOOLEAN:
- retval->value.b = dbus_message_iter_get_boolean(iter);
+ dbus_message_iter_get_basic (iter, &retval->value.b);
dprint("got BOOLEAN:%s",retval->value.s?"TRUE":"FALSE");
break;
case DBUS_TYPE_DOUBLE:
- retval->value.d = dbus_message_iter_get_double(iter);
+ dbus_message_iter_get_basic (iter, &retval->value.d);
dprint("got DOUBLE:%f",retval->value.d);
break;
case DBUS_TYPE_STRING:
- retval->value.s =
- g_strdup(dbus_message_iter_get_string(iter));
+ {
+ char *str;
+ dbus_message_iter_get_basic (iter, &str);
+
+ retval->value.s = g_strdup(str);
+ dbus_free (str);
+
if(retval->value.s == NULL) {
retval->type = DBUS_TYPE_INVALID;
}
dprint("got STRING:'%s'",retval->value.s);
+ }
break;
- case DBUS_TYPE_NIL:
- retval->value.s = NULL;
- dprint("got NIL");
- break;
+
default:
retval->type = DBUS_TYPE_INVALID;
retval->value.i = 0;
_______________________________________________
maemo-developers mailing list
[email protected]
https://maemo.org/mailman/listinfo/maemo-developers
