GNOME.org
 

[monkey-bubble: 630/753] Some cleanup, and make the time reading/writing code be i18n correct (to a

commit ca28baef0f7d7234880f7cc45a0856ffc96e1937
Author: George Lebl <jirka 5z com>
Date:   Sun Aug 12 18:19:28 2001 +0000

    Some cleanup, and make the time reading/writing code be i18n correct (to a
    
    Sun Aug 12 11:22:03 2001  George Lebl <jirka 5z com>
    
    	* gnome-dateedit.[ch]: Some cleanup, and make the time
    	  reading/writing code be i18n correct (to a degree at least),
    	  also fix possible bad strftime use.
    
    	* gnome-entry.c: no comma after last enum element and unref
    	  the property bag in finalize
    
    	* gnome-font-picker.c: fix a possible crash and cleanup a bit of
    	  code

 libgnomeui/ChangeLog           |   12 +++
 libgnomeui/gnome-dateedit.c    |  178 +++++++++++++++++++++++++++++----------
 libgnomeui/gnome-entry.c       |    9 ++-
 libgnomeui/gnome-font-picker.c |   85 +++++++++++--------
 4 files changed, 200 insertions(+), 84 deletions(-)
---
diff --git a/libgnomeui/ChangeLog b/libgnomeui/ChangeLog
index 6ce4543..5f6885f 100644
--- a/libgnomeui/ChangeLog
+++ b/libgnomeui/ChangeLog
@@ -1,3 +1,15 @@
+Sun Aug 12 11:22:03 2001  George Lebl <jirka 5z com>
+
+	* gnome-dateedit.[ch]: Some cleanup, and make the time
+	  reading/writing code be i18n correct (to a degree at least),
+	  also fix possible bad strftime use.
+
+	* gnome-entry.c: no comma after last enum element and unref
+	  the property bag in finalize
+
+	* gnome-font-picker.c: fix a possible crash and cleanup a bit of
+	  code
+
 2001-08-11  Martin Baulig  <baulig suse de>
 
 	* gnome-geometry.[ch]: Moved to libgnome1compat/libgnomeui.
diff --git a/libgnomeui/gnome-dateedit.c b/libgnomeui/gnome-dateedit.c
index 6957481..c63871e 100644
--- a/libgnomeui/gnome-dateedit.c
+++ b/libgnomeui/gnome-dateedit.c
@@ -31,11 +31,11 @@
 #include <config.h>
 #include "gnome-macros.h"
 
+#include <time.h>
 #include <string.h>
 #include <stdlib.h> /* atoi */
 #include <ctype.h> /* isdigit */
 #include <stdio.h>
-#include <time.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 #include "gnome-dateedit.h"
@@ -95,6 +95,9 @@ static void gnome_date_edit_get_property    (GObject            *object,
 					  GValue             *value,
 					  GParamSpec         *pspec);
 
+/* to get around warnings */
+const char *strftime_date_format = "%x";
+
 /**
  * gnome_date_edit_get_type:
  *
@@ -115,13 +118,25 @@ hide_popup (GnomeDateEdit *gde)
 static void
 day_selected (GtkCalendar *calendar, GnomeDateEdit *gde)
 {
-	char buffer [40];
+	char buffer [256];
 	guint year, month, day;
+	struct tm mtm = {0};
 
 	gtk_calendar_get_date (calendar, &year, &month, &day);
 
-	/* FIXME: internationalize this - strftime()*/
-	g_snprintf (buffer, sizeof(buffer), "%d/%d/%d", month + 1, day, year);
+	mtm.tm_mday = day;
+	mtm.tm_mon = month - 1;
+	if (year > 1900)
+		mtm.tm_year = year - 1900;
+	else
+		mtm.tm_year = year;
+
+	if (strftime (buffer, sizeof (buffer),
+		      strftime_date_format, &mtm) == 0)
+		strcpy (buffer, "???");
+
+	/* FIXME: what about set time */
+
 	gtk_entry_set_text (GTK_ENTRY (gde->_priv->date_entry), buffer);
 	gtk_signal_emit (GTK_OBJECT (gde), date_edit_signals [DATE_CHANGED]);
 }
@@ -216,11 +231,30 @@ position_popup (GnomeDateEdit *gde)
 static void
 select_clicked (GtkWidget *widget, GnomeDateEdit *gde)
 {
-	struct tm mtm = {0};
+	const char *str;
+	GDate *date;
+
+	str = gtk_entry_get_text (GTK_ENTRY (gde->_priv->date_entry));
+
+	date = g_date_new ();
+	g_date_set_parse (date, str);
+
+	gtk_calendar_select_month (GTK_CALENDAR (gde->_priv->calendar),
+				   g_date_get_month (date),
+				   g_date_get_year (date));
+        gtk_calendar_select_day (GTK_CALENDAR (gde->_priv->calendar),
+				 g_date_get_day (date));
 
+	g_date_free (date);
+
+	/* FIXME: the preceeding needs further checking to see if it's correct,
+	 * the following is so utterly wrong that it doesn't even deserve to be
+	 * just commented out, but I didn't want to cut it right now */
+#if 0
+	struct tm mtm = {0};
         /* This code is pretty much just copied from gtk_date_edit_get_date */
       	sscanf (gtk_entry_get_text (GTK_ENTRY (gde->_priv->date_entry)), "%d/%d/%d",
-		&mtm.tm_mon, &mtm.tm_mday, &mtm.tm_year); /* FIXME: internationalize this - strptime()*/
+		&mtm.tm_mon, &mtm.tm_mday, &mtm.tm_year);
 
 	mtm.tm_mon = CLAMP (mtm.tm_mon, 1, 12);
 	mtm.tm_mday = CLAMP (mtm.tm_mday, 1, 31);
@@ -235,6 +269,7 @@ select_clicked (GtkWidget *widget, GnomeDateEdit *gde)
 
 	gtk_calendar_select_month (GTK_CALENDAR (gde->_priv->calendar), mtm.tm_mon, 1900 + mtm.tm_year);
         gtk_calendar_select_day (GTK_CALENDAR (gde->_priv->calendar), mtm.tm_mday);
+#endif
 
         position_popup (gde);
        
@@ -242,7 +277,6 @@ select_clicked (GtkWidget *widget, GnomeDateEdit *gde)
 	gtk_widget_grab_focus (gde->_priv->cal_popup);
 	gtk_grab_add (gde->_priv->cal_popup);
 
-
 	gdk_pointer_grab (gde->_priv->cal_popup->window, TRUE,
 			  (GDK_BUTTON_PRESS_MASK
 			   | GDK_BUTTON_RELEASE_MASK
@@ -263,9 +297,12 @@ set_time (GtkWidget *widget, hour_info_t *hit)
 }
 
 static void
-free_resources (GtkWidget *widget, hour_info_t *hit)
+free_resources (gpointer data)
 {
+	hour_info_t *hit = data;
+
 	g_free (hit->hour);
+	hit->hour = NULL;
 	g_free (hit);
 }
 
@@ -293,23 +330,30 @@ fill_time_popup (GtkWidget *widget, GnomeDateEdit *gde)
 
 		mtm->tm_hour = i;
 		mtm->tm_min  = 0;
-		hit = g_new (hour_info_t, 1);
-
-		if (gde->_priv->flags & GNOME_DATE_EDIT_24_HR)
-			strftime (buffer, sizeof (buffer), "%H:00", mtm);
-		else
-			strftime (buffer, sizeof (buffer), "%I:00 %p ", mtm);
-		hit->hour = g_strdup (buffer);
-		hit->gde  = gde;
 
+		if (gde->_priv->flags & GNOME_DATE_EDIT_24_HR) {
+			if (strftime (buffer, sizeof (buffer),
+				      "%H:00", mtm) == 0)
+				strcpy (buffer, "???");
+		} else {
+			if (strftime (buffer, sizeof (buffer),
+				      "%I:00 %p ", mtm) == 0)
+				strcpy (buffer, "???");
+		}
 		item = gtk_menu_item_new_with_label (buffer);
 		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
 #if 0
-		gtk_signal_connect (GTK_OBJECT (item), "activate",
-				    GTK_SIGNAL_FUNC (set_time), hit);
+		hit = g_new (hour_info_t, 1);
+		hit->hour = g_strdup (buffer);
+		hit->gde  = gde;
+		gtk_signal_connect_full (GTK_OBJECT (item), "activate",
+					 GTK_SIGNAL_FUNC (set_time),
+					 NULL,
+					 hit,
+					 free_resources,
+					 FALSE /*object*/,
+					 FALSE /*after*/);
 #endif
-		gtk_signal_connect (GTK_OBJECT (item), "destroy",
-				    GTK_SIGNAL_FUNC (free_resources), hit);
 		gtk_widget_show (item);
 
 		submenu = gtk_menu_new ();
@@ -318,20 +362,31 @@ fill_time_popup (GtkWidget *widget, GnomeDateEdit *gde)
 			GtkWidget *mins;
 
 			mtm->tm_min = j;
+
+			if (gde->_priv->flags & GNOME_DATE_EDIT_24_HR) {
+				if (strftime (buffer, sizeof (buffer),
+					      "%H:%M", mtm) == 0)
+					strcpy (buffer, "???");
+			} else {
+				if (strftime (buffer, sizeof (buffer),
+					      "%I:%M %p", mtm) == 0)
+					strcpy (buffer, "???");
+			}
+
+			mins = gtk_menu_item_new_with_label (buffer);
+			gtk_menu_shell_append (GTK_MENU_SHELL (submenu), mins);
+
 			hit = g_new (hour_info_t, 1);
-			if (gde->_priv->flags & GNOME_DATE_EDIT_24_HR)
-				strftime (buffer, sizeof (buffer), "%H:%M", mtm);
-			else
-				strftime (buffer, sizeof (buffer), "%I:%M %p", mtm);
 			hit->hour = g_strdup (buffer);
 			hit->gde  = gde;
+			gtk_signal_connect_full (GTK_OBJECT (mins), "activate",
+						 GTK_SIGNAL_FUNC (set_time),
+						 NULL,
+						 hit,
+						 free_resources,
+						 FALSE /*object*/,
+						 FALSE /*after*/);
 
-			mins = gtk_menu_item_new_with_label (buffer);
-			gtk_menu_shell_append (GTK_MENU_SHELL (submenu), mins);
-			gtk_signal_connect (GTK_OBJECT (mins), "activate",
-					    GTK_SIGNAL_FUNC (set_time), hit);
-			gtk_signal_connect (GTK_OBJECT (item), "destroy",
-					    GTK_SIGNAL_FUNC (free_resources), hit);
 			gtk_widget_show (mins);
 		}
 	}
