[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/centericq/devel centericq-4.20.0-ljtags.patch, NONE, 1.1 centericq-quitask.patch, NONE, 1.1 centericq.spec, 1.23, 1.24



Author: awjb

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

Modified Files:
	centericq.spec 
Added Files:
	centericq-4.20.0-ljtags.patch centericq-quitask.patch 
Log Message:
- fix #183623: ask before quit
- fix #183625, #183626: fixes lj hook


centericq-4.20.0-ljtags.patch:

--- NEW FILE centericq-4.20.0-ljtags.patch ---
diff -ur centericq-4.20.0/src/hooks/ljhook.cc centericq-4.20.0.kad/src/hooks/ljhook.cc
--- centericq-4.20.0/src/hooks/ljhook.cc	2005-01-07 03:27:04.000000000 +0200
+++ centericq-4.20.0.kad/src/hooks/ljhook.cc	2005-09-22 22:00:22.000000000 +0300
@@ -266,6 +266,7 @@
 	    if(!m->field_empty("subject")) ev->addParam("subject", rusconv("ku", m->getfield("subject")));
 	    if(!m->field_empty("mood")) ev->addParam("prop_current_mood", rusconv("ku", m->getfield("mood")));
 	    if(!m->field_empty("music")) ev->addParam("prop_current_music", rusconv("ku", m->getfield("music")));
+	    if(!m->field_empty("taglist")) ev->addParam("prop_taglist", rusconv("ku", m->getfield("taglist")));
 	    if(!m->field_empty("picture")) ev->addParam("prop_picture_keyword", m->getfield("picture"));
 
 	    if(!m->field_empty("preformatted")) ev->addParam("prop_opt_preformatted", "1");
diff -ur centericq-4.20.0/src/icqdialogs.cc centericq-4.20.0.kad/src/icqdialogs.cc
--- centericq-4.20.0/src/icqdialogs.cc	2005-09-22 22:09:13.000000000 +0300
+++ centericq-4.20.0.kad/src/icqdialogs.cc	2005-09-22 22:08:32.000000000 +0300
@@ -1878,6 +1879,8 @@
 	svalues.push_back("usemask");
     }
 
+    ev->setfield("taglist", "");
+
     textwindow w(0, 0, sizeDlg.width, sizeDlg.height, conf.getcolor(cp_dialog_frame), TW_CENTERED);
     w.set_title(conf.getcolor(cp_dialog_highlight), _(" LiveJournal posting: attributes "));
     db.setwindow(&w, false);
@@ -1915,6 +1915,7 @@
 
 	t.addleaff(i, 0, 21, _(" Music : %s "), ev->getfield("music").c_str());
 	t.addleaff(i, 0, 22, _(" Picture : %s "), ev->getfield("picture").empty() ? _("(default)") : ev->getfield("picture").c_str());
+	t.addleaff(i, 0, 25, _(" Tags : %s "), ev->getfield("taglist").c_str());
 
 	i = t.addnode(_(" Options "));
 	t.addleaff(i, 0, 30, _(" Disable auto-formatting : %s "), stryesno(ev->getfield("preformatted") == "1"));
@@ -1940,6 +1941,7 @@
 		    case 21: LJP_STR("music", _("Currently playing: ")); break;
 		    case 22: LJP_LIST("picture", pictures, _("(default)")); break;
 		    case 23: LJP_STR("mood", _("Current mood: ")); break;
+		    case 25: LJP_STR("taglist", _("Tags for the entry: ")); break;
 		    case 30: LJP_BOOL("preformatted"); break;
 		    case 31: LJP_BOOL("noemail"); break;
 		    case 32: LJP_BOOL("nocomments"); break;

centericq-quitask.patch:

