[libgda] Misc. corrections
- From: Vivien Malerba <vivien src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda] Misc. corrections
- Date: Sun, 1 Aug 2010 15:52:47 +0000 (UTC)
commit 14fc6a28f1ac2c77bc659e13f64b211a2aa65041
Author: Vivien Malerba <malerba gnome-db org>
Date: Thu Jul 29 19:43:05 2010 +0200
Misc. corrections
libgda-ui/data-entries/gdaui-entry-shell.c | 2 ++
libgda-ui/libgda-ui.symbols | 6 +++---
libgda/gda-data-model.c | 4 ++++
libgda/gda-sql-builder.c | 2 +-
tools/browser/auth-dialog.c | 2 ++
tools/browser/canvas/browser-canvas.c | 7 ++++---
6 files changed, 16 insertions(+), 7 deletions(-)
---
diff --git a/libgda-ui/data-entries/gdaui-entry-shell.c b/libgda-ui/data-entries/gdaui-entry-shell.c
index e200cbc..b5e3156 100644
--- a/libgda-ui/data-entries/gdaui-entry-shell.c
+++ b/libgda-ui/data-entries/gdaui-entry-shell.c
@@ -473,9 +473,11 @@ gdaui_entry_shell_set_unknown (GdauiEntryShell *shell, gboolean unknown)
#if GTK_CHECK_VERSION (2,18,0)
widget_embedder_set_valid ((WidgetEmbedder*) shell->priv->embedder, !unknown);
#else
+ /*
if (unknown)
gtk_widget_hide (shell->priv->embedder);
else
gtk_widget_show (shell->priv->embedder);
+ */
#endif
}
diff --git a/libgda-ui/libgda-ui.symbols b/libgda-ui/libgda-ui.symbols
index faaa25d..38f5c3b 100644
--- a/libgda-ui/libgda-ui.symbols
+++ b/libgda-ui/libgda-ui.symbols
@@ -41,21 +41,21 @@
gdaui_data_cell_renderer_textual_get_type
gdaui_data_cell_renderer_textual_new
gdaui_data_entry_content_is_valid
- gdaui_data_entry_expand_in_layout
+ gdaui_data_entry_can_expand
gdaui_data_entry_get_attributes
gdaui_data_entry_get_editable
gdaui_data_entry_get_handler
- gdaui_data_entry_get_original_value
+ gdaui_data_entry_get_reference_value
gdaui_data_entry_get_type
gdaui_data_entry_get_value
gdaui_data_entry_get_value_type
gdaui_data_entry_grab_focus
gdaui_data_entry_set_reference_current
gdaui_data_entry_set_attributes
+ gdaui_data_entry_set_default_value
gdaui_data_entry_set_editable
gdaui_data_entry_set_reference_value
gdaui_data_entry_set_value
- gdaui_data_entry_set_value_default
gdaui_data_entry_set_value_type
gdaui_data_filter_get_type
gdaui_data_filter_new
diff --git a/libgda/gda-data-model.c b/libgda/gda-data-model.c
index 92317bb..edd90e9 100644
--- a/libgda/gda-data-model.c
+++ b/libgda/gda-data-model.c
@@ -38,7 +38,9 @@
#include <libgda/gda-enums.h>
#include <string.h>
#ifdef HAVE_LOCALE_H
+#ifndef G_OS_WIN32
#include <langinfo.h>
+#endif
#include <locale.h>
#endif
#include "csv.h"
@@ -2121,6 +2123,7 @@ real_gda_data_model_dump_as_string (GdaDataModel *model, gboolean dump_attribute
GdaDataModel *ramodel = NULL;
#ifdef HAVE_LOCALE_H
+#ifndef G_OS_WIN32
char *current_locale;
int utf8_mode;
current_locale = setlocale (LC_ALL, "");
@@ -2132,6 +2135,7 @@ real_gda_data_model_dump_as_string (GdaDataModel *model, gboolean dump_attribute
}
setlocale (LC_ALL, current_locale);
#endif
+#endif
string = g_string_new ("");
diff --git a/libgda/gda-sql-builder.c b/libgda/gda-sql-builder.c
index 13a5b63..8806bfb 100644
--- a/libgda/gda-sql-builder.c
+++ b/libgda/gda-sql-builder.c
@@ -581,7 +581,7 @@ create_typed_value (GType type, va_list *ap)
else if (type == G_TYPE_ULONG)
g_value_set_ulong ((v = gda_value_new (G_TYPE_ULONG)), va_arg (*ap, gulong));
else if (type == G_TYPE_LONG)
- g_value_set_long ((v = gda_value_new (G_TYPE_LONG)), va_arg (*ap, ulong));
+ g_value_set_long ((v = gda_value_new (G_TYPE_LONG)), va_arg (*ap, glong));
else if (type == GDA_TYPE_BINARY) {
GdaBinary *bin;
bin = va_arg (*ap, GdaBinary *);
diff --git a/tools/browser/auth-dialog.c b/tools/browser/auth-dialog.c
index cb4a658..4968c42 100644
--- a/tools/browser/auth-dialog.c
+++ b/tools/browser/auth-dialog.c
@@ -361,11 +361,13 @@ update_dialog_focus (AuthDialog *dialog)
}
}
+#if GTK_CHECK_VERSION(2,20,0)
if (allvalid) {
GtkWidget *wid;
wid = gtk_dialog_get_widget_for_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
gtk_widget_grab_focus (wid);
}
+#endif
}
/**
diff --git a/tools/browser/canvas/browser-canvas.c b/tools/browser/canvas/browser-canvas.c
index 8bc1046..985aa1c 100644
--- a/tools/browser/canvas/browser-canvas.c
+++ b/tools/browser/canvas/browser-canvas.c
@@ -595,9 +595,10 @@ popup_export_cb (GtkMenuItem *mitem, BrowserCanvas *canvas)
if (error) {
GtkWidget *errdlg;
- errdlg = gtk_message_dialog_new_with_markup ((GtkWindow*) toplevel,
- GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR,
- GTK_BUTTONS_CLOSE, "%s", error);
+ errdlg = gtk_message_dialog_new ((GtkWindow*) toplevel,
+ GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_CLOSE, NULL);
+ gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (errdlg), error);
g_free (error);
gtk_dialog_run (GTK_DIALOG (errdlg));
gtk_widget_destroy (errdlg);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]