head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.10
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.8
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.6
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.4
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.2
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.1.0.2
	pkgsrc-2008Q4-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2009.02.24.15.24.12;	author wiz;	state dead;
branches;
next	1.1;

1.1
date	2008.11.23.13.38.41;	author jmcneill;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update to 2.24.1, convert to user-destdir.

2009-02-15  Jeffrey Stedfast  <fejj@@novell.com>

	* configure.in: Bumped version to 2.24.1

	* src/manager.c: Changed all "import photos?" prompts to use the
	same gconf "don't ask again" key.
	(prompt_response_cb): Allow saving the result even if the response
	is GTK_RESPONSE_CANCEL. Fixes bug #557364.
	(gvm_prompt): Set a window icon. Fixes bug #515762.

	* gnome-volume-manager.schemas.in: Applied patch by Jerry Tan to
	default autophoto_command to `gthumb --import-photos`. Fixes bug
	#560735.

	* src/manager.c (gvm_console_kit_sesion_get_uid): ConsoleKit 0.3
	changed the return value from Int32 to UInt32 so check for either
	type. Based on a patch by Donnie Berkholz. Fixes bug #571872.

2008-09-23  Jeffrey Stedfast  <fejj@@novell.com>

	Based on the patch by Herbert Pötzl

	* src/manager.c (unmount_all): Don't unmount any volumes that have
	become marked with volume.ignore.
	(gvm_device_mounted): If a volume marked for ignore gets mounted,
	don't prompt the user for anything.
@
text
@$NetBSD: patch-ab,v 1.1 2008/11/23 13:38:41 jmcneill Exp $

--- src/manager.c.orig	2008-11-23 08:36:03.000000000 -0500
+++ src/manager.c
@@@@ -3931,11 +3931,6 @@@@ gvm_console_kit_session_get_uid (const c
 	dbus_message_unref (dmesg);
 	
 	dbus_message_iter_init (reply, &iter);
-	if (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_INT32) {
-		dbg ("Unrecognized response to ConsoleKit GetUnixUser request\n");
-		dbus_message_unref (reply);
-		return FALSE;
-	}
 	
 	dbus_message_iter_get_basic (&iter, uid);
 	
@


1.1
log
@Fix a bogus check on GetUnixUser response. Bump PKGREVISION
@
text
@d1 1
a1 1
$NetBSD$
@