Attachment #1082 for bug #1393

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 1393
Collapse All | Expand All

Lines 845-854 Link Here

(-)trinity-digikam-3.5.13.2/digikam/utilities/cameragui/gpcamera.cpp.ORI (+15 lines)
845		845
846	m_status = new GPStatus;	846	m_status = new GPStatus;
847		847
		848	#ifdef HAVE_GPHOTO25
848	errorCode = gp_camera_folder_put_file(d->camera,	849	errorCode = gp_camera_folder_put_file(d->camera,
849	TQFile::encodeName(folder),	850	TQFile::encodeName(folder),
		851	TQFile::encodeName(itemName),
		852	GP_FILE_TYPE_NORMAL,
850	cfile,	853	cfile,
851	m_status->context);	854	m_status->context);
		855	#else
		856	errorCode = gp_camera_folder_put_file(d->camera,
		857	TQFile::encodeName(folder),
		858	cfile,
		859	m_status->context);
		860	#endif
852	if (errorCode != GP_OK)	861	if (errorCode != GP_OK)
853	{	862	{
854	DDebug() << "Failed to upload item to camera!" << endl;	863	DDebug() << "Failed to upload item to camera!" << endl;
Lines 1108-1114 Link Here
1108	for (int i = 0 ; i < numPorts ; i++)	1117	for (int i = 0 ; i < numPorts ; i++)
1109	{	1118	{
1110	gp_port_info_list_get_info( list, i, &info );	1119	gp_port_info_list_get_info( list, i, &info );
		1120	#ifdef HAVE_GPHOTO25
		1121	char *xpath;
		1122	gp_port_info_get_name (info, &xpath);
		1123	plist.append(xpath);
		1124	#else
1111	plist.append( info.path );	1125	plist.append( info.path );
		1126	#endif
1112	}	1127	}
1113	}	1128	}
1114		1129

Lines 129-134 Link Here

(-)trinity-digikam-3.5.13.2/digikam/configure.in.in.ORI (+2 lines)
129	AC_PATH_PROG(GPHOTO_CONFIG,gphoto2-config)	129	AC_PATH_PROG(GPHOTO_CONFIG,gphoto2-config)
130	AC_PATH_PROG(GPHOTO_PORT_CONFIG,gphoto2-port-config)	130	AC_PATH_PROG(GPHOTO_PORT_CONFIG,gphoto2-port-config)
131	if test -n "${GPHOTO_CONFIG}"; then	131	if test -n "${GPHOTO_CONFIG}"; then
		132	GPHOTO_VERSION="`$GPHOTO_CONFIG --version`"
		133	case "${GPHOTO_VERSION}" in "libgphoto2 2.5"*) CXXFLAGS="$CXXFLAGS -DHAVE_GPHOTO25";; esac
132	GPHOTO_CFLAGS="`$GPHOTO_CONFIG --cflags`"	134	GPHOTO_CFLAGS="`$GPHOTO_CONFIG --cflags`"
133	AC_SUBST(GPHOTO_CFLAGS)	135	AC_SUBST(GPHOTO_CFLAGS)
134	LIB_GPHOTO="`$GPHOTO_CONFIG --libs` `$GPHOTO_PORT_CONFIG --libs`"	136	LIB_GPHOTO="`$GPHOTO_CONFIG --libs` `$GPHOTO_PORT_CONFIG --libs`"

Return to bug 1393