[glom] Fix build with -Werror

[Daniel Elstner <daniel src gnome org>]

commit bbdd42285b545e6d8178822959ad6f5155978f70
Author: Daniel Elstner <danielk openismus com>
Date:   Thu Jul 23 18:33:10 2009 +0200

    Fix build with -Werror
    
    * glom/bakery/app_withdoc.cc: Fix build with -Werror.
    * glom/dialog_import_csv.cc: ditto,
    * glom/libglom/python_embed/py_glom_record.cc: ditto,
    * glom/libglom/python_embed/py_glom_related.cc: ditto,
    * glom/libglom/python_embed/py_glom_relatedrecord.cc: ditto,
    * glom/libglom/python_embed/pygdavalue_conversions.c: ditto,
    * glom/mode_design/fields/dialog_fielddefinition.cc: ditto,
    * glom/utility_widgets/dialog_image_progress.cc: ditto.

 ChangeLog                                          |   11 +++++++++++
 glom/bakery/app_withdoc.cc                         |    2 +-
 glom/dialog_import_csv.cc                          |    2 +-
 glom/libglom/python_embed/py_glom_record.cc        |    2 +-
 glom/libglom/python_embed/py_glom_related.cc       |    2 +-
 glom/libglom/python_embed/py_glom_relatedrecord.cc |    2 +-
 glom/libglom/python_embed/pygdavalue_conversions.c |    2 +-
 glom/mode_design/fields/dialog_fielddefinition.cc  |    3 ++-
 glom/utility_widgets/dialog_image_progress.cc      |    4 ++--
 9 files changed, 21 insertions(+), 9 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index e077093..8dfa0cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2009-07-23  Daniel Elstner  <danielk openismus com>
 
+	* glom/bakery/app_withdoc.cc: Fix build with -Werror.
+	* glom/dialog_import_csv.cc: ditto,
+	* glom/libglom/python_embed/py_glom_record.cc: ditto,
+	* glom/libglom/python_embed/py_glom_related.cc: ditto,
+	* glom/libglom/python_embed/py_glom_relatedrecord.cc: ditto,
+	* glom/libglom/python_embed/pygdavalue_conversions.c: ditto,
+	* glom/mode_design/fields/dialog_fielddefinition.cc: ditto,
+	* glom/utility_widgets/dialog_image_progress.cc: ditto.
+
+2009-07-23  Daniel Elstner  <danielk openismus com>
+
 	Switch to non-recursive build process
 
 	* macros/mm-pkg.m4: New file, defining the MM_PKG_CONFIG_SUBST macro.
diff --git a/glom/bakery/app_withdoc.cc b/glom/bakery/app_withdoc.cc
index 867cc6d..46ac9ed 100644
--- a/glom/bakery/app_withdoc.cc
+++ b/glom/bakery/app_withdoc.cc
@@ -490,7 +490,7 @@ void App_WithDoc::document_history_remove(const Glib::ustring& /* file_uri */)
   //Override this.
 }
 
-void App_WithDoc::ui_warning_load_failed(int failure_code)
+void App_WithDoc::ui_warning_load_failed(int)
 {
   ui_warning(_("Open Failed."), _("The document could not be opened."));
 }
diff --git a/glom/dialog_import_csv.cc b/glom/dialog_import_csv.cc
index e816ea5..61ccd66 100644
--- a/glom/dialog_import_csv.cc
+++ b/glom/dialog_import_csv.cc
@@ -369,7 +369,7 @@ void Dialog_Import_CSV::clear()
   validate_primary_key();
 }
 
