Revision: 1951
http://gtkpod.svn.sourceforge.net/gtkpod/?rev=1951&view=rev
Author: phantom_sf
Date: 2008-03-17 15:48:27 -0700 (Mon, 17 Mar 2008)
Log Message:
-----------
2008-03-17 P.G. Richardson <phantom_sf at users.sourceforge.net>
* src/display_photo.c
* src/misc_input.c
Fix for segfault in get_user_string function.
Modified Paths:
--------------
gtkpod/trunk/ChangeLog
gtkpod/trunk/src/display_photo.c
gtkpod/trunk/src/misc_input.c
Modified: gtkpod/trunk/ChangeLog
===================================================================
--- gtkpod/trunk/ChangeLog 2008-03-03 02:10:17 UTC (rev 1950)
+++ gtkpod/trunk/ChangeLog 2008-03-17 22:48:27 UTC (rev 1951)
@@ -1,3 +1,10 @@
+2008-03-17 P.G. Richardson <phantom_sf at users.sourceforge.net>
+
+ * src/display_photo.c
+ * src/misc_input.c
+
+ Fix for segfault in get_user_string function.
+
2007-12-18 Jorg Schuler <jcsjcs at users.sourceforge.net>
* src/mp4file.c
Modified: gtkpod/trunk/src/display_photo.c
===================================================================
--- gtkpod/trunk/src/display_photo.c 2008-03-03 02:10:17 UTC (rev 1950)
+++ gtkpod/trunk/src/display_photo.c 2008-03-17 22:48:27 UTC (rev 1951)
@@ -1209,8 +1209,8 @@
gchar *album_name = get_user_string (
_("New Photo Album"),
_("Please enter a name for the new photo album"),
+
FALSE,
NULL,
-
NULL,
NULL,
GTK_STOCK_ADD);
Modified: gtkpod/trunk/src/misc_input.c
===================================================================
--- gtkpod/trunk/src/misc_input.c 2008-03-03 02:10:17 UTC (rev 1950)
+++ gtkpod/trunk/src/misc_input.c 2008-03-17 22:48:27 UTC (rev 1951)
@@ -119,8 +119,9 @@
if (response == GTK_RESPONSE_OK)
{
result = gtk_editable_get_chars (GTK_EDITABLE (entry), 0, -1);
- /* get state of checkbox */
- if (checkb)
+
+ /* get state of checkbox only if opt_msg was non NULL */
+ if (opt_msg && checkb)
{
*opt_state = gtk_toggle_button_get_active
(GTK_TOGGLE_BUTTON (checkb));
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