@@ -578,17 +633,18 @@ gnome_date_edit_set_time (GnomeDateEdit *gde, time_t the_time)
 	mytm = localtime (&the_time);
 
 	/* Set the date */
-	g_snprintf (buffer, sizeof(buffer), "%d/%d/%d",
-		    mytm->tm_mon + 1,
-		    mytm->tm_mday,
-		    1900 + mytm->tm_year);
+	if (strftime (buffer, sizeof (buffer), strftime_date_format, mytm) == 0)
+		strcpy (buffer, "???");
 	gtk_entry_set_text (GTK_ENTRY (gde->_priv->date_entry), buffer);
 
 	/* Set the time */
-	if (gde->_priv->flags & GNOME_DATE_EDIT_24_HR)
-		strftime (buffer, sizeof (buffer), "%H:%M", mytm);
-	else
-		strftime (buffer, sizeof (buffer), "%I:%M %p", mytm);
+	if (gde->_priv->flags & GNOME_DATE_EDIT_24_HR) {
+		if (strftime (buffer, sizeof (buffer), "%H:%M", mytm) == 0)
+			strcpy (buffer, "???");
+	} else {
+		if (strftime (buffer, sizeof (buffer), "%I:%M %p", mytm) == 0)
+			strcpy (buffer, "???");
+	}
 	gtk_entry_set_text (GTK_ENTRY (gde->_priv->time_entry), buffer);
 }
 
