Dear Release Team, Please hint gnomebaker 0.6.0-6 (debdiff to 0.6.0-1 attached) for inclusion in Etch. It fixes bugs 399880,399225, 398364 and 401104. It also fixes a potential memory corruption in 64 architectures that has not been reported. Regards, -- Goedson Teixeira Paixao http://mundolivre.wordpress.com/ Smart Price S/A http://www.smartprice.com.br/ Jabber ID: goedson@jabber.org http://www.jabber.org/
diff -u gnomebaker-0.6.0/debian/changelog gnomebaker-0.6.0/debian/changelog
--- gnomebaker-0.6.0/debian/changelog
+++ gnomebaker-0.6.0/debian/changelog
@@ -1,3 +1,46 @@
+gnomebaker (0.6.0-6) unstable; urgency=low
+
+ * Updated the patch 17_fix_audio_file_filter to correctly unref
+ the gnome_vfs_file_info. This fixes a segfault that would happen when
+ the user started an audio project.
+
+ -- Goedson Teixeira Paixao <goedson@debian.org> Wed, 6 Dec 2006 19:51:49 -0200
+
+gnomebaker (0.6.0-5) unstable; urgency=low
+
+ * debian/patches/17_fix_audio_file_filter.dpatch: Use libgnomevfs to
+ detect the mime type of files. (Closes: #401104)
+
+ -- Goedson Teixeira Paixao <goedson@debian.org> Tue, 5 Dec 2006 21:21:46 -0200
+
+gnomebaker (0.6.0-4) unstable; urgency=low
+
+ * Added patch 16_fix_add_folder.dpatch: Fixes the project folder
+ creation (Closes: #398364).
+
+ -- Goedson Teixeira Paixao <goedson@debian.org> Sun, 3 Dec 2006 15:29:18 -0200
+
+gnomebaker (0.6.0-3) unstable; urgency=low
+
+ * debian/control: Added dependency on gstreamer0.10-plugins-base
+
+ -- Goedson Teixeira Paixao <goedson@debian.org> Sat, 2 Dec 2006 12:05:58 -0200
+
+gnomebaker (0.6.0-2) unstable; urgency=low
+
+ * progressdlg.c: use an array instead of a GHashTable for the
+ status_icons collection.
+ * debian/pathces/14_fix_device_selection.dpatch: Fixed the writer
+ device selection in presence of read only drives (Closes: #399225).
+ * debian/control:
+ - Added gstreamer0.10-plugins-good and gstreamer0.10-plugins-ugly to
+ dependencies (Closes: #399880).
+ - moved dvd+rw-tools and gstreamer0.10-ffmpeg from Recommends to Depends.
+ * debian/patches/15_fix_amd64_memory_corruption.dpatch: Fixes a potential
+ memory corruption in 64bit architectures.
+
+ -- Goedson Teixeira Paixao <goedson@debian.org> Fri, 24 Nov 2006 23:12:02 -0200
+
gnomebaker (0.6.0-1) unstable; urgency=low
* New upstream release
diff -u gnomebaker-0.6.0/debian/control gnomebaker-0.6.0/debian/control
--- gnomebaker-0.6.0/debian/control
+++ gnomebaker-0.6.0/debian/control
@@ -7,8 +7,7 @@
Package: gnomebaker
Architecture: any
-Depends: ${shlibs:Depends}, wodim, mkisofs, cdda2wav, cdrdao
-Recommends: dvd+rw-tools, gstreamer0.10-ffmpeg
+Depends: ${shlibs:Depends}, wodim, mkisofs, cdda2wav, cdrdao, gstreamer0.10-plugins-good, gstreamer0.10-plugins-ugly, dvd+rw-tools, gstreamer0.10-ffmpeg, gstreamer0.10-plugins-base
Description: application for CD/DVD creation in the GNOME desktop
Gnomebaker is an easy to use CD/DVD burner. Its current features include:
* Data and audio CD burning
diff -u gnomebaker-0.6.0/debian/patches/00list gnomebaker-0.6.0/debian/patches/00list
--- gnomebaker-0.6.0/debian/patches/00list
+++ gnomebaker-0.6.0/debian/patches/00list
@@ -12,0 +13,6 @@
+13_use_array_for_status_icons
+14_fix_device_selection
+15_fix_amd64_memory_corruption
+16_fix_add_folder
+17_fix_audio_file_filter
+#18_allow_deeper_trees
only in patch2:
unchanged:
--- gnomebaker-0.6.0.orig/debian/patches/14_fix_device_selection.dpatch
+++ gnomebaker-0.6.0/debian/patches/14_fix_device_selection.dpatch
@@ -0,0 +1,291 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 13_fix_device_selection.dpatch by Goedson Teixeira Paixao <goedson@debian.org>
+##
+## DP: Fix a bug in the writer device selection that would make
+## DP: gnomebaker use a device different from the one selected when
+## DP: there's a read only device installed in the system.
+
+@DPATCH@
+diff -urNad gnomebaker-0.6.0~/gnomebaker.glade gnomebaker-0.6.0/gnomebaker.glade
+--- gnomebaker-0.6.0~/gnomebaker.glade 2006-09-06 16:21:44.000000000 -0300
++++ gnomebaker-0.6.0/gnomebaker.glade 2006-11-24 23:16:16.000000000 -0200
+@@ -3262,7 +3262,7 @@
+ <property name="border_width">10</property>
+ <property name="visible">True</property>
+ <property name="n_rows">3</property>
+- <property name="n_columns">5</property>
++ <property name="n_columns">1</property>
+ <property name="homogeneous">False</property>
+ <property name="row_spacing">10</property>
+ <property name="column_spacing">10</property>
+@@ -3287,7 +3287,7 @@
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+- <property name="right_attach">5</property>
++ <property name="right_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="x_options">fill</property>
+@@ -3315,7 +3315,7 @@
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+- <property name="right_attach">5</property>
++ <property name="right_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">fill</property>
+@@ -3324,18 +3324,17 @@
+ </child>
+
+ <child>
+- <widget class="GtkOptionMenu" id="optmenWriter">
++ <widget class="GtkComboBox" id="cmbWriter">
+ <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="history">-1</property>
++ <property name="add_tearoffs">False</property>
++ <property name="focus_on_click">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+- <property name="right_attach">5</property>
++ <property name="right_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">fill</property>
+- <property name="y_options"></property>
+ </packing>
+ </child>
+ </widget>
+diff -urNad gnomebaker-0.6.0~/gnomebaker.gladep gnomebaker-0.6.0/gnomebaker.gladep
+--- gnomebaker-0.6.0~/gnomebaker.gladep 1969-12-31 21:00:00.000000000 -0300
++++ gnomebaker-0.6.0/gnomebaker.gladep 2006-11-24 23:16:16.000000000 -0200
+@@ -0,0 +1,7 @@
++<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
++<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd";>
++
++<glade-project>
++ <name></name>
++ <program_name></program_name>
++</glade-project>
+diff -urNad gnomebaker-0.6.0~/src/devices.c gnomebaker-0.6.0/src/devices.c
+--- gnomebaker-0.6.0~/src/devices.c 2006-11-24 23:16:16.000000000 -0200
++++ gnomebaker-0.6.0/src/devices.c 2006-11-24 23:18:22.000000000 -0200
+@@ -171,21 +171,16 @@
+
+
+ void
+-devices_populate_optionmenu(GtkWidget *option_menu, const gchar *device_key, const gboolean add_writers_only)
++devices_populate_combo_box(GtkComboBox *combo_box, const gchar *device_key, const gboolean add_writers_only)
+ {
+ GB_LOG_FUNC
+- g_return_if_fail(option_menu != NULL);
+- g_return_if_fail(device_key != NULL);
++ g_return_if_fail(device_key != NULL);
+
+ gchar *default_select = preferences_get_string(device_key);
+
+- GtkWidget *menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(option_menu));
+- if(menu != NULL)
+- gtk_widget_destroy(menu);
+- menu = gtk_menu_new();
+- gtk_widget_show(menu);
+-
+- gint index = 0, history = 0;
++ GtkListStore *model = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_INT);
++ GtkTreeIter iter;
++ gint index = 0, current_item = 0, active_item = 0;
+ GSList *devices = preferences_get_key_subkeys(GB_DEVICES_KEY);
+ GSList *item = devices;
+ for(; item != NULL; item = item->next)
+@@ -193,53 +188,62 @@
+ gchar *device_key = (gchar*)item->data;
+ gchar *device_name_key = g_strconcat(device_key, GB_DEVICE_NAME_LABEL, NULL);
+ gchar *device_name = preferences_get_string(device_name_key);
+- gchar *device_capabilities_key = g_strconcat(device_key, GB_DEVICE_CAPABILITIES_LABEL, NULL);
+- const gint capabilities = preferences_get_int(device_capabilities_key);
+- /* Check the capabilities of the device and make sure that, if we are only adding
+- * writers to the option menu, the device can actually write disks */
++ gchar *device_capabilities_key = g_strconcat(device_key, GB_DEVICE_CAPABILITIES_LABEL, NULL);
++ const gint capabilities = preferences_get_int(device_capabilities_key);
++ /* Check the capabilities of the device and make sure that, if we are only adding
++ * writers to the option menu, the device can actually write disks */
+ if(device_name != NULL && (!add_writers_only ||
+ (capabilities & DC_WRITE_CDR || capabilities & DC_WRITE_CDRW ||
+ capabilities & DC_WRITE_DVDR || capabilities & DC_WRITE_DVDRAM)))
+ {
+- GtkWidget *menu_item = gtk_menu_item_new_with_label(device_name);
+- gtk_widget_show(menu_item);
+- gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item);
+-
+- if(default_select != NULL)
++ gtk_list_store_append(model, &iter);
++ gtk_list_store_set(model, &iter, 0, device_name, 1, index, -1);
++
++ if(default_select != NULL)
+ {
+ gchar *device_key_id = g_strrstr(device_key, default_select);
+ if(device_key_id != NULL)
+- history = index;
++ active_item = current_item;
+ }
+ g_free(device_name);
++ current_item ++;
+ }
+-
+- g_free(device_capabilities_key);
++ g_free(device_capabilities_key);
+ g_free(device_key);
+ g_free(device_name_key);
+ ++index;
+ }
+
+ g_slist_free(devices);
+-
+- gtk_option_menu_set_menu(GTK_OPTION_MENU(option_menu), menu);
+- gtk_option_menu_set_history(GTK_OPTION_MENU(option_menu), history);
+-
+ g_free(default_select);
++ gtk_combo_box_set_model(combo_box, GTK_TREE_MODEL(model));
++ gtk_combo_box_set_active(combo_box, active_item);
++ g_object_unref(model);
++ GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
++ gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), renderer, TRUE);
++ gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), renderer,"text", 0, NULL);
++
+ }
+
+
+ void
+-devices_save_optionmenu(GtkOptionMenu *option_menu, const gchar *device_key)
++devices_save_combo_box(GtkComboBox *combo_box, const gchar *device_key)
+ {
+ GB_LOG_FUNC
+- g_return_if_fail(option_menu != NULL);
+- g_return_if_fail(device_key != NULL);
++ g_assert(combo_box != NULL);
++ g_assert(device_key != NULL);
+
+- gint index = gtk_option_menu_get_history(option_menu);
+- gchar *device = g_strdup_printf(GB_DEVICE_FORMAT, index + 1);
+- preferences_set_string(device_key, device);
+- g_free(device);
++ gint index;
++ GtkTreeIter iter;
++ GtkTreeModel *model = gtk_combo_box_get_model(combo_box);
++
++ if (gtk_combo_box_get_active_iter(combo_box, &iter))
++ {
++ gtk_tree_model_get(model, &iter, 1, &index, -1);
++ gchar *device = g_strdup_printf(GB_DEVICE_FORMAT, index + 1);
++ preferences_set_string(device_key, device);
++ g_free(device);
++ }
+ }
+
+
+diff -urNad gnomebaker-0.6.0~/src/devices.h gnomebaker-0.6.0/src/devices.h
+--- gnomebaker-0.6.0~/src/devices.h 2006-05-29 13:20:49.000000000 -0300
++++ gnomebaker-0.6.0/src/devices.h 2006-11-24 23:16:16.000000000 -0200
+@@ -38,14 +38,14 @@
+
+ gboolean devices_probe_busses();
+ gboolean devices_init();
+-void devices_populate_optionmenu(GtkWidget *option_menu, const gchar *default_select, const gboolean add_writers_only);
++void devices_populate_combo_box(GtkComboBox *option_menu, const gchar *default_select, const gboolean add_writers_only);
+ gchar *devices_get_device_config(const gchar *device_key, const gchar *device_item);
+ void devices_write_device_to_gconf(const gint device_number, const gchar *device_name,
+ const gchar *device_id, const gchar *device_node, const gchar *mount_point,
+ const gint capabilities);
+ gboolean devices_mount_device(const gchar *device_key, gchar* *mount_point);
+ void devices_unmount_device(const gchar *device_key);
+-void devices_save_optionmenu(GtkOptionMenu *option_menu, const gchar *device_key);
++void devices_save_combo_box(GtkComboBox *combo_box, const gchar *device_key);
+ gboolean devices_eject_disk(const gchar *device_key);
+ gint devices_prompt_for_disk(GtkWindow *parent, const gchar *device_key);
+ gint devices_prompt_for_blank_disk(GtkWindow *parent, const gchar *device_key);
+diff -urNad gnomebaker-0.6.0~/src/selectdevicedlg.c gnomebaker-0.6.0/src/selectdevicedlg.c
+--- gnomebaker-0.6.0~/src/selectdevicedlg.c 2006-05-29 13:20:49.000000000 -0300
++++ gnomebaker-0.6.0/src/selectdevicedlg.c 2006-11-24 23:16:16.000000000 -0200
+@@ -27,7 +27,7 @@
+
+
+ /* Select device dialog widget names */
+-static const gchar *const widget_select_writer = "optmenWriter";
++static const gchar *const widget_select_writer = "cmbWriter";
+ static const gchar *const widget_select_device_dlg = "selectDeviceDlg";
+
+ static GladeXML *selectdevicedlgdlg_xml = NULL;
+@@ -40,8 +40,8 @@
+ selectdevicedlgdlg_xml = glade_xml_new(glade_file, widget_select_device_dlg, NULL);
+ glade_xml_signal_autoconnect(selectdevicedlgdlg_xml);
+
+- GtkWidget *option_menu = glade_xml_get_widget(selectdevicedlgdlg_xml, widget_select_writer);
+- devices_populate_optionmenu(option_menu, GB_WRITER, TRUE);
++ GtkComboBox *combo_box = GTK_COMBO_BOX(glade_xml_get_widget(selectdevicedlgdlg_xml, widget_select_writer));
++ devices_populate_combo_box(combo_box, GB_WRITER, TRUE);
+
+ GtkWidget *dlg = glade_xml_get_widget(selectdevicedlgdlg_xml, widget_select_device_dlg);
+ gbcommon_center_window_on_parent(dlg);
+@@ -65,6 +65,6 @@
+ GB_LOG_FUNC
+ g_return_if_fail(selectdevicedlgdlg_xml != NULL);
+
+- GtkWidget *option_menu = glade_xml_get_widget(selectdevicedlgdlg_xml, widget_select_writer);
+- devices_save_optionmenu(GTK_OPTION_MENU(option_menu), GB_WRITER);
++ GtkComboBox *combo_box = GTK_COMBO_BOX(glade_xml_get_widget(selectdevicedlgdlg_xml, widget_select_writer));
++ devices_save_combo_box(combo_box, GB_WRITER);
+ }
+diff -urNad gnomebaker-0.6.0~/src/startdlg.c gnomebaker-0.6.0/src/startdlg.c
+--- gnomebaker-0.6.0~/src/startdlg.c 2006-08-30 20:41:15.000000000 -0300
++++ gnomebaker-0.6.0/src/startdlg.c 2006-11-24 23:16:16.000000000 -0200
+@@ -69,8 +69,8 @@
+ g_return_if_fail(user_data != NULL);
+
+ StartDlg *start_dlg = (StartDlg*)user_data;
+- devices_save_optionmenu(start_dlg->reader, GB_READER);
+- devices_save_optionmenu(start_dlg->writer, GB_WRITER);
++ devices_save_combo_box(start_dlg->reader, GB_READER);
++ devices_save_combo_box(start_dlg->writer, GB_WRITER);
+ const gint index = gtk_option_menu_get_history(start_dlg->write_speed);
+ if(index == 0)
+ preferences_set_int(start_dlg->dvdmode ? GB_DVDWRITE_SPEED : GB_CDWRITE_SPEED, 0);
+@@ -544,6 +544,7 @@
+ GB_LOG_FUNC
+
+ StartDlg *start_dlg = g_new0(StartDlg, 1);
++
+ start_dlg->dialog = GTK_DIALOG(gtk_dialog_new ());
+ gtk_window_set_default_size(GTK_WINDOW(start_dlg->dialog), 320, -1);
+ gtk_window_set_title(GTK_WINDOW(start_dlg->dialog), _(BurnTypeText[burn_type]));
+@@ -552,10 +553,10 @@
+ gtk_window_set_skip_taskbar_hint (GTK_WINDOW (start_dlg->dialog), TRUE);
+ gtk_dialog_set_has_separator (start_dlg->dialog, FALSE);
+
+- start_dlg->writer = GTK_OPTION_MENU(gtk_option_menu_new ());
+- devices_populate_optionmenu(GTK_WIDGET(start_dlg->writer), GB_WRITER, TRUE);
+- start_dlg->reader = GTK_OPTION_MENU(gtk_option_menu_new ());
+- devices_populate_optionmenu(GTK_WIDGET(start_dlg->reader), GB_READER, FALSE);
++ start_dlg->writer = GTK_COMBO_BOX(gtk_combo_box_new());
++ devices_populate_combo_box(start_dlg->writer, GB_WRITER, TRUE);
++ start_dlg->reader = GTK_COMBO_BOX(gtk_combo_box_new ());
++ devices_populate_combo_box(start_dlg->reader, GB_READER, FALSE);
+ start_dlg->write_speed = GTK_OPTION_MENU(gtk_option_menu_new ());
+ start_dlg->write_mode = GTK_OPTION_MENU(gtk_option_menu_new ());
+ start_dlg->dummy = startdlg_create_check_button(_("Dummy write"), GB_DUMMY);
+diff -urNad gnomebaker-0.6.0~/src/startdlg.h gnomebaker-0.6.0/src/startdlg.h
+--- gnomebaker-0.6.0~/src/startdlg.h 2006-05-29 19:00:41.000000000 -0300
++++ gnomebaker-0.6.0/src/startdlg.h 2006-11-24 23:16:16.000000000 -0200
+@@ -32,8 +32,8 @@
+ typedef struct
+ {
+ GtkDialog *dialog;
+- GtkOptionMenu *reader;
+- GtkOptionMenu *writer;
++ GtkComboBox *reader;
++ GtkComboBox *writer;
+ GtkOptionMenu *write_speed;
+ GtkOptionMenu *write_mode;
+ GtkCheckButton *dummy;
only in patch2:
unchanged:
--- gnomebaker-0.6.0.orig/debian/patches/18_allow_deeper_trees.dpatch
+++ gnomebaker-0.6.0/debian/patches/18_allow_deeper_trees.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 18_allow_deeper_trees.dpatch by <goedson@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad gnomebaker-0.6.0~/src/execfunctions.c gnomebaker-0.6.0/src/execfunctions.c
+--- gnomebaker-0.6.0~/src/execfunctions.c 2006-12-04 19:37:06.000000000 -0200
++++ gnomebaker-0.6.0/src/execfunctions.c 2006-12-04 19:38:48.000000000 -0200
+@@ -702,7 +702,7 @@
+ }
+
+ exec_cmd_add_arg(e, "-iso-level");
+- exec_cmd_add_arg(e, "3");
++ exec_cmd_add_arg(e, "4");
+ exec_cmd_add_arg(e, "-l"); /* allow 31 character iso9660 filenames */
+
+ if(preferences_get_bool(GB_ROCKRIDGE))
only in patch2:
unchanged:
--- gnomebaker-0.6.0.orig/debian/patches/16_fix_add_folder.dpatch
+++ gnomebaker-0.6.0/debian/patches/16_fix_add_folder.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 16_fix_directory_creation.dpatch by <goedson@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad gnomebaker-0.6.0~/src/dataproject.c gnomebaker-0.6.0/src/dataproject.c
+--- gnomebaker-0.6.0~/src/dataproject.c 2006-12-03 15:20:31.000000000 -0200
++++ gnomebaker-0.6.0/src/dataproject.c 2006-12-03 15:24:41.000000000 -0200
+@@ -1179,7 +1179,7 @@
+ gtk_tree_store_set(data_project->dataproject_compilation_store, &iter,
+ DATA_TREE_COL_ICON, icon, DATA_TREE_COL_FILE, _("New Folder"),
+ DATA_TREE_COL_SIZE, size, DATA_TREE_COL_HUMANSIZE, human_readable,
+- DATA_TREE_COL_PATH, "", DATA_TREE_COL_STATUS, 0L, -1);
++ DATA_TREE_COL_PATH, "", DATA_TREE_COL_STATUS, STATUS_IS_FOLDER, -1);
+
+ g_object_unref(icon);
+
only in patch2:
unchanged:
--- gnomebaker-0.6.0.orig/debian/patches/17_fix_audio_file_filter.dpatch
+++ gnomebaker-0.6.0/debian/patches/17_fix_audio_file_filter.dpatch
@@ -0,0 +1,46 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 17_initialize_gnomevfs.dpatch by Goedson Teixeira Paixao <goedson@debian.org>
+## and Thadeu Lima de Souza Cascardo <cascardo@minaslivre.org>
+##
+## DP: Use gnome vfs to detect file mime types.
+
+@DPATCH@
+diff -urNad gnomebaker-0.6.0~/src/gnomebaker.c gnomebaker-0.6.0/src/gnomebaker.c
+--- gnomebaker-0.6.0~/src/gnomebaker.c 2006-09-06 16:18:27.000000000 -0300
++++ gnomebaker-0.6.0/src/gnomebaker.c 2006-12-06 19:29:56.000000000 -0200
+@@ -170,7 +170,23 @@
+ gnomebaker_audio_file_filter(const GtkFileFilterInfo *filter_info, gpointer data)
+ {
+ GB_LOG_FUNC
+- return (media_get_plugin_status(filter_info->mime_type) == INSTALLED);
++ GnomeVFSFileInfo *file_info = NULL;
++ gboolean return_value = FALSE;
++
++ file_info = gnome_vfs_file_info_new();
++
++ g_return_val_if_fail(file_info != NULL, FALSE);
++
++ GnomeVFSResult gnome_vfs_result = gnome_vfs_get_file_info(filter_info->uri,
++ file_info,
++ GNOME_VFS_FILE_INFO_GET_MIME_TYPE);
++
++ if (gnome_vfs_result == GNOME_VFS_OK)
++ return_value = media_get_plugin_status(gnome_vfs_file_info_get_mime_type(file_info)) == INSTALLED;
++
++ gnome_vfs_file_info_unref(file_info);
++ return return_value;
++
+ }
+ #endif
+
+@@ -1150,8 +1166,8 @@
+ gtk_paned_pack2(GTK_PANED(vpane), tabs, TRUE, TRUE);
+
+ audio_filter = gtk_file_filter_new();
+- gtk_file_filter_add_custom(audio_filter, GTK_FILE_FILTER_MIME_TYPE,
+- gnomebaker_audio_file_filter, NULL, NULL);
++ gtk_file_filter_add_custom(audio_filter, GTK_FILE_FILTER_URI,
++ gnomebaker_audio_file_filter, NULL, NULL);
+ gtk_file_filter_set_name(audio_filter,_("Audio files"));
+
+ gtk_widget_hide(glade_xml_get_widget(xml, "separator4"));
only in patch2:
unchanged:
--- gnomebaker-0.6.0.orig/debian/patches/13_use_array_for_status_icons.dpatch
+++ gnomebaker-0.6.0/debian/patches/13_use_array_for_status_icons.dpatch
@@ -0,0 +1,60 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 13_use_array_for_status_icons.dpatch by <goedson@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad gnomebaker-0.6.0~/src/progressdlg.c gnomebaker-0.6.0/src/progressdlg.c
+--- gnomebaker-0.6.0~/src/progressdlg.c 2006-09-06 15:12:45.000000000 -0300
++++ gnomebaker-0.6.0/src/progressdlg.c 2006-11-22 14:36:27.000000000 -0200
+@@ -26,6 +26,9 @@
+ #include "media.h"
+ #include "gblibnotify.h"
+
++/* The number of icons for indication of the status */
++#define STATUS_ICONS_ARRAY_SIZE 14
++
+ /* Progress dialog glade widget names */
+ static const gchar *const widget_progdlg = "progDlg";
+ static const gchar *const widget_progdlg_progbar = "progressbar6";
+@@ -49,7 +52,7 @@
+ static gint number_of_execs = 0;
+ static gint current_exec = -1;
+ static GCallback close_function = NULL;
+-static GHashTable *status_icons = NULL;
++static GdkPixbuf **status_icons = NULL;
+ static gdouble approximation_interval = 0.0;
+ static gdouble approximation_fraction = 0.0;
+ static GTimer *timer = NULL;
+@@ -60,10 +63,10 @@
+ progressdlg_set_icon(const gint index)
+ {
+ GB_LOG_FUNC
+- g_return_if_fail(index >= 0 && index <= 13);
++ g_return_if_fail(index >= 0 && index <= STATUS_ICONS_ARRAY_SIZE - 1);
+
+ /*GB_TRACE("progressdlg_set_icon - using icon [%d]\n", index);*/
+- GdkPixbuf *icon = (GdkPixbuf*)g_hash_table_lookup(status_icons, (gpointer)index);
++ GdkPixbuf *icon = status_icons[index];
+ gtk_window_set_icon(parent_window, icon);
+ gtk_window_set_icon(progressdlg_get_window(), icon);
+ }
+@@ -113,14 +116,14 @@
+
+ if(status_icons == NULL)
+ {
+- status_icons = g_hash_table_new(g_direct_hash, g_direct_equal);
++ status_icons = (GdkPixbuf **) g_malloc(sizeof(GdkPixbuf*) * STATUS_ICONS_ARRAY_SIZE);
+ gint i = 0;
+- for(; i < 14; ++i)
++ for(; i < STATUS_ICONS_ARRAY_SIZE; ++i)
+ {
+ gchar *file_name = g_strdup_printf(IMAGEDIR"/state%.2d.png", i);
+ GB_TRACE("progressdlg_new - loading icon [%s]\n", file_name);
+ GdkPixbuf *icon = gdk_pixbuf_new_from_file(file_name, NULL);
+- g_hash_table_insert(status_icons, (gpointer)i, icon);
++ status_icons[i] = icon;
+ g_free(file_name);
+ }
+ }
only in patch2:
unchanged:
--- gnomebaker-0.6.0.orig/debian/patches/15_fix_amd64_memory_corruption.dpatch
+++ gnomebaker-0.6.0/debian/patches/15_fix_amd64_memory_corruption.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 15_fix_amd64_memory_corruption.dpatch by <goedson@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad gnomebaker-0.6.0~/src/execfunctions.c gnomebaker-0.6.0/src/execfunctions.c
+--- gnomebaker-0.6.0~/src/execfunctions.c 2006-11-24 16:12:17.000000000 -0200
++++ gnomebaker-0.6.0/src/execfunctions.c 2006-11-24 16:37:59.000000000 -0200
+@@ -33,7 +33,7 @@
+
+ static gint wodim_total_tracks_to_write = 1;
+ static gint wodim_first_track = -1;
+-static guint64 wodim_total_disk_bytes = 0;
++static long long unsigned int wodim_total_disk_bytes = 0;
+
+ static gint cdda2wav_total_tracks = -1;
+ static gint cdda2wav_total_tracks_read = 0;
Attachment:
signature.asc
Description: Esta =?ISO-8859-1?Q?=E9?= uma parte de mensagem assinada digitalmente