Mercurial > gftp.yaz
changeset 447:35e70b328c96
2004-3-21 Brian Masney <masneyb@gftp.org>
* src/gtk/gftp-gtk.c - initialize the read/write color functions before
gftp is initialized
| author | masneyb |
|---|---|
| date | Sun, 21 Mar 2004 23:56:18 +0000 |
| parents | 15be10c741dc |
| children | 0f6d90057399 |
| files | ChangeLog src/gtk/gftp-gtk.c |
| diffstat | 2 files changed, 11 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Mar 21 16:09:53 2004 +0000 +++ b/ChangeLog Sun Mar 21 23:56:18 2004 +0000 @@ -1,4 +1,7 @@ 2004-3-21 Brian Masney <masneyb@gftp.org> + * src/gtk/gftp-gtk.c - initialize the read/write color functions before + gftp is initialized + * src/gtk/menu-items.c (chdir_edit) - ignore the number of items that are selected in the listbox @@ -2367,7 +2370,7 @@ * cvsclean - added this script - * *.[ch] - added $Id: ChangeLog,v 1.250 2004/03/21 13:27:00 masneyb Exp $ tags + * *.[ch] - added $Id: ChangeLog,v 1.251 2004/03/21 23:55:56 masneyb Exp $ tags * debian/* - updated files from Debian maintainer
--- a/src/gtk/gftp-gtk.c Sun Mar 21 16:09:53 2004 +0000 +++ b/src/gtk/gftp-gtk.c Sun Mar 21 23:56:18 2004 +0000 @@ -1191,6 +1191,7 @@ color->red = strtol (red, NULL, 16); color->green = strtol (green, NULL, 16); color->blue = strtol (blue, NULL, 16); + g_free (red); g_free (green); g_free (blue); @@ -1219,6 +1220,12 @@ { GtkWidget *window, *ui; + /* We override the read color functions because we are using a GdkColor + structures to store the color. If I put this in lib/config_file.c, then + the core library would be dependant on Gtk+ being present */ + gftp_option_types[gftp_option_type_color].read_function = gftp_gtk_config_file_read_color; + gftp_option_types[gftp_option_type_color].write_function = gftp_gtk_config_file_write_color; + gftpui_common_init (&argc, &argv, ftp_log); g_thread_init (NULL); @@ -1228,12 +1235,6 @@ graphic_hash_table = g_hash_table_new (string_hash_function, string_hash_compare); - - /* We override the read color functions because we are using a GdkColor - structures to store the color. If I put this in lib/config_file.c, then - the core library would be dependant on Gtk+ being present */ - gftp_option_types[gftp_option_type_color].read_function = gftp_gtk_config_file_read_color; - gftp_option_types[gftp_option_type_color].write_function = gftp_gtk_config_file_write_color; window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_signal_connect (GTK_OBJECT (window), "delete_event",