Merge lp:~cristiklein/update-notifier/use-xdg-folders into lp:update-notifier/ubuntu

[Cristian Klein]

[Sebastian Geiger (lanoxx)]

Is there any particular reason why you put the files into XDG_USER_DATA instead of XDG_USER_CONFIG or XDG_USER_CACHE?

review: Needs Information

[Cristian Klein (cristiklein)]

> Is there any particular reason why you put the files into XDG_USER_DATA
> instead of XDG_USER_CONFIG or XDG_USER_CACHE?

Hello,

I used [1] to take this decision. If "hooks_seen" is deleted the user won't say "Damn, I will have to reconfigure all" and he doesn't say "It's bloody slow those days". So, by elimination, I assumed it is user data an should belong to XDG_USER_DATA.

Of course, I don't know the application too well, so I might be wrong.

Cristi.

[1] http://ploum.frimouvy.org/?207-modify-your-application-to-use-xdg-folders

[Sebastian Geiger (lanoxx)]

Hi Christian,

thanks for the reply. I used XDG_CONFIG_HOME now, since update-notifier regenerates the HOOKS_SEEN file if you delete it. So the only change for the user is, that he has to acknowledge the notify dialog if the file gets deleted.

The patches have now been merged into upstream from separate patches, see rev 589 through 591.

Cheers Sebastian

[Sebastian Geiger (lanoxx)]

Patches already in upstream.

review: Disapprove (obsolete)

[Cristian Klein (cristiklein)]

Hello,

Are you sure HOOKS_SEEN is CONFIG? IMHO, it doesn't trigger the "Damn, I will have to reconfigure all" reaction of the user. Could you please explain your choice?

Thanks,
Cristi.

[Sebastian Geiger (lanoxx)]

You can test it, simply but deleting the HOOKS_SEEN file and then manually starting update-notifier from the console. It will open a dialog telling you a few things you have to do, like restart Firefox, etc. and afterwards, after you close it, a new HOOKS_SEEN files is generated.

One more question, are the changes you made to INSTALL and config.h.in important? If yes, then we could send them as a separate patch to mvo.

P.S I will try to get Michael to put you name into the commit message, since most of my patch was inspired by your branch.

[Cristian Klein (cristiklein)]

Okey, your argument is good enough for me. :)

Regarding, INSTALL and config.h.in, these changes are most likely because I used a newer version of autoconf/make and should be ignored. Sorry for that, I should not have let these changes leak.

Thank you for your time.

[Sebastian Geiger (lanoxx)]

Not at all, its one bug less after all :)

=== modified file 'INSTALL'
--- INSTALL	2009-06-30 11:18:26 +0000
+++ INSTALL	2009-11-19 14:20:25 +0000
@@ -2,7 +2,7 @@
 *************************
 
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008 Free Software Foundation, Inc.
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
    This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
@@ -159,7 +159,7 @@
 CC is not installed, it is recommended to use the following options in
 order to use an ANSI C compiler:
 
-     ./configure CC="cc -Ae"
+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
@@ -174,6 +174,16 @@
 
      ./configure CC="cc -nodtk"
 
+   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+   On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'.  It is recommended to use the following options:
+
+     ./configure --prefix=/boot/common
+
 Specifying the System Type
 ==========================
 
@@ -189,7 +199,8 @@
 
 where SYSTEM can have one of these forms:
 
-     OS KERNEL-OS
+     OS
+     KERNEL-OS
 
    See the file `config.sub' for the possible values of each field.  If
 `config.sub' isn't included in this package, then this package doesn't

=== modified file 'config.h.in'
--- config.h.in	2006-04-03 16:11:00 +0000
+++ config.h.in	2009-11-19 14:20:25 +0000
@@ -63,6 +63,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 

=== modified file 'data/hooks.py'
--- data/hooks.py	2005-10-09 17:06:55 +0000
+++ data/hooks.py	2009-11-19 14:20:25 +0000
@@ -43,7 +43,8 @@
     def _readSeenFile(self):
         """ read the users config file that stores what hook files are
             already seen """
-        hooks_seen = user.home+"/.update-notifier/hooks_seen"
+        dataHome = os.getenv("XDG_DATA_HOME", os.path.join(user.home, '.local', 'share'))
+        hooks_seen = os.path.join(dataHome, 'update-notifier' , 'hooks_seen')
         if os.path.exists(hooks_seen):
             for line in open(hooks_seen):
                 filename, mtime, cmd_run = string.split(line)

=== modified file 'src/hooks.c'
--- src/hooks.c	2009-07-07 18:45:47 +0000
+++ src/hooks.c	2009-11-19 14:20:25 +0000
@@ -20,8 +20,8 @@
 #include "assert.h"
 
 
-/* relative to the home dir */
-#define HOOKS_SEEN ".update-notifier/hooks_seen"
+/* relative to the user data dir */
+#define HOOKS_SEEN "update-notifier/hooks_seen"
 
 /* used by e.g. the installer to mark stuff that's already done */
 #define GLOBAL_HOOKS_SEEN "/etc/update-notifier/hooks_seen"
@@ -127,7 +127,7 @@
    hf->mtime = hook_file_time(hf->filename);
 
    // write out the list of known files
-   gchar *filename = g_strdup_printf("%s/%s",g_get_home_dir(),HOOKS_SEEN);
+   gchar *filename = g_strdup_printf("%s/%s",g_get_user_data_dir(),HOOKS_SEEN);
    FILE *f = fopen(filename, "w");
    if(f==NULL) {
       g_warning("Something went wrong writing the users hook file");
@@ -783,7 +783,7 @@
    hook_read_seen_file(priv,GLOBAL_HOOKS_SEEN);
    
    // read user hook file
-   filename = g_strdup_printf("%s/%s", g_get_home_dir(),HOOKS_SEEN);
+   filename = g_strdup_printf("%s/%s", g_get_user_data_dir(),HOOKS_SEEN);
    hook_read_seen_file(priv,filename);
    g_free(filename);
 

=== modified file 'src/update-notifier.c'
--- src/update-notifier.c	2009-11-16 20:52:04 +0000
+++ src/update-notifier.c	2009-11-19 14:20:25 +0000
@@ -531,8 +531,8 @@
 	un = g_new0 (UpgradeNotifier, 1);
 
 	// check for .update-notifier dir and create if needed
-	gchar *dirname = g_strdup_printf("%s/.update-notifier",
-					 g_get_home_dir());
+	gchar *dirname = g_strdup_printf("%s/update-notifier",
+					 g_get_user_data_dir());
 	if(!g_file_test(dirname, G_FILE_TEST_IS_DIR))
 	   g_mkdir(dirname, 0700);
 	g_free(dirname);