diff options
Diffstat (limited to 'devel/liboobs/files')
| -rw-r--r-- | devel/liboobs/files/patch-src_oobs-group.c | 27 | ||||
| -rw-r--r-- | devel/liboobs/files/patch-src_oobs-user.c | 42 |
2 files changed, 18 insertions, 51 deletions
diff --git a/devel/liboobs/files/patch-src_oobs-group.c b/devel/liboobs/files/patch-src_oobs-group.c index 6abd8b711ddc..0a7384b90d9c 100644 --- a/devel/liboobs/files/patch-src_oobs-group.c +++ b/devel/liboobs/files/patch-src_oobs-group.c @@ -1,25 +1,10 @@ ---- oobs/oobs-group.c.orig Fri Sep 15 18:41:04 2006 -+++ oobs/oobs-group.c Tue Oct 31 23:12:40 2006 -@@ -18,7 +18,12 @@ - * Authors: Carlos Garnacho Parro <carlosg@gnome.org> - */ +--- oobs/oobs-group.c.orig 2010-01-11 13:34:52.000000000 -0500 ++++ oobs/oobs-group.c 2010-01-18 02:04:34.000000000 -0500 +@@ -21,6 +21,7 @@ -+#if defined(HAVE_CONFIG_H) -+#include <config.h> -+#endif -+ + #include <string.h> #include <glib-object.h> +#include <unistd.h> - #include "oobs-session.h" - #include "oobs-group.h" - #include "oobs-user.h" -@@ -27,7 +32,9 @@ - #include "oobs-groupsconfig-private.h" - #include "oobs-defines.h" - #include "utils.h" -+#ifdef HAVE_CRYPT_H - #include <crypt.h> -+#endif - - #define OOBS_GROUP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), OOBS_TYPE_GROUP, OobsGroupPrivate)) + #include <dbus/dbus.h> + #include "oobs-object-private.h" diff --git a/devel/liboobs/files/patch-src_oobs-user.c b/devel/liboobs/files/patch-src_oobs-user.c index 2096814ee3a6..a7215c4effbb 100644 --- a/devel/liboobs/files/patch-src_oobs-user.c +++ b/devel/liboobs/files/patch-src_oobs-user.c @@ -1,13 +1,9 @@ ---- oobs/oobs-user.c -+++ oobs/oobs-user.c -@@ -18,13 +18,28 @@ - * Authors: Carlos Garnacho Parro <carlosg@gnome.org> +--- oobs/oobs-user.c.orig 2010-01-31 17:36:52.000000000 +0000 ++++ oobs/oobs-user.c 2010-01-31 17:40:21.000000000 +0000 +@@ -19,13 +19,24 @@ + * Milan Bouchet-Valat <nalimilan@club.fr>. */ -+#if defined(HAVE_CONFIG_H) -+#include <config.h> -+#endif -+ +#ifdef __FreeBSD__ +# include <sys/param.h> +# if __FreeBSD_version >= 900007 @@ -22,42 +18,28 @@ #include <string.h> +#ifdef HAVE_CRYPT_H #include <crypt.h> --#include <utmp.h> +#endif +#ifdef HAVE_UTMPX_H -+#include <utmpx.h> + #include <utmpx.h> +#endif + #include "oobs-object-private.h" #include "oobs-usersconfig.h" - #include "oobs-user.h" -@@ -811,7 +826,8 @@ +@@ -1252,6 +1263,7 @@ oobs_user_set_locale (OobsUser *user, co gboolean oobs_user_get_active (OobsUser *user) { -- struct utmp *entry; +#ifdef HAVE_UTMPX_H -+ struct utmpx *entry; + struct utmpx *entry; const gchar *login; gboolean match = FALSE; - -@@ -819,14 +835,18 @@ - - login = oobs_user_get_login_name (user); - -- while (!match && (entry = getutent ()) != NULL) -+ setutxent (); -+ while (!match && (entry = getutxent ()) != NULL) - { - match = (entry->ut_type == USER_PROCESS && - strcmp (entry->ut_user, login) == 0); - } - - /* close utmp */ -- endutent (); -+ endutxent (); +@@ -1272,6 +1284,9 @@ oobs_user_get_active (OobsUser *user) + endutxent (); return match; +#else + return FALSE; +#endif } + + /** |