This email list is read-only. Emails sent to this list will be discarded
----------------------------------
moblin-system-daemon/datetime/datetime.c | 3 +--
moblin-system-daemon/datetime/datetime.h | 2 +-
moblin-system-daemon/datetime/datetime.xml | 2 +-
moblin-system-daemon/moblin-system-tool.c | 8 ++++----
4 files changed, 7 insertions(+), 8 deletions(-)
New commits:
commit 333a9c41ec856799df11119eda50ee9c3d97e6a4
Author: Todd Brandt <[EMAIL PROTECTED]>
Date: Fri Aug 8 12:46:47 2008 -0700
fixes to lilli's latest
Diff in this email is a maximum of 400 lines.
diff --git a/moblin-system-daemon/datetime/datetime.c
b/moblin-system-daemon/datetime/datetime.c
index 17244e4..493e834 100644
--- a/moblin-system-daemon/datetime/datetime.c
+++ b/moblin-system-daemon/datetime/datetime.c
@@ -2,7 +2,6 @@
#include <stdlib.h>
#include <string.h>
#include "moblin-system-dbus.h"
-#include <oobs/oobs.h>
// lilli
#include <sys/time.h>
@@ -245,7 +244,7 @@ system_daemon_get_time(MoblinSystemServer * server,
gboolean
system_daemon_get_all_timezones(MoblinSystemServer * server,
- gchar ***tz_list, int options, GError **error)
+ int options, gchar ***tz_list, GError **error)
{
PRINTF("[system_daemon_get_all_timezones] start\n\toptions=%d\n",
options);
int optionsBitMask = 8; // 0b00001000
diff --git a/moblin-system-daemon/datetime/datetime.h
b/moblin-system-daemon/datetime/datetime.h
index c8d1fc2..811cf30 100644
--- a/moblin-system-daemon/datetime/datetime.h
+++ b/moblin-system-daemon/datetime/datetime.h
@@ -47,6 +47,6 @@ initialize_datetime(
gboolean
system_daemon_get_all_timezones(MoblinSystemServer * server,
- gchar ***tz_list, int options, GError **error);
+ int options, gchar ***tz_list, GError **error);
#endif
diff --git a/moblin-system-daemon/datetime/datetime.xml
b/moblin-system-daemon/datetime/datetime.xml
index 4b80730..0a2f003 100644
--- a/moblin-system-daemon/datetime/datetime.xml
+++ b/moblin-system-daemon/datetime/datetime.xml
@@ -15,8 +15,8 @@
<arg type="i" name="second" direction="out" />
</method>
<method name="GetAllTimezones">
- <arg type="s" name="tz_list" direction="out" />
<arg type="i" name="options" direction="in" />
+ <arg type="as" name="tz_list" direction="out" />
</method>
<method name="SetTimezone">
<arg type="s" name="timezone" direction="in" />
diff --git a/moblin-system-daemon/moblin-system-tool.c
b/moblin-system-daemon/moblin-system-tool.c
index 621ba75..09a5f12 100644
--- a/moblin-system-daemon/moblin-system-tool.c
+++ b/moblin-system-daemon/moblin-system-tool.c
@@ -187,14 +187,14 @@ int main(int argc, char *argv[])
}
} else if(!strcmp(argv[1], "set_timezone")) {
gchar* timezone;
- if((argc < 3)||(sscanf(argv[2], "%c",
- &timezone) != 1))
+ if(argc < 3)
{
fprintf(stderr, "Usage: %s set_timezone
<region/zone>\n",
argv[0]);
fprintf(stderr, "Use get_all_timezones to see a list of
available timezones.\n");
return -1;
}
+ timezone = g_strdup(argv[2]);
if(!org_moblin_SystemDaemon_set_timezone(proxy, timezone,
&gerror))
{
g_warning ("set_timezone error: %s", gerror->message);
@@ -207,7 +207,7 @@ int main(int argc, char *argv[])
gchar** timezones = NULL;
//sscanf(argv[2], "%d", &optionMask);
- if(!org_moblin_SystemDaemon_get_all_timezones(proxy,
&timezones, optionMask, &gerror))
+ if(!org_moblin_SystemDaemon_get_all_timezones(proxy,
optionMask, &timezones, &gerror))
{
g_warning ("get_all_timezones error: %s", gerror->message);
g_error_free (gerror);
@@ -217,7 +217,7 @@ int main(int argc, char *argv[])
printf("Timezones:\n");
while(timezones[iter])
{
- printf("%s\n", *timezones[iter]);
+ printf("%s\n", timezones[iter]);
}
}
_______________________________________________
Commits mailing list
[email protected]
https://www.moblin.org/mailman/listinfo/commits
