Revision: 2146
http://gtkpod.svn.sourceforge.net/gtkpod/?rev=2146&view=rev
Author: jcsjcs
Date: 2008-10-30 14:57:36 +0000 (Thu, 30 Oct 2008)
Log Message:
-----------
* src/file_export.c
data/gtkpod.glade: fix bug that prevented "export to file
system" mode from working. (glade-3 renamed yet another
widget)
Modified Paths:
--------------
gtkpod/trunk/ChangeLog
gtkpod/trunk/data/gtkpod.glade
gtkpod/trunk/src/file_export.c
Modified: gtkpod/trunk/ChangeLog
===================================================================
--- gtkpod/trunk/ChangeLog 2008-10-29 15:44:14 UTC (rev 2145)
+++ gtkpod/trunk/ChangeLog 2008-10-30 14:57:36 UTC (rev 2146)
@@ -1,5 +1,10 @@
+2008-10-30 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * src/file_export.c
+ data/gtkpod.glade: fix bug that prevented "export to file
+ system" mode from working. (glade-3 renamed yet another widget)
+
2008-10-29 Jorg Schuler <jcsjcs at users.sourceforge.net>
-
* src/prefs.c
src/prefsdlg.c
src/file_convert.c
Modified: gtkpod/trunk/data/gtkpod.glade
===================================================================
--- gtkpod/trunk/data/gtkpod.glade 2008-10-29 15:44:14 UTC (rev 2145)
+++ gtkpod/trunk/data/gtkpod.glade 2008-10-30 14:57:36 UTC (rev 2146)
@@ -3870,7 +3870,7 @@
<widget class="GtkWindow" id="export_playlist_file_options">
<property name="title" translatable="yes">window1</property>
<child>
- <widget class="GtkFrame" id="options_frame">
+ <widget class="GtkFrame" id="ep_options_frame">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
@@ -4098,7 +4098,7 @@
<widget class="GtkWindow" id="export_files_options">
<property name="title" translatable="yes">window1</property>
<child>
- <widget class="GtkFrame" id="options_frame1">
+ <widget class="GtkFrame" id="ef_options_frame">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
@@ -4179,13 +4179,13 @@
</packing>
</child>
<child>
- <widget class="GtkVBox" id="message_box">
+ <widget class="GtkVBox" id="ef_message_box">
<property name="visible">True</property>
<child>
<placeholder/>
</child>
<child>
- <widget class="GtkLabel" id="message">
+ <widget class="GtkLabel" id="ef_message">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="yalign">0</property>
@@ -4206,7 +4206,7 @@
<property
name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="shadow_type">GTK_SHADOW_IN</property>
<child>
- <widget class="GtkTextView" id="textview">
+ <widget class="GtkTextView" id="ef_textview">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="wrap_mode">GTK_WRAP_WORD</property>
Modified: gtkpod/trunk/src/file_export.c
===================================================================
--- gtkpod/trunk/src/file_export.c 2008-10-29 15:44:14 UTC (rev 2145)
+++ gtkpod/trunk/src/file_export.c 2008-10-30 14:57:36 UTC (rev 2146)
@@ -593,8 +593,8 @@
export_files_xml = gtkpod_xml_new (xml_file, "export_files_options");
win = gtkpod_xml_get_widget (export_files_xml, "export_files_options");
- options = gtkpod_xml_get_widget (export_files_xml, "options_frame");
- message_box = gtkpod_xml_get_widget (export_files_xml, "message_box");
+ options = gtkpod_xml_get_widget (export_files_xml, "ef_options_frame");
+ message_box = gtkpod_xml_get_widget (export_files_xml, "ef_message_box");
/* Information needed to clean up later */
fcd = g_malloc0 (sizeof (struct fcd));
@@ -619,9 +619,9 @@
{
GList *gl;
GtkWidget *label = gtkpod_xml_get_widget (export_files_xml,
- "message");
+ "ef_message");
GtkWidget *tv = gtkpod_xml_get_widget (export_files_xml,
- "textview");
+ "ef_textview");
GtkTextBuffer *tb = gtk_text_view_get_buffer (GTK_TEXT_VIEW(tv));
if (message) gtk_label_set_text (GTK_LABEL (label), message);
else gtk_widget_hide (label);
@@ -1094,7 +1094,7 @@
export_playlist_xml = gtkpod_xml_new (xml_file,
"export_playlist_file_options");
win = gtkpod_xml_get_widget (export_playlist_xml,
"export_playlist_file_options");
- options = gtkpod_xml_get_widget (export_playlist_xml, "options_frame");
+ options = gtkpod_xml_get_widget (export_playlist_xml, "ep_options_frame");
fcd->win_xml = export_playlist_xml;
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 the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
