applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't redefine GNOMELOCALEDIR. Don't use a const char * to allocate and

Browse source 
2006-11-15  Kjartan Maraas  <kmaraas@gnome.org>

	* 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.
This commit is contained in:
Kjartan Maraas 2006-11-15 17:21:53 +00:00 • committed by Kjartan Maraas
parent c0fb2269f7
commit 422223acaf
3 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
typing-break/ChangeLog
View file

@ -1,3 +1,9 @@
2006-11-15 Kjartan Maraas <kmaraas@gnome.org>
* 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 <vuntz@gnome.org> 2006-07-25 Vincent Untz <vuntz@gnome.org>
* eggtrayicon.[ch]: kill * eggtrayicon.[ch]: kill

1
typing-break/Makefile.am
View file

@ -1,6 +1,5 @@
INCLUDES = \ INCLUDES = \
@GNOME_CFLAGS@ \ @GNOME_CFLAGS@ \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DIMAGEDIR=\"$(GNOMECC_PIXMAPS_DIR)\" -DIMAGEDIR=\"$(GNOMECC_PIXMAPS_DIR)\"
bin_PROGRAMS = gnome-typing-monitor bin_PROGRAMS = gnome-typing-monitor

4
typing-break/drw-break-window.c
View file

@ -422,7 +422,7 @@ postpone_entry_activate_cb (GtkWidget *entry,
DrwBreakWindow *window) DrwBreakWindow *window)
{ {
const gchar *str; const gchar *str;
const gchar *phrase; gchar *phrase;
GConfClient *client = gconf_client_get_default(); GConfClient *client = gconf_client_get_default();
str = gtk_entry_get_text (GTK_ENTRY (entry)); str = gtk_entry_get_text (GTK_ENTRY (entry));
@ -434,9 +434,11 @@ postpone_entry_activate_cb (GtkWidget *entry,
if (!strcmp (str, phrase)) { if (!strcmp (str, phrase)) {
g_signal_emit (window, signals[POSTPONE], 0, NULL); g_signal_emit (window, signals[POSTPONE], 0, NULL);
g_free (phrase);
return; return;
} }
g_free (phrase);
gtk_entry_set_text (GTK_ENTRY (entry), ""); gtk_entry_set_text (GTK_ENTRY (entry), "");
} }