gnome-keyring r1363 - in trunk: . tool

[nnielsen svn gnome org]

Author: nnielsen
Date: Tue Nov  4 13:14:39 2008
New Revision: 1363
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1363&view=rev

Log:
	* configure.in:
	* tool/gkr-tool-import.c: Remove usage of deprecated gtk stuff.


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/tool/gkr-tool-import.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Nov  4 13:14:39 2008
@@ -82,7 +82,9 @@
 	    [Compile binaries in debug mode]))
 
 if test "$enable_debug" = "yes"; then
-  CFLAGS="$CFLAGS -g -O0 -Wall  -DG_DISABLE_DEPRECATED"
+  CFLAGS="$CFLAGS -g -O0 -Wall"
+  CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED"
+  CFLAGS="$CFLAGS -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
   AC_DEFINE_UNQUOTED(_DEBUG, 1, [In debug mode])
   echo "enabling debug compile mode"
   debug_status="yes"

Modified: trunk/tool/gkr-tool-import.c
==============================================================================
--- trunk/tool/gkr-tool-import.c	(original)
+++ trunk/tool/gkr-tool-import.c	Tue Nov  4 13:14:39 2008
@@ -140,6 +140,7 @@
 	GError *err = NULL;
 	GP11Object *import;
 	GP11Attributes *attrs;
+	gchar *basename;
 	gchar *data;
 	gsize n_data;
 	
@@ -155,7 +156,9 @@
 	gp11_attributes_add_boolean (attrs, CKA_TOKEN, FALSE);
 	gp11_attributes_add_ulong (attrs, CKA_CLASS, CKO_GNOME_IMPORT);
 	gp11_attributes_add_boolean (attrs, CKA_GNOME_IMPORT_TOKEN, TRUE);
-	gp11_attributes_add_string (attrs, CKA_GNOME_IMPORT_LABEL, g_basename (filename));
+	basename = g_path_get_basename (filename);
+	gp11_attributes_add_string (attrs, CKA_GNOME_IMPORT_LABEL, basename);
+	g_free (basename);
 	
 	import = gp11_session_create_object_full (session, attrs, NULL, &err);
 	gp11_attributes_unref (attrs);