[glom] Fix some warnings.



commit d6faabdaac64c0ae3944ec9d219c31c1134316ca
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Oct 27 18:26:39 2009 +0100

    Fix some warnings.
    
    * glom/dialog_existing_or_new.cc: get_service_info(): Replace a 0 with
    (void*)0 to avoid a warning after my change on 2009-10-13.
    * glom/libglom/data_structure/has_title_singular.cc():
    operator==(): Actually use the src parameter.

 ChangeLog                                         |    9 +++++++++
 glom/dialog_existing_or_new.cc                    |    2 +-
 glom/libglom/data_structure/has_title_singular.cc |    2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index d904878..c22cad7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,15 @@
 
 2009-10-27  Murray Cumming  <murrayc murrayc com>
 
+  Fix some warnings.
+  
+	* glom/dialog_existing_or_new.cc: get_service_info(): Replace a 0 with 
+	(void*)0 to avoid a warning after my change on 2009-10-13.
+	* glom/libglom/data_structure/has_title_singular.cc(): 
+	operator==(): Actually use the src parameter.
+
+2009-10-27  Murray Cumming  <murrayc murrayc com>
+
 	* glom/utility_widgets/db_adddel/db_adddel.cc: treeview_append_column(): 
 	Don't try to put -1 in a guint for the column width.
 
diff --git a/glom/dialog_existing_or_new.cc b/glom/dialog_existing_or_new.cc
index fb229b9..a48e7a5 100644
--- a/glom/dialog_existing_or_new.cc
+++ b/glom/dialog_existing_or_new.cc
@@ -174,7 +174,7 @@ Dialog_ExistingOrNew::Dialog_ExistingOrNew(BaseObjectType* cobject, const Glib::
   // Browse local network
 #ifndef G_OS_WIN32
   gchar* service_type = epc_service_type_new(EPC_PROTOCOL_HTTPS, "glom");
-  m_service_monitor = epc_service_monitor_new_for_types(0, service_type, 0);
+  m_service_monitor = epc_service_monitor_new_for_types(0, service_type, (void*)0);
   g_signal_connect(m_service_monitor, "service-found", G_CALLBACK(on_service_found_static), this);
   g_signal_connect(m_service_monitor, "service-removed", G_CALLBACK(on_service_removed_static), this);
   g_free(service_type);
diff --git a/glom/libglom/data_structure/has_title_singular.cc b/glom/libglom/data_structure/has_title_singular.cc
index a1ed089..40673df 100644
--- a/glom/libglom/data_structure/has_title_singular.cc
+++ b/glom/libglom/data_structure/has_title_singular.cc
@@ -48,7 +48,7 @@ HasTitleSingular& HasTitleSingular::operator=(const HasTitleSingular& src)
 
 bool HasTitleSingular::operator==(const HasTitleSingular& src) const
 {
-  const bool bResult = (m_title_singular == m_title_singular);
+  const bool bResult = (m_title_singular == src.m_title_singular);
 
   return bResult;
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]