glom r2057 - in branches/glom-1-8: . glom/utility_widgets/calendar

[murrayc svn gnome org]

Author: murrayc
Date: Thu Apr 16 07:54:53 2009
New Revision: 2057
URL: http://svn.gnome.org/viewvc/glom?rev=2057&view=rev

Log:
Increased version

Modified:
   branches/glom-1-8/ChangeLog
   branches/glom-1-8/NEWS
   branches/glom-1-8/configure.in
   branches/glom-1-8/glom/utility_widgets/calendar/glomcalendar.cc
   branches/glom-1-8/glom/utility_widgets/calendar/glomcalendar.h
   branches/glom-1-8/glom/utility_widgets/calendar/glomgtkcalendar.c
   branches/glom-1-8/glom/utility_widgets/calendar/glomgtkcalendar.h

Modified: branches/glom-1-8/NEWS
==============================================================================
--- branches/glom-1-8/NEWS	(original)
+++ branches/glom-1-8/NEWS	Thu Apr 16 07:54:53 2009
@@ -1,3 +1,18 @@
+1.8.8:
+
+* Fix the build with GTK+ 2.16. (errors in GlomGtkCalendar).
+  (Murray Cumming)
+
+1.8.7:
+
+* Details:
+  - Avoid vast extra space when using 3 or more columns. 
+    Bug #539369 (maximiliano)
+  - Avoid showing scientific e notation for up to 15 digits, instead of 7.
+   (Murray Cumming)
+* Avoid leaking a Gtk::EventBox.
+  (Armin Burgmeier)
+      
 1.8.6:
 
 * Main window: Correct the order of the widgets at the bottom-right that 

Modified: branches/glom-1-8/configure.in
==============================================================================
--- branches/glom-1-8/configure.in	(original)
+++ branches/glom-1-8/configure.in	Thu Apr 16 07:54:53 2009
@@ -4,7 +4,7 @@
 AM_CONFIG_HEADER(config.h)
 
 # Package name and version number:
-AM_INIT_AUTOMAKE(glom, 1.8.6)
+AM_INIT_AUTOMAKE(glom, 1.8.8)
 
 AM_MAINTAINER_MODE
 

Modified: branches/glom-1-8/glom/utility_widgets/calendar/glomcalendar.cc
==============================================================================
--- branches/glom-1-8/glom/utility_widgets/calendar/glomcalendar.cc	(original)
+++ branches/glom-1-8/glom/utility_widgets/calendar/glomcalendar.cc	Thu Apr 16 07:54:53 2009
@@ -1,7 +1,7 @@
 #include "glomcalendar.h"
 
 #include <gtk/gtk.h>
-#if !GTK_CHECK_VERSION(2,16,0)
+#if !GTK_CHECK_VERSION(2,14,0)
 
 #include <gtkmm/private/widget_p.h>
 
@@ -84,7 +84,7 @@
 #include <gtk/gtkcalendar.h>
 
 
-static gchar* SignalProxy_Details_gtk_callback(GlomGtkCalendar* model, guint year, guint month, guint day, gpointer user_data)
+static gchar* SignalProxy_Details_gtk_callback(GlomGtkCalendar* /* model */, guint year, guint month, guint day, gpointer user_data)
 {
   GlomGtk::Calendar::SlotDetails* the_slot = static_cast<GlomGtk::Calendar::SlotDetails*>(user_data);
 

Modified: branches/glom-1-8/glom/utility_widgets/calendar/glomcalendar.h
==============================================================================
--- branches/glom-1-8/glom/utility_widgets/calendar/glomcalendar.h	(original)
+++ branches/glom-1-8/glom/utility_widgets/calendar/glomcalendar.h	Thu Apr 16 07:54:53 2009
@@ -5,10 +5,10 @@
 //#include <gtk/gtkcalendar.h>
 #include <gtkmm/calendar.h>
 #include <gtk/gtk.h>
-#if GTK_CHECK_VERSION(2,16,0)
+#if GTK_CHECK_VERSION(2,14,0)
 namespace GlomGtk
 {
-  typedef GlomGtk::Calendar Calendar;
+  typedef Gtk::Calendar Calendar;
 }
 #else
 
@@ -310,13 +310,12 @@
    * @newin2p16
    */
   void set_detail_func(const SlotDetails& slot);
-  ;
-  	 
+  
   
   void set_detail_width_chars(int chars);
   
   void set_detail_height_rows(int rows);
-	  	 
+ 
   
   int get_detail_width_chars() const;
   

Modified: branches/glom-1-8/glom/utility_widgets/calendar/glomgtkcalendar.c
==============================================================================
--- branches/glom-1-8/glom/utility_widgets/calendar/glomgtkcalendar.c	(original)
+++ branches/glom-1-8/glom/utility_widgets/calendar/glomgtkcalendar.c	Thu Apr 16 07:54:53 2009
@@ -3,9 +3,9 @@
  * the GNOME release schedule.
  */
 #include <gtk/gtk.h>
-#if !GTK_CHECK_VERSION(2,16,0)
+#if !GTK_CHECK_VERSION(2,14,0)
 
-#include <config.h>
+#include "config.h"
 
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
@@ -86,7 +86,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#include <config.h>
+#include <libglom/libglom_config.h>
 
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>

Modified: branches/glom-1-8/glom/utility_widgets/calendar/glomgtkcalendar.h
==============================================================================
--- branches/glom-1-8/glom/utility_widgets/calendar/glomgtkcalendar.h	(original)
+++ branches/glom-1-8/glom/utility_widgets/calendar/glomgtkcalendar.h	Thu Apr 16 07:54:53 2009
@@ -3,7 +3,7 @@
  * the GNOME release schedule.
  */
 #include <gtk/gtkcalendar.h>
-#if GTK_CHECK_VERSION(2,16,0)
+#if GTK_CHECK_VERSION(2,14,0)
 typedef GlomGlomGtkCalendar GlomGlomGtkCalendar; 
 #else
 /* GTK - The GIMP Toolkit
@@ -80,7 +80,7 @@
   GLOM_GTK_CALENDAR_NO_MONTH_CHANGE		= 1 << 2,
   GLOM_GTK_CALENDAR_SHOW_WEEK_NUMBERS	= 1 << 3,
   GLOM_GTK_CALENDAR_WEEK_START_MONDAY	= 1 << 4,
-  GLOM_GTK_CALENDAR_SHOW_DETAILS		= 1 << 5,
+  GLOM_GTK_CALENDAR_SHOW_DETAILS		= 1 << 5
 } GlomGtkCalendarDisplayOptions;
 
 /**
@@ -212,4 +212,4 @@
 
 #endif /* __GLOM_GTK_CALENDAR_H__ */
 
-#endif //!GTK_CHECK_VERSION(2.16.0)
+#endif /* !GTK_CHECK_VERSION(2.16.0) */