@@ -769,14 +825,28 @@ time_t
 gnome_date_edit_get_time (GnomeDateEdit *gde)
 {
 	struct tm tm = {0};
-	char *str, *flags = NULL;
+	const char *str;
+	GDate *date;
 
 	/* Assert, because we're just hosed if it's NULL */
 	g_assert(gde != NULL);
 	g_assert(GNOME_IS_DATE_EDIT(gde));
 	
+	str = gtk_entry_get_text (GTK_ENTRY (gde->_priv->date_entry));
+
+	date = g_date_new ();
+	g_date_set_parse (date, str);
+
+	g_date_to_struct_tm (date, &tm);
+
+	g_date_free (date);
+
+	/* FIXME: the preceeding needs further checking to see if it's correct,
+	 * the following is so utterly wrong that it doesn't even deserve to be
+	 * just commented out, but I didn't want to cut it right now */
+#if 0
 	sscanf (gtk_entry_get_text (GTK_ENTRY (gde->_priv->date_entry)), "%d/%d/%d",
-		&tm.tm_mon, &tm.tm_mday, &tm.tm_year); /* FIXME: internationalize this - strptime()*/
+		&tm.tm_mon, &tm.tm_mday, &tm.tm_year);
 
 	tm.tm_mon = CLAMP (tm.tm_mon, 1, 12);
 	tm.tm_mday = CLAMP (tm.tm_mday, 1, 31);