-void Dialog_Import_CSV::show_error_dialog(const Glib::ustring& primary, const Glib::ustring& secondary)
+void Dialog_Import_CSV::show_error_dialog(const Glib::ustring&, const Glib::ustring& secondary)
 {
   Utils::show_ok_dialog(_("Error Importing CSV File"),
      secondary, *this, Gtk::MESSAGE_ERROR);
diff --git a/glom/libglom/python_embed/py_glom_record.cc b/glom/libglom/python_embed/py_glom_record.cc
index 7ec8ef9..befb7cc 100644
--- a/glom/libglom/python_embed/py_glom_record.cc
+++ b/glom/libglom/python_embed/py_glom_record.cc
@@ -295,7 +295,7 @@ static PyTypeObject pyglom_RecordType = {
     (initproc)Record_init,      /* tp_init */
     0,                         /* tp_alloc */
     Record_new,                 /* tp_new */
-    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0,
 };
 
 PyTypeObject* PyGlomRecord_GetPyType()
diff --git a/glom/libglom/python_embed/py_glom_related.cc b/glom/libglom/python_embed/py_glom_related.cc
index 65b9611..0e180c3 100644
--- a/glom/libglom/python_embed/py_glom_related.cc
+++ b/glom/libglom/python_embed/py_glom_related.cc
@@ -251,7 +251,7 @@ static PyTypeObject pyglom_RelatedType = {
     (initproc)Related_init,      /* tp_init */
     0,                         /* tp_alloc */
     Related_new,                 /* tp_new */
-    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0,
 };
 
 PyTypeObject* PyGlomRelated_GetPyType()
diff --git a/glom/libglom/python_embed/py_glom_relatedrecord.cc b/glom/libglom/python_embed/py_glom_relatedrecord.cc
index 1008534..a381efc 100644
--- a/glom/libglom/python_embed/py_glom_relatedrecord.cc
+++ b/glom/libglom/python_embed/py_glom_relatedrecord.cc
@@ -454,7 +454,7 @@ static PyTypeObject pyglom_RelatedRecordType = {
     (initproc)RelatedRecord_init,      /* tp_init */
     0,                         /* tp_alloc */
     RelatedRecord_new,                 /* tp_new */
-    0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0,
 };
 
 PyTypeObject* PyGlomRelatedRecord_GetPyType()
diff --git a/glom/libglom/python_embed/pygdavalue_conversions.c b/glom/libglom/python_embed/pygdavalue_conversions.c
index 503ed73..e742877 100644
--- a/glom/libglom/python_embed/pygdavalue_conversions.c
+++ b/glom/libglom/python_embed/pygdavalue_conversions.c
@@ -156,7 +156,7 @@ pygda_value_as_pyobject(const GValue *boxed, gboolean copy_boxed)
     } else if (value_type == G_TYPE_UINT) {
         ret = PyInt_FromLong (g_value_get_uint ((GValue*)boxed));
     } else {
-      g_warning ("G_VALUE_TYPE() returned unknown type %d", value_type);
+      g_warning ("G_VALUE_TYPE() returned unknown type %lu", value_type);
 
       Py_INCREF (Py_None);
       ret = Py_None;
diff --git a/glom/mode_design/fields/dialog_fielddefinition.cc b/glom/mode_design/fields/dialog_fielddefinition.cc
index e4752f6..392cfe5 100644
--- a/glom/mode_design/fields/dialog_fielddefinition.cc
+++ b/glom/mode_design/fields/dialog_fielddefinition.cc
@@ -373,7 +373,8 @@ void Dialog_FieldDefinition::on_combo_lookup_relationship_changed()
 void Dialog_FieldDefinition::on_button_edit_calculation()
 {
   //TODO: Share a global instance, to make this quicker?
-  Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(GLOM_GLADEDIR "glom_developer.glade", "window_field_calculation");
+  Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(
+      Utils::get_glade_file_path("glom_developer.glade"), "window_field_calculation");
   if(refXml)
   {
     Dialog_FieldCalculation* dialog = 0;
diff --git a/glom/utility_widgets/dialog_image_progress.cc b/glom/utility_widgets/dialog_image_progress.cc
index 3047281..96ae952 100644
--- a/glom/utility_widgets/dialog_image_progress.cc
+++ b/glom/utility_widgets/dialog_image_progress.cc
@@ -129,13 +129,13 @@ void Dialog_Image_Progress::on_stream_read(const Glib::RefPtr<Gio::AsyncResult>&
     gssize size = m_stream->read_finish(result);
     g_assert(size >= 0); // Would have thrown an exception otherwise
     // Cannot read more data than there is available in the file:
-    g_assert(offset + size <= static_cast<gsize>(m_data->binary_length));
+    g_assert(offset + size <= static_cast<gssize>(m_data->binary_length));
     // Load image
     m_loader->write(m_data->data + offset, size);
     // Set progress
     m_progress_bar->set_fraction(static_cast<double>(offset + size) / m_data->binary_length);
     // Read next chunk, if any
-    if(offset + size < static_cast<gsize>(m_data->binary_length))
+    if(offset + size < static_cast<gssize>(m_data->binary_length))
       // Even if choose a priority lower than GDK_PRIORITY_REDRAW + 10 for the
       // read_async we don't see the progressbar progressing while the image
       // is loading. Therefore we put an idle inbetween.