Revision: 1564
http://gtkpod.svn.sourceforge.net/gtkpod/?rev=1564&view=rev
Author: jcsjcs
Date: 2007-06-19 06:54:47 -0700 (Tue, 19 Jun 2007)
Log Message:
-----------
* src/ipod_init.c (gp_ipod_init_set_model): avoid segfault if
iPod model cannot be selected (possibly GTK+ or glade version
incompatibility?).
Modified Paths:
--------------
gtkpod/trunk/ChangeLog_detailed
gtkpod/trunk/src/ipod_init.c
Modified: gtkpod/trunk/ChangeLog_detailed
===================================================================
--- gtkpod/trunk/ChangeLog_detailed 2007-06-19 13:21:50 UTC (rev 1563)
+++ gtkpod/trunk/ChangeLog_detailed 2007-06-19 13:54:47 UTC (rev 1564)
@@ -8,6 +8,10 @@
* src/file.c: set mediatype to 'audiobook' for .mb4 files.
+ * src/ipod_init.c (gp_ipod_init_set_model): avoid segfault if
+ iPod model cannot be selected (possibly GTK+ or glade version
+ incompatibility?).
+
2007-06-18 P.G. Richardson <phantom_sf at users.sourceforge.net>
Bug fixes spotted by Daniele Forsi.
Modified: gtkpod/trunk/src/ipod_init.c
===================================================================
--- gtkpod/trunk/src/ipod_init.c 2007-06-19 13:21:50 UTC (rev 1563)
+++ gtkpod/trunk/src/ipod_init.c 2007-06-19 13:54:47 UTC (rev 1564)
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-11-25 00:50:21 jcs>
+/* Time-stamp: <2007-06-19 22:52:52 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -458,7 +458,11 @@
case GTK_RESPONSE_OK:
model = gtk_combo_box_get_active_text (
GTK_COMBO_BOX (GET_WIDGET (MODEL_COMBO)));
- if (strcmp (model, gettext(SELECT_OR_ENTER_YOUR_MODEL)) == 0)
+ if (!model)
+ {
+ gtkpod_warning (_("Could not determine the model you selected --
this could be a bug or incompatibilty in the GTK+ or glade library.\n\n"));
+ }
+ else if (strcmp (model, gettext(SELECT_OR_ENTER_YOUR_MODEL)) == 0)
{ /* User didn't choose a model */
g_free (model);
model = NULL;
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 DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