@@ -789,11 +859,15 @@ gnome_date_edit_get_time (GnomeDateEdit *gde)
 	if (tm.tm_year >= 1900)
 		tm.tm_year -= 1900;
 
+#endif
+
 	if (gde->_priv->flags & GNOME_DATE_EDIT_SHOW_TIME) {
 		char *tokp, *temp;
+		char *string;
+		char *flags = NULL;
 
-		str = g_strdup (gtk_entry_get_text (GTK_ENTRY (gde->_priv->time_entry)));
-		temp = strtok_r (str, ": ", &tokp);
+		string = g_strdup (gtk_entry_get_text (GTK_ENTRY (gde->_priv->time_entry)));
+		temp = strtok_r (string, ": ", &tokp);
 		if (temp) {
 			tm.tm_hour = atoi (temp);
 			temp = strtok_r (NULL, ": ", &tokp);
@@ -810,13 +884,25 @@ gnome_date_edit_get_time (GnomeDateEdit *gde)
 			}
 		}
 
-		if (flags && (strcasecmp (flags, "PM") == 0)){
-			if (tm.tm_hour < 12)
-				tm.tm_hour += 12;
+		if (flags != NULL) {
+			char buf[256] = "";
+			struct tm pmtm = {0};
+
+			/* Get locale specific "PM", note that it
+			 * may not exist */
+			pmtm.tm_hour = 17; /* around tea time is always PM */
+			if (strftime (buf, sizeof (buf), "%p", &pmtm) == 0)
+				strcpy (buf, "");
+
+			if (g_strcasecmp (flags, buf) == 0 &&
+			    tm.tm_hour < 12)
+					tm.tm_hour += 12;
 		}
-		g_free (str);
+
+		g_free (string);
 	}
 
+	/* FIXME: Eeeeeeeeek! */
 	tm.tm_isdst = -1;
 
 	return mktime (&tm);
diff --git a/libgnomeui/gnome-entry.c b/libgnomeui/gnome-entry.c
index 4f3a80b..13e6e3e 100644
--- a/libgnomeui/gnome-entry.c
+++ b/libgnomeui/gnome-entry.c
@@ -67,7 +67,7 @@ enum {
     PROP_0,
 
     /* Construction properties */
-    PROP_IS_FILE_ENTRY,
+    PROP_IS_FILE_ENTRY
 };
 
 GType