--- NEW FILE centericq-quitask.patch ---
--- centericq-4.21.0/src/icqconf.cc.askquit	2005-09-01 18:10:01.000000000 +0300
+++ centericq-4.21.0/src/icqconf.cc	2005-09-05 12:22:04.000000000 +0300
@@ -460,6 +460,7 @@ void icqconf::loadmainconfig() {
 	    if(param == "russian" || param == "convert") initmultiproto(cpconvert, buf, false); else
 	    if(param == "nobidi") setbidi(false); else
 	    if(param == "askaway") askaway = true; else
+	    if(param == "askquit") askquit = true; else
 	    if(param == "logtimestamps") logtimestamps = true; else
 	    if(param == "logonline") logonline = true; else
 	    if(param == "fromcharset") fromcharset = buf; else
@@ -548,6 +549,7 @@ void icqconf::save() {
 	    f << "tocharset\t" << tocharset << endl;
 
 	    if(!getbidi()) f << "nobidi" << endl;
+	    if(getaskquit()) f << "askquit" << endl;
 	    if(logtimestamps) f << "logtimestamps" << endl;
 	    if(logonline) f << "logonline" << endl;
 
@@ -895,6 +897,9 @@ void icqconf::getauto(int &away, int &na
 void icqconf::setquote(bool use) {
     quote = use;
 }
+void icqconf::setaskquit(bool faskquit) { 
+    askquit = faskquit; 
+} 
 
 void icqconf::setsockshost(const string &nsockshost) {
     int pos;
--- centericq-4.21.0/src/icqconf.h.askquit	2005-05-24 00:16:52.000000000 +0300
+++ centericq-4.21.0/src/icqconf.h	2005-09-05 12:24:28.000000000 +0300
@@ -137,6 +137,7 @@ class icqconf {
 
 	bool hideoffline, quote, savepwd, antispam, mailcheck,
 	    makelog, fenoughdiskspace, askaway, bidi, logtimestamps,
+	    askquit,
 	    logonline, emacs, proxyconnect, proxyssl, notitles, debug;
 
 	bool startoffline;
@@ -241,6 +242,9 @@ class icqconf {
 
 	bool getchatmode(protocolname pname);
 	void setchatmode(protocolname pname, bool fchatmode);
+	
+        bool getaskquit() const { return askquit; } 
+        void setaskquit(bool faskquit); 
 
 	bool getentersends(protocolname pname);
 	void setentersends(protocolname pname, bool fentersends);
--- centericq-4.21.0/src/icqdialogs.cc.askquit	2005-05-24 00:16:52.000000000 +0300
+++ centericq-4.21.0/src/icqdialogs.cc	2005-09-05 13:11:16.000000000 +0300
@@ -1100,6 +1100,7 @@ bool icqface::updateconf(icqconf::regsou
     bool makelog = conf.getmakelog();
     bool askaway = conf.getaskaway();
     bool bidi = conf.getbidi();
+    bool askquit = conf.getaskquit();
     bool emacs = conf.getemacs();
     bool proxyconnect = conf.getproxyconnect();
 
@@ -1183,6 +1184,7 @@ bool icqface::updateconf(icqconf::regsou
 	t.addleaff(i, 0, 20, _( " Enable bidirectional languages support : %s "), stryesno(bidi));
     #endif
 	t.addleaff(i, 0, 23, _(" Enable emacs bindings in text editor : %s "), stryesno(emacs));
+	t.addleaff(i, 0, 31, _(" Ask before quit : %s "), stryesno(askquit));
 
 	i = t.addnode(_(" Codepages conversion "));
 
@@ -1377,6 +1379,10 @@ bool icqface::updateconf(icqconf::regsou
 			break;
 		    case 30:
 			cm = (cm == icqconf::cmproto ? icqconf::cmstatus : icqconf::cmproto );
+			break;
+		    case 31:
+			askquit = !askquit;
+			break;
 		}
 		break;
 	    case 1:
@@ -1403,6 +1409,7 @@ bool icqface::updateconf(icqconf::regsou
 		}
 
 		conf.setbidi(bidi);
+		conf.setaskquit(askquit);
 		conf.setlogoptions(logtimestamps, logonline);
 
 		if(ptp) conf.setpeertopeer(ptpmin, ptpmax);
--- centericq-4.21.0/src/icqface.cc.askquit	2005-08-28 04:33:21.000000000 +0300
+++ centericq-4.21.0/src/icqface.cc	2005-09-05 12:22:04.000000000 +0300
@@ -3237,6 +3237,9 @@ int icqface::contactskeys(verticalmenu &
 	    break;
 
 	case key_quit:
+	    if (conf.getaskquit())
+		if(face.ask("Really Quit?", ASK_YES | ASK_NO, ASK_NO) == ASK_NO)
+		    break;
 	    face.extk = ACT_QUIT;
 	    break;


Index: centericq.spec
===================================================================
RCS file: /cvs/extras/rpms/centericq/devel/centericq.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- centericq.spec	1 Mar 2006 08:01:20 -0000	1.23
+++ centericq.spec	2 Mar 2006 21:47:47 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           centericq
 Version:        4.21.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 
 Summary:        Text mode menu- and window-driven IM
 
@@ -8,6 +8,7 @@
 License:        GPL
 URL:            http://konst.org.ua/centericq/
 Source0:        http://konst.org.ua/download/centericq-4.21.0.tar.bz2
+
 Patch0:         centericq-libyahoo.patch
 Patch1:         centericq-kkconsui.patch
 Patch2:         centericq-kkstrtext.patch
@@ -20,10 +21,20 @@
 # and see http://www.gentoo.org/security/en/glsa/glsa-200512-11.xml 
 # and redhat bugzilla #176451
 Patch6:         centericq-4.21.0-kkstrtext.patch
+
+## feature fixes
 # Fix libmsn 
 Patch100:       http://centericq.de/archive/contrib/patches/centericq-4.21.0.msn.patch
+# Fix ljhook
+Patch101:       http://www.crystalowl.net/patches/centericq-4.20.0-ljtags.patch
+Patch102:       centericq-ljtypo.patch
+
+## feature enh
 # improve utf8 handling
 Patch200:       centericq-ncursesw.patch
+# provided by Andy Shevchenko... will ask before quit
+Patch201:       centericq-quitask.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  krb5-devel
@@ -48,7 +59,10 @@
 %patch5 -p1
 %patch6 -p1
 %patch100 -p1
+%patch101 -p1
+%patch102 -p1
 %patch200 -p1
+%patch201 -p1
 aclocal
 autoconf
 automake
@@ -83,6 +97,11 @@
 %exclude %{_includedir}/msn
 
 %changelog
+* Thu Mar 02 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+4.21.0-7
+- fix #183623: ask before quit
+- fix #183625, #183626: fixes lj hook
+
 * Wed Mar 01 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 4.21.0-6
 - improve utf8 support


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]