diff --git a/typing-break/ChangeLog b/typing-break/ChangeLog index 08beb316f..34c4abde4 100644 --- a/typing-break/ChangeLog +++ b/typing-break/ChangeLog @@ -1,3 +1,9 @@ +2006-11-15 Kjartan Maraas + + * Makefile.am: Don't redefine GNOMELOCALEDIR. + * drw-break-window.c: (postpone_entry_activate_cb): + Don't use a const char * to allocate and free strings. + 2006-07-25 Vincent Untz * eggtrayicon.[ch]: kill diff --git a/typing-break/Makefile.am b/typing-break/Makefile.am index ad5fe270c..83ce8a547 100644 --- a/typing-break/Makefile.am +++ b/typing-break/Makefile.am @@ -1,6 +1,5 @@ INCLUDES = \ @GNOME_CFLAGS@ \ - -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ -DIMAGEDIR=\"$(GNOMECC_PIXMAPS_DIR)\" bin_PROGRAMS = gnome-typing-monitor diff --git a/typing-break/drw-break-window.c b/typing-break/drw-break-window.c index 7f42d53c9..538eed49e 100644 --- a/typing-break/drw-break-window.c +++ b/typing-break/drw-break-window.c @@ -422,7 +422,7 @@ postpone_entry_activate_cb (GtkWidget *entry, DrwBreakWindow *window) { const gchar *str; - const gchar *phrase; + gchar *phrase; GConfClient *client = gconf_client_get_default(); str = gtk_entry_get_text (GTK_ENTRY (entry)); @@ -434,9 +434,11 @@ postpone_entry_activate_cb (GtkWidget *entry, if (!strcmp (str, phrase)) { g_signal_emit (window, signals[POSTPONE], 0, NULL); + g_free (phrase); return; } + g_free (phrase); gtk_entry_set_text (GTK_ENTRY (entry), ""); }