glom r1403 - in branches/glom-1-6: . glom/mode_data po

[murrayc svn gnome org]

Author: murrayc
Date: Tue Jan 29 17:35:36 2008
New Revision: 1403
URL: http://svn.gnome.org/viewvc/glom?rev=1403&view=rev

Log:
2008-01-29  Murray Cumming  <murrayc murrayc com>

* glom/mode_data/box_data_details.cc: on_flowtable_script_button_clicked():
Make sure that we send the primary key value when refreshing after a button 
was clicked. This fixes the bug that most of the fields were blanked after 
clicking a button.

Added:
   branches/glom-1-6/po/POTFILES.skip
Modified:
   branches/glom-1-6/ChangeLog
   branches/glom-1-6/NEWS
   branches/glom-1-6/configure.in
   branches/glom-1-6/glom/mode_data/box_data_details.cc

Modified: branches/glom-1-6/NEWS
==============================================================================
--- branches/glom-1-6/NEWS	(original)
+++ branches/glom-1-6/NEWS	Tue Jan 29 17:35:36 2008
@@ -1,3 +1,9 @@
+1.6.7 (stable):
+
+* Fix loss of field formatting when reloading document.
+* Fix loss of images when reloading document.
+  (Murray Cumming)
+ 
 1.6.6 (stable):
 
 * Some minor improvements to the (still unfinished) Maemo port.

Modified: branches/glom-1-6/configure.in
==============================================================================
--- branches/glom-1-6/configure.in	(original)
+++ branches/glom-1-6/configure.in	Tue Jan 29 17:35:36 2008
@@ -4,7 +4,7 @@
 AM_CONFIG_HEADER(config.h)
 
 # Package name and version number:
-AM_INIT_AUTOMAKE(glom, 1.6.6)
+AM_INIT_AUTOMAKE(glom, 1.6.7)
 
 AM_MAINTAINER_MODE
 
@@ -71,7 +71,7 @@
 fi
 
 # Do not require avahi, goocanvas and gtksourceviewmm in client only mode
-REQUIRED_LIBS="bakery-2.4 >= 2.4.2 gthread-2.0 gnome-vfsmm-2.6 >= 2.11.1 libxslt >= 1.1.10 pygda-3.0 pygtk-2.0 >= 2.6.0 libgdamm-3.0 >= 2.9.8 libgda-3.0 >= 3.0.1 libgda-postgres-3.0"
+REQUIRED_LIBS="bakery-2.4 >= 2.4.3 gthread-2.0 gnome-vfsmm-2.6 >= 2.11.1 libxslt >= 1.1.10 pygda-3.0 pygtk-2.0 >= 2.6.0 libgdamm-3.0 >= 2.9.81 libgda-3.0 >= 3.0.2 libgda-postgres-3.0"
 if test "$enable_client_only" != "yes"; then
 	REQUIRED_LIBS="$REQUIRED_LIBS libgtksourceviewmm-1.0 goocanvas avahi-glib"
 fi

Modified: branches/glom-1-6/glom/mode_data/box_data_details.cc
==============================================================================
--- branches/glom-1-6/glom/mode_data/box_data_details.cc	(original)
+++ branches/glom-1-6/glom/mode_data/box_data_details.cc	Tue Jan 29 17:35:36 2008
@@ -193,11 +193,11 @@
 
 bool Box_Data_Details::fill_from_database()
 {
-  //std::cout << "Box_Data_Details::fill_from_database(): m_primary_key_value=" << m_primary_Key_value.to_string() << std::endl;
+  //std::cout << "Box_Data_Details::fill_from_database(): m_primary_key_value=" << m_primary_key_value.to_string() << std::endl;
 
- //Don't try to open a connection if there is no document,
- //for instance, during application destruction.
- if(!get_document())
+  //Don't try to open a connection if there is no document,
+  //for instance, during application destruction.
+  if(!get_document())
     return false;
 
   bool bResult = false;
@@ -576,14 +576,15 @@
     execute_button_script(layout_item, primary_key_value);
 
     //Refresh the view, in case the script changed any data:
-    if(get_primary_key_is_in_foundset(m_found_set, m_primary_key_value)) //Check, because maybe the script deleted the current record, or changed something so that it should no longer be shown in the found set.
+    //(m_primary_key_value seems to be NULL here. We can use primary_key_value instead, but it's a bit strange. murrayc.)
+    if(get_primary_key_is_in_foundset(m_found_set, primary_key_value)) //Check, because maybe the script deleted the current record, or changed something so that it should no longer be shown in the found set.
     {
-      refresh_data_from_database_with_primary_key(m_primary_key_value);
+      refresh_data_from_database_with_primary_key(primary_key_value);
     }
     else
     {
       //Tell the parent to do something appropriate, such as show another record:
-      signal_record_deleted().emit(m_primary_key_value);
+      signal_record_deleted().emit(primary_key_value);
     }
   }
 }

Added: branches/glom-1-6/po/POTFILES.skip
==============================================================================
--- (empty file)
+++ branches/glom-1-6/po/POTFILES.skip	Tue Jan 29 17:35:36 2008
@@ -0,0 +1 @@
+glom.desktop.in