[Xfce4-commits] <xfce4-session:master> Use the correct resource location function.

[Nick Schermer]

Updating branch refs/heads/master
         to c9c9dfcd9e0efe024eb2127abb7dfce0c053acab (commit)
       from 4bdc2e8717c272e83d540915555b4e125830ac53 (commit)

commit c9c9dfcd9e0efe024eb2127abb7dfce0c053acab
Author: Nick Schermer <nick at xfce.org>
Date:   Fri Apr 20 14:27:13 2012 +0200

    Use the correct resource location function.
    
    Other function returns null if the file is not found.

 configure.in.in              |    2 +-
 xfce4-session/xfsm-startup.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 5d51d5e..3387ddf 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -11,7 +11,7 @@ m4_define([xfsm_version_minor], [9])
 m4_define([xfsm_version_micro], [2])
 m4_define([xfsm_version_nano], []) dnl leave this empty to have no nano version
 m4_define([xfsm_version_build], [@REVISION@])
-m4_define([xfsm_version_tag], [git])
+m4_define([xfsm_version_tag], [])
 m4_define([xfsm_version], [xfsm_version_major().xfsm_version_minor().xfsm_version_micro()ifelse(xfsm_version_nano(), [], [], [.xfsm_version_nano()])ifelse(xfsm_version_tag(), [git], [xfsm_version_tag()-xfsm_version_build()], [xfsm_version_tag()])])
 
 m4_define([xfsm_debug_default], [ifelse(xfsm_version_tag(), [git], [full], [minimum])])
diff --git a/xfce4-session/xfsm-startup.c b/xfce4-session/xfsm-startup.c
index d5b54e8..80f644f 100644
--- a/xfce4-session/xfsm-startup.c
+++ b/xfce4-session/xfsm-startup.c
@@ -207,7 +207,7 @@ xfsm_startup_init (XfconfChannel *channel)
 
           if (g_strcmp0 (agent, "gpg-agent") == 0)
             {
-              envfile = xfce_resource_lookup (XFCE_RESOURCE_CACHE, "gpg-agent-info");
+              envfile = xfce_resource_save_location (XFCE_RESOURCE_CACHE, "gpg-agent-info", FALSE);
 
               if (ssh_agent_pid == NULL)
                 {