rpms/logjam/devel logjam-4.5.3-showloginhistory.patch, NONE, 1.1 logjam.spec, 1.47, 1.48

[Tom Callaway (spot)]

Author: spot

Update of /cvs/extras/rpms/logjam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14823/devel

Modified Files:
	logjam.spec 
Added Files:
	logjam-4.5.3-showloginhistory.patch 
Log Message:
add patch to make loginhistory display a configurable option

logjam-4.5.3-showloginhistory.patch:

--- NEW FILE logjam-4.5.3-showloginhistory.patch ---
diff -up logjam-4.5.3/src/conf.h.BAD logjam-4.5.3/src/conf.h
--- logjam-4.5.3/src/conf.h.BAD	2008-07-28 14:20:23.000000000 -0400
+++ logjam-4.5.3/src/conf.h	2008-07-28 14:21:08.000000000 -0400
@@ -59,6 +59,7 @@ typedef struct {
 	gboolean friends_hidestats;
 	gboolean allowmultipleinstances;
 	gboolean smartquotes;
+	gboolean showloginhistory;
 	gboolean showmeta[JAM_VIEW_META_COUNT];
 	gboolean start_in_dock;
 #endif /* HAVE_GTK */
diff -up logjam-4.5.3/src/conf_xml.c.BAD logjam-4.5.3/src/conf_xml.c
--- logjam-4.5.3/src/conf_xml.c.BAD	2008-07-28 14:19:17.000000000 -0400
+++ logjam-4.5.3/src/conf_xml.c	2008-07-28 14:20:16.000000000 -0400
@@ -191,6 +191,7 @@ parseoptions(Configuration *c, xmlDocPtr
 		READOPTION(friends_hidestats)
 		READOPTION(allowmultipleinstances)
 		READOPTION(smartquotes)
+		READOPTION(showloginhistory)
 
 		XML_GET_IF("showmeta", parseshowmeta(options, doc, node);)
 
@@ -335,6 +336,7 @@ writeoptions(Options *options, xmlNodePt
 	WRITEOPTION(friends_hidestats);
 	WRITEOPTION(allowmultipleinstances);
 	WRITEOPTION(smartquotes);
+	WRITEOPTION(showloginhistory);
 
 	writeshowmeta(options, node);
 #endif /* HAVE_GTK */
diff -up logjam-4.5.3/src/login.c.BAD logjam-4.5.3/src/login.c
--- logjam-4.5.3/src/login.c.BAD	2008-07-28 14:30:27.000000000 -0400
+++ logjam-4.5.3/src/login.c	2008-07-28 14:30:55.000000000 -0400
@@ -292,6 +292,9 @@ login_check_lastupdate(GtkWindow *parent
 	gboolean ret = TRUE;
 	JamAccount *acc = JAM_ACCOUNT(acclj);
 
+	if (!conf.options.showloginhistory)
+		return TRUE;
+
 	deltat = time(NULL) - acclj->lastupdate;
 	if (deltat < 2 * 7 * 24 * 60 * 60) /* two weeks. */
 		return TRUE;
diff -up logjam-4.5.3/src/settings.c.BAD logjam-4.5.3/src/settings.c
--- logjam-4.5.3/src/settings.c.BAD	2008-07-28 14:21:36.000000000 -0400
+++ logjam-4.5.3/src/settings.c	2008-07-28 14:24:59.000000000 -0400
@@ -80,6 +80,8 @@ static SettingsWidget settingswidgets[] 
 	{ "ui_spell_language", &conf.spell_language,
 		SW_TEXT, N_("Entry _language:") },
 #endif
+	{ "ui_showloginhistory", &conf.options.showloginhistory,
+		SW_TOGGLE, N_("Show login history (number of days since last login)") },
 	{ "ui_smartquotes", &conf.options.smartquotes,
 		SW_TOGGLE, N_("Automatically change _quotes to matching pairs") },
 	{ "ui_font", &conf.uifont,
@@ -430,6 +432,7 @@ uisettings(JamWin *jw) {
 	}
 #endif
 
+	groupedbox_pack(GROUPEDBOX(entry), sw_make("ui_showloginhistory"), TRUE);
 	groupedbox_pack(GROUPEDBOX(entry),
 			sw_make("ui_smartquotes"), FALSE);
 	


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- logjam.spec	28 Jul 2008 18:11:36 -0000	1.47
+++ logjam.spec	28 Jul 2008 18:45:42 -0000	1.48
@@ -38,6 +38,7 @@
 Patch18:	logjam-4.5.3-no_quit_when_docked.patch
 Patch19:	logjam-4.5.3-close_when_send.patch
 Patch20:	logjam-4.5.3-imageresize.patch
+Patch21:	logjam-4.5.3-showloginhistory.patch
 
 %description
 This is the new GTK2 client for LiveJournal (http://www.livejournal.com).
@@ -75,6 +76,7 @@
 %patch18 -p1 -b .no_quit_when_docked
 %patch19 -p1 -b .close_when_send
 %patch20 -p1 -b .imageresize
+%patch21 -p1 -b .showloginhistory
 
 %build
 touch NEWS README AUTHORS
@@ -123,6 +125,7 @@
 - fix docked behavior again (bz 447146)
 - fix config option to start in dock again (bz 445998)
 - fix patch8 to apply with fuzz=0
+- add patch to enable/disable "logged in since" history popup as config option
 
 * Tue Jul  1 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-24
 - fix ukranian translation (bz 447145)