@@ -243,12 +243,19 @@ static void
 gnome_entry_finalize (GObject *object)
 {
     GnomeEntry *gentry;
+    CORBA_Environment ev;
 
     g_return_if_fail (object != NULL);
     g_return_if_fail (GNOME_IS_ENTRY (object));
 
     gentry = GNOME_ENTRY (object);
 
+    if (gentry->_priv->pbag != CORBA_OBJECT_NIL) {
+	    CORBA_exception_init (&ev);
+	    Bonobo_Unknown_unref (gentry->_priv->pbag, &ev);
+	    CORBA_exception_free (&ev);
+    }
+
     g_free (gentry->_priv);
     gentry->_priv = NULL;
 
diff --git a/libgnomeui/gnome-font-picker.c b/libgnomeui/gnome-font-picker.c
index ae7ffd8..145d0f4 100644
--- a/libgnomeui/gnome-font-picker.c
+++ b/libgnomeui/gnome-font-picker.c
@@ -100,9 +100,8 @@ static void gnome_font_picker_dialog_destroy(GtkWidget *widget,
 /* Auxiliary functions */
 static GtkWidget *gnome_font_picker_create_inside(GnomeFontPicker *gfs);
 
-static void gnome_font_picker_font_extract_attr(gchar *font_name,
-						gchar *attr,
-						gint i);
+static char * gnome_font_picker_font_extract_attr(const gchar *font_name,
+						  gint i);
 static void gnome_font_picker_font_set_attr(gchar **font_name,
                                               const gchar *attr,
                                               gint i);
@@ -878,25 +877,30 @@ GtkWidget *gnome_font_picker_create_inside(GnomeFontPicker *gfp)
         
 } /* gnome_font_picker_create_inside */
 
-static void gnome_font_picker_font_extract_attr(gchar *font_name,
-						gchar *attr,
-						gint i)
+static char *
+gnome_font_picker_font_extract_attr (const gchar *font_name, gint i)
 {
-    gchar *pTmp;
-
-    /* Search paramether */
-    for (pTmp=font_name; *pTmp && i > 0; i--,pTmp++)
-        pTmp=(gchar *)strchr(pTmp,'-');
-
-    if (*pTmp!=0) {
-        while (*pTmp!='-' && *pTmp!=0) {
-            *attr=*pTmp;
-            attr++; pTmp++;
-        }
-        *attr=0;
-    }
-    else strcpy(attr, "Unknown");
+	const char *pTmp;
+	char *cstr;
+	GString *str = g_string_new (NULL);
+
+	/* Search paramether */
+	for (pTmp = font_name; *pTmp && i > 0; i--, pTmp++)
+		pTmp = (gchar *)strchr (pTmp, '-');
+
+	if (*pTmp != '\0') {
+		while (*pTmp != '-' && *pTmp != '\0') {
+			g_string_append_c (str, *pTmp);
+			pTmp++;
+		}
+	} else {
+		/* note: do not use strncpy, it sucks */
+		g_string_assign (str, _("Unknown"));
+	}
 
+	cstr = str->str;
+	g_string_free (str, FALSE);
+	return cstr;
 } /* gnome_font_picker_font_extract_attr */
 
 static void gnome_font_picker_font_set_attr(gchar **font_name,
@@ -966,25 +970,32 @@ static void gnome_font_picker_label_use_font_in_label  (GnomeFontPicker *gfp)
 
 static void gnome_font_picker_update_font_info(GnomeFontPicker *gfp)
 {
-    gchar *pTmp;
+	gchar *attr;
+	const char *font_name;
 
-    pTmp = g_strdup(gfp->_priv->font_name);
+	font_name = gfp->_priv->font_name;
 
-    /* Extract font name */
-    gnome_font_picker_font_extract_attr(gfp->_priv->font_name,pTmp,2);
-    *pTmp=toupper(*pTmp);
-    gtk_label_set_text(GTK_LABEL(gfp->font_label),pTmp);
+	/* Extract font name */
+	attr = gnome_font_picker_font_extract_attr (font_name, 2);
 
-    /* Extract font size */
-    if (gfp->_priv->show_size)
-    {
-        gnome_font_picker_font_extract_attr(gfp->_priv->font_name,pTmp,7);
-        gtk_label_set_text(GTK_LABEL(gfp->size_label),pTmp);
-    }
+	/* Locale safe toupper */
+	if (*attr >= 'a' && *attr <= 'z')
+		*attr += 'A' - 'a';
+
+	gtk_label_set_text (GTK_LABEL (gfp->font_label), attr);
+
+	g_free (attr);
+
+	/* Extract font size */
+	if (gfp->_priv->show_size) {
+		attr = gnome_font_picker_font_extract_attr (font_name, 7);
+
+		gtk_label_set_text (GTK_LABEL (gfp->size_label), attr);
+
+		g_free (attr);
+	}
+
+	if (gfp->_priv->use_font_in_label)
+		gnome_font_picker_label_use_font_in_label (gfp);
 
-    if (gfp->_priv->use_font_in_label)
-        gnome_font_picker_label_use_font_in_label(gfp);
-        
-    g_free(pTmp);
-    
 } /* gnome_font_picker_update_font_info */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]