head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.154 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.152 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.150 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.148 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.146 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.144 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.142 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.140 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.138 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.136 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.134 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.132 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.130 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.128 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.126 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.124 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.122 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.120 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.118 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.116 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.114 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.112 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.110 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.106 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.86 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.108 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.104 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.102 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.100 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.98 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.96 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.94 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.92 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.90 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.88 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.84 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.82 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.80 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.78 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.76 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.74 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.72 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.70 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.68 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.66 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.64 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.62 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.60 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.58 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.56 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.54 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.52 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.50 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.48 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.46 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.44 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.42 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.40 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.38 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.36 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.34 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.32 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.30 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.28 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.26 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.24 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.22 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.20 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.18 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.16 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.14 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.12 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.10 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.8 pkgsrc-2008Q1:1.2.0.6 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.4 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.2 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.1.0.4 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.2 pkgsrc-2007Q1-base:1.1; locks; strict; comment @# @; 1.2 date 2007.08.19.10.53.19; author obache; state Exp; branches; next 1.1; 1.1 date 2007.01.30.16.33.59; author joerg; state Exp; branches; next ; desc @@ 1.2 log @Update gtkam to 0.1.14. Based on patch provided in PR 36317. gtkam 0.1.14 * fix make distcheck * misc bug fixes. * always show capture/capture preview menu. * updated various translations * changed for some important fixes in libgphoto2 @ text @$NetBSD: patch-ac,v 1.1 2007/01/30 16:33:59 joerg Exp $ --- src/gtkam-list.c.orig 2006-12-14 18:38:12.000000000 +0000 +++ src/gtkam-list.c @@@@ -966,6 +966,10 @@@@ gtkam_list_add_folder (GtkamList *list, g_return_if_fail (GTKAM_IS_LIST (list)); + result = gp_list_new(&flist); + if (result < GP_OK) + return; + s = gtkam_status_new (_("Listing files in folder '%s'..."), folder); g_signal_emit (G_OBJECT (list), signals[NEW_STATUS], 0, s); gp_list_new (&flist); @@@@ -978,6 +982,7 @@@@ gtkam_list_add_folder (GtkamList *list, if (camera->multi) gp_camera_exit (camera->camera, NULL); gtk_object_destroy (GTK_OBJECT (s)); + gp_list_unref(flist); return; default: if (camera->multi) @@@@ -987,6 +992,7 @@@@ gtkam_list_add_folder (GtkamList *list, "'%s'"), folder); gtk_widget_show (dialog); gtk_object_destroy (GTK_OBJECT (s)); + gp_list_unref(flist); return; } gtk_object_destroy (GTK_OBJECT (s)); @ 1.1 log @Fix build with new libgphoto2. Compile-tested only. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- src/gtkam-list.c.orig 2007-01-30 14:54:54.000000000 +0000 d5 1 a5 10 @@@@ -984,7 +984,7 @@@@ gtkam_list_add_folder (GtkamList *list, const gchar *folder) { GtkWidget *dialog, *s; - CameraList flist; + CameraList *flist; int result; const char *name; gint i; @@@@ -992,9 +992,13 @@@@ gtkam_list_add_folder (GtkamList *list, d15 2 a16 7 - result = gp_camera_folder_list_files (camera->camera, folder, &flist, + result = gp_camera_folder_list_files (camera->camera, folder, flist, GTKAM_STATUS (s)->context->context); switch (result) { case GP_OK: @@@@ -1002,6 +1006,7 @@@@ gtkam_list_add_folder (GtkamList *list, case GP_ERROR_CANCEL: a18 1 + gp_list_free(flist); d20 1 d23 2 a24 3 @@@@ -1010,20 +1015,23 @@@@ gtkam_list_add_folder (GtkamList *list, dialog = gtkam_error_new (result, GTKAM_STATUS (s)->context, NULL, _("Could not get file list for folder " a25 1 + gp_list_free(flist); d28 1 a31 16 - 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_free(flist); + if (camera->multi) gp_camera_exit (camera->camera, NULL); @