Commit 6c327ce1 authored by Morten Welinder's avatar Morten Welinder
Browse files

Merge branch 'master' into 'master'

Bump gda dependency to 6.0.0

See merge request !18
parents 8a4dd2c4 58620489
......@@ -298,7 +298,7 @@ AC_ARG_WITH(gda,
fi
)
if test "$try_gda" = true; then
PKG_CHECK_MODULES(GDA, [libgda-5.0 >= 5.0.0, libgda-ui-5.0 >= 5.0.0],
PKG_CHECK_MODULES(GDA, [libgda-6.0 >= 6.0.0, libgda-ui-6.0 >= 6.0.0],
[gda_msg=yes],
[gda_msg="NO. libgda problem"])
if test "$gda_msg" = yes; then
......
......@@ -69,9 +69,9 @@ gnm_value_new_from_gda (GValue const *gval,
if (t == GDA_TYPE_TIME) {
GdaTime const *time = gda_value_get_time (gval);
res = value_new_float ( (time->hour +
(time->minute +
time->second / 60.) / 60.) / 24.),
res = value_new_float ( (g_date_time_get_hour (time) +
(g_date_time_get_minute (time) +
g_date_time_get_second (time) / 60.) / 60.) / 24.),
value_set_fmt (res, go_format_default_time ());
return res;
}
......@@ -527,7 +527,7 @@ view_data_sources (GnmAction const *action, WorkbookControl *wbc)
{
char *argv[2];
argv[0] = gda_get_application_exec_path ("gda-control-center");
argv[0] = "/usr/bin/env gda-control-center-6.0";
argv[1] = NULL;
if (!g_spawn_async (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL)) {
go_gtk_notice_dialog (wbcg_toplevel (WBC_GTK (wbc)), GTK_MESSAGE_INFO,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment