Hi,
I uploaded an NMU of your package.
Please see this as help to get the package into a releaseable condition again.
Please find the used diff below.
Cheers,
Andi
diff -u gtkam-0.1.12/debian/changelog gtkam-0.1.12/debian/changelog
--- gtkam-0.1.12/debian/changelog
+++ gtkam-0.1.12/debian/changelog
@@ -1,3 +1,10 @@
+gtkam (0.1.12-2.4) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix the recent NMU. Thanks to Morita Sho. Closes: #430390
+
+ -- Andreas Barth <[EMAIL PROTECTED]> Mon, 30 Jul 2007 21:20:32 +0000
+
gtkam (0.1.12-2.3) unstable; urgency=low
* Non-maintainer upload.
diff -u gtkam-0.1.12/src/gtkam-chooser.c gtkam-0.1.12/src/gtkam-chooser.c
--- gtkam-0.1.12/src/gtkam-chooser.c
+++ gtkam-0.1.12/src/gtkam-chooser.c
@@ -434,19 +434,20 @@
status = gtkam_status_new (_("Detecting cameras..."));
gtkam_dialog_add_status (GTKAM_DIALOG (chooser), status);
+ gp_list_new (&list);
result = gp_abilities_list_detect (chooser->priv->al,
- chooser->priv->il, &list,
+ chooser->priv->il, list,
GTKAM_STATUS (status)->context->context);
switch (result) {
case GP_OK:
- if (!gp_list_count (&list)) {
+ if (!gp_list_count (list)) {
d = gtkam_close_new (_("No cameras detected."));
gtk_window_set_transient_for (GTK_WINDOW (d),
GTK_WINDOW (chooser));
gtk_widget_show (d);
} else {
/* FIXME: Let user choose from the list */
- gp_list_get_name (&list, 0, &name);
+ gp_list_get_name (list, 0, &name);
gtk_entry_set_text (chooser->priv->entry_model, name);
gtk_entry_set_text (chooser->priv->entry_port,
"Universal Serial Bus (usb:)");
@@ -461,6 +462,7 @@
gtk_widget_show (d);
break;
}
+ gp_list_unref (list);
gtk_object_destroy (GTK_OBJECT (status));
}
diff -u gtkam-0.1.12/src/gtkam-delete.c gtkam-0.1.12/src/gtkam-delete.c
--- gtkam-0.1.12/src/gtkam-delete.c
+++ gtkam-0.1.12/src/gtkam-delete.c
@@ -179,7 +179,8 @@
gtk_widget_show (s);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (delete)->vbox), s,
FALSE, FALSE, 0);
- r1 = gp_camera_folder_list_files (camera->camera, folder, &l1, NULL);
+ gp_list_new (&l1);
+ r1 = gp_camera_folder_list_files (camera->camera, folder, l1, NULL);
result = gp_camera_folder_delete_all (camera->camera, folder,
GTKAM_STATUS (s)->context->context);
switch (result) {
@@ -200,13 +201,14 @@
gtk_widget_show (d);
gtk_object_destroy (GTK_OBJECT (s));
+ gp_list_new (&l2);
/* See what files have been deleted */
r2 = gp_camera_folder_list_files (camera->camera, folder,
- &l2, NULL);
+ l2, NULL);
if ((r1 == GP_OK) && (r2 == GP_OK)) {
- for (r1 = 0; r1 < gp_list_count (&l1); r1++) {
- gp_list_get_name (&l1, r1, &name);
- if (gp_list_lookup_name (&l2, name) >= 0) {
+ for (r1 = 0; r1 < gp_list_count (l1); r1++) {
+ gp_list_get_name (l1, r1, &name);
+ if (gp_list_lookup_name (l2, name) >= 0) {
fdd.camera = camera;
fdd.folder = folder;
fdd.name = name;
@@ -216,8 +218,10 @@
}
}
}
+ gp_list_unref (l2);
return (FALSE);
}
+ gp_list_unref (l1);
}
static gboolean
diff -u gtkam-0.1.12/src/gtkam-list.c gtkam-0.1.12/src/gtkam-list.c
--- gtkam-0.1.12/src/gtkam-list.c
+++ gtkam-0.1.12/src/gtkam-list.c
@@ -994,7 +994,8 @@
s = gtkam_status_new (_("Listing files in folder '%s'..."), folder);
g_signal_emit (G_OBJECT (list), signals[NEW_STATUS], 0, s);
- result = gp_camera_folder_list_files (camera->camera, folder, &flist,
+ gp_list_new (&flist);
+ result = gp_camera_folder_list_files (camera->camera, folder, flist,
GTKAM_STATUS (s)->context->context);
switch (result) {
case GP_OK:
@@ -1016,13 +1017,14 @@
}
gtk_object_destroy (GTK_OBJECT (s));
- for (i = 0; i < gp_list_count (&flist); i++) {
- gp_list_get_name (&flist, i, &name);
+ for (i = 0; i < gp_list_count (flist); i++) {
+ gp_list_get_name (flist, i, &name);
gtk_list_store_append (list->priv->store, &iter);
gtk_list_store_set (list->priv->store, &iter,
NAME_COLUMN, name, FOLDER_COLUMN, folder,
CAMERA_COLUMN, camera, IS_EDITABLE_COLUMN, TRUE, -1);
}
+ gp_list_unref (flist);
if (camera->multi)
gp_camera_exit (camera->camera, NULL);
--
http://home.arcor.de/andreas-barth/
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
