Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv6944/src
Modified Files:
fileselection.c prefs_window.c
Log Message:
* src/prefs_window.c (on_path_button_pressed): corrected
error when "Browse" button was pressed (current path
sometimes was not passed to fileselector)
* src/fileselection.c: avoid run-time warning.
Index: fileselection.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/fileselection.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- fileselection.c 12 Jun 2006 03:19:27 -0000 1.10
+++ fileselection.c 13 Jun 2006 15:25:09 -0000 1.11
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-05-22 23:19:00 jcs>
+/* Time-stamp: <2006-06-14 00:18:04 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users.sourceforge.net>
| Part of the gtkpod project.
@@ -415,7 +415,7 @@
*
* @opath: the current path to the script including command line
* arguments. May be NULL.
- * @fallback: default dir in case @key is not set.
+ * @fallback: default dir in case @opath is not set.
* @title: title of the file selection window.
* @additional_text: additional explanotary text to be displayed
*
@@ -456,8 +456,15 @@
/* get full path -- if the file cannot be found it can't be
* selected in the filechooser */
- fbuf = g_find_program_in_path (buf);
- g_free (buf);
+ if (buf)
+ {
+ fbuf = g_find_program_in_path (buf);
+ g_free (buf);
+ }
+ else
+ {
+ fbuf = NULL;
+ }
if (!fbuf)
{ /* set default */
Index: prefs_window.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs_window.c,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -d -r1.164 -r1.165
--- prefs_window.c 13 Jun 2006 14:59:22 -0000 1.164
+++ prefs_window.c 13 Jun 2006 15:25:09 -0000 1.165
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-06-13 23:56:46 jcs>
+/* Time-stamp: <2006-06-14 00:22:15 jcs>
|
| Copyright (C) 2002 Corey Donohoe <atmos at atmos.org>
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
@@ -181,6 +181,10 @@
g_return_if_fail (temp_prefs);
oldpath = temp_prefs_get_string (temp_prefs, path_key_names[i]);
+ if (!oldpath)
+ {
+ oldpath = prefs_get_string (path_key_names[i]);
+ }
switch (path_type[i])
{
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
