Hello community, here is the log from the commit of package licq checked in at Thu Aug 10 22:58:35 CEST 2006. -------- --- KDE/licq/licq.changes 2006-08-07 21:34:32.000000000 +0200 +++ licq/licq.changes 2006-08-10 19:42:59.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Aug 10 19:41:03 CEST 2006 - lmichnovic@suse.cz + +- update from svn + should fix auto away even when offline +- fix offline status to others issue (invisible_to_others.patch) + +------------------------------------------------------------------- Old: ---- licq-20060807-bool.patch licq-20060807-datetime.patch licq-20060807-declaration.patch licq-20060807-fakeoffline_error.patch licq-20060807-nostrip.patch licq-20060807-two_desktop_files.patch licq-20060807-userinfodlg.patch licq-20060807-viewurl.patch licq-20060807.tar.bz2 New: ---- licq-20060810-bool.patch licq-20060810-datetime.patch licq-20060810-declaration.patch licq-20060810-fakeoffline_error.patch licq-20060810-invisible_to_others.patch licq-20060810-nostrip.patch licq-20060810-two_desktop_files.patch licq-20060810-userinfodlg.patch licq-20060810-viewurl.patch licq-20060810.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ licq.spec ++++++ --- /var/tmp/diff_new_pack.sw8y4U/_old 2006-08-10 22:57:45.000000000 +0200 +++ /var/tmp/diff_new_pack.sw8y4U/_new 2006-08-10 22:57:45.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package licq (Version 20060807) +# spec file for package licq (Version 20060810) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -20,7 +20,7 @@ License: GPL Group: Productivity/Networking/ICQ Autoreqprov: on -Version: 20060807 +Version: 20060810 Release: 1 Summary: Linux ICQ Client Source: %{name}-%{version}.tar.bz2 @@ -35,6 +35,7 @@ Patch8: %{name}-%{version}-viewurl.patch Patch9: %{name}-%{version}-two_desktop_files.patch Patch10: %{name}-%{version}-fakeoffline_error.patch +Patch11: %{name}-%{version}-invisible_to_others.patch Patch20: icqnd-0.1.9.5-cast_on_64bit.patch URL: http://www.licq.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -85,6 +86,7 @@ %patch8 %patch9 %patch10 +%patch11 #patches for icqnd %patch20 @@ -258,6 +260,10 @@ /usr/share/licq/icqnd %changelog -n licq +* Thu Aug 10 2006 - lmichnovic@suse.cz +- update from svn + should fix auto away even when offline +- fix offline status to others issue (invisible_to_others.patch) * Mon Aug 07 2006 - lmichnovic@suse.cz - update from svn - fixes qpl only licence in two files [#192081] ++++++ licq-20060807-bool.patch -> licq-20060810-bool.patch ++++++ ++++++ licq-20060807-datetime.patch -> licq-20060810-datetime.patch ++++++ ++++++ licq-20060807-declaration.patch -> licq-20060810-declaration.patch ++++++ ++++++ licq-20060807-fakeoffline_error.patch -> licq-20060810-fakeoffline_error.patch ++++++ ++++++ licq-20060810-invisible_to_others.patch ++++++ --- src/icqd-srv.cpp +++ src/icqd-srv.cpp @@ -2343,23 +2343,6 @@ p = new CPU_CapabilitySettings(); SendEvent_Server(p); - icqSetStatus(m_nDesiredStatus); - - gLog.Info(tr("%sSending client ready...\n"), L_SRVxSTR); - p = new CPU_ClientReady(); - SendEvent_Server(p); - - gLog.Info(tr("%sSending offline message request...\n"), L_SRVxSTR); - p = new CPU_RequestSysMsg; - SendEvent_Server(p); - - m_eStatus = STATUS_ONLINE; - m_bLoggingOn = false; - // ### FIX subsequence !! - ICQEvent *e = DoneExtendedServerEvent(0, EVENT_SUCCESS); - if (e != NULL) ProcessDoneEvent(e); - PushPluginSignal(new CICQSignal(SIGNAL_LOGON, 0, 0)); - break; } @@ -4466,10 +4449,29 @@ switch (nSubtype) { case ICQ_SNACxBOS_RIGHTSxGRANTED: + { gLog.Info(tr("%sReceived BOS rights.\n"), L_SRVxSTR); + + icqSetStatus(m_nDesiredStatus); + + gLog.Info(tr("%sSending client ready...\n"), L_SRVxSTR); + CSrvPacketTcp *p = new CPU_ClientReady(); + SendEvent_Server(p); + + gLog.Info(tr("%sSending offline message request...\n"), L_SRVxSTR); + p = new CPU_RequestSysMsg; + SendEvent_Server(p); + + m_eStatus = STATUS_ONLINE; + m_bLoggingOn = false; + // ### FIX subsequence !! + ICQEvent *e = DoneExtendedServerEvent(0, EVENT_SUCCESS); + if (e != NULL) ProcessDoneEvent(e); + PushPluginSignal(new CICQSignal(SIGNAL_LOGON, 0, 0)); + //icqSetStatus(m_nDesiredStatus); break; - + } default: gLog.Warn(tr("%sUnknown BOS Family Subtype: %04hx\n"), L_SRVxSTR, nSubtype); break; ++++++ licq-20060807-nostrip.patch -> licq-20060810-nostrip.patch ++++++ ++++++ licq-20060807-two_desktop_files.patch -> licq-20060810-two_desktop_files.patch ++++++ ++++++ licq-20060807-userinfodlg.patch -> licq-20060810-userinfodlg.patch ++++++ ++++++ licq-20060807-viewurl.patch -> licq-20060810-viewurl.patch ++++++ ++++++ licq-20060807.tar.bz2 -> licq-20060810.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/licq-20060807/plugins/qt-gui/src/mainwin.cpp new/licq-20060810/plugins/qt-gui/src/mainwin.cpp --- old/licq-20060807/plugins/qt-gui/src/mainwin.cpp 2006-08-07 19:48:39.000000000 +0200 +++ new/licq-20060810/plugins/qt-gui/src/mainwin.cpp 2006-08-10 11:40:19.000000000 +0200 @@ -469,12 +469,14 @@ licqConf.ReadStr("ChatBackground", szTemp, "white"); m_colorChatBkg = QColor(szTemp); - licqConf.ReadBool("showPopEmail",m_bPopEmail, false); - licqConf.ReadBool("showPopPhone",m_bPopPhone, true); - licqConf.ReadBool("showPopFax",m_bPopFax, false); - licqConf.ReadBool("showPopCellular",m_bPopCellular, true); - licqConf.ReadBool("showPopIP",m_bPopIP, false); - licqConf.ReadBool("showPopLastOnelin",m_bPopLastOnline, false); + licqConf.ReadBool("showPopAlias", m_bPopAlias, false); + licqConf.ReadBool("showPopName", m_bPopName, false); + licqConf.ReadBool("showPopEmail", m_bPopEmail, false); + licqConf.ReadBool("showPopPhone", m_bPopPhone, true); + licqConf.ReadBool("showPopFax", m_bPopFax, false); + licqConf.ReadBool("showPopCellular", m_bPopCellular, true); + licqConf.ReadBool("showPopIP", m_bPopIP, false); + licqConf.ReadBool("showPopLastOnelin", m_bPopLastOnline, false); licqConf.ReadBool("showPopOnlineSince", m_bPopOnlineSince, false); licqConf.ReadBool("showPopIdleTime", m_bPopIdleTime, true); licqConf.ReadBool("showPopID", m_bPopID, true); @@ -3675,12 +3677,14 @@ licqConf.WriteStr("TabOnTypingColor", m_colorTabTyping.name()); licqConf.WriteStr("ChatBackground", m_colorChatBkg.name()); - licqConf.WriteBool("showPopEmail",m_bPopEmail); - licqConf.WriteBool("showPopPhone",m_bPopPhone); - licqConf.WriteBool("showPopFax",m_bPopFax); - licqConf.WriteBool("showPopCellular",m_bPopCellular); - licqConf.WriteBool("showPopIP",m_bPopIP); - licqConf.WriteBool("showPopLastOnelin",m_bPopLastOnline); + licqConf.WriteBool("showPopAlias", m_bPopAlias); + licqConf.WriteBool("showPopName", m_bPopName); + licqConf.WriteBool("showPopEmail", m_bPopEmail); + licqConf.WriteBool("showPopPhone", m_bPopPhone); + licqConf.WriteBool("showPopFax", m_bPopFax); + licqConf.WriteBool("showPopCellular", m_bPopCellular); + licqConf.WriteBool("showPopIP", m_bPopIP); + licqConf.WriteBool("showPopLastOnelin", m_bPopLastOnline); licqConf.WriteBool("showPopOnlineSince", m_bPopOnlineSince); licqConf.WriteBool("showPopIdleTime", m_bPopIdleTime); licqConf.WriteBool("showPopID", m_bPopID); @@ -3965,12 +3969,13 @@ gUserManager.DropOwner(); } - if (mit_info == NULL) { + if (mit_info == NULL) + { int event_base, error_base; - if(XScreenSaverQueryExtension(x11Display(), &event_base, &error_base)) { + if(XScreenSaverQueryExtension(x11Display(), &event_base, &error_base)) mit_info = XScreenSaverAllocInfo (); - } - else { + else + { gLog.Warn("%sNo XScreenSaver extension found on current XServer, disabling auto-away.\n", L_WARNxSTR); autoAwayTimer.stop(); @@ -3978,7 +3983,8 @@ } } - if (!XScreenSaverQueryInfo(x11Display(), qt_xrootwin(), mit_info)) { + if (!XScreenSaverQueryInfo(x11Display(), qt_xrootwin(), mit_info)) + { gLog.Warn("%sXScreenSaverQueryInfo failed, disabling auto-away.\n", L_WARNxSTR); autoAwayTimer.stop(); @@ -4014,7 +4020,7 @@ else if ( (autoNATime > 0) && (unsigned long)idleTime > (unsigned long)(autoNATime * 60000)) { - if (status != ICQ_STATUS_NA) + if (status != ICQ_STATUS_NA && status != ICQ_STATUS_OFFLINE) { if (autoNAMess) { @@ -4036,7 +4042,7 @@ else if ( (autoAwayTime > 0) && (unsigned long)idleTime > (unsigned long)(autoAwayTime * 60000)) { - if (status != ICQ_STATUS_AWAY) + if (status != ICQ_STATUS_AWAY && status != ICQ_STATUS_OFFLINE) { if (autoAwayMess) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/licq-20060807/plugins/qt-gui/src/mainwin.h new/licq-20060810/plugins/qt-gui/src/mainwin.h --- old/licq-20060807/plugins/qt-gui/src/mainwin.h 2006-08-07 19:48:38.000000000 +0200 +++ new/licq-20060810/plugins/qt-gui/src/mainwin.h 2006-08-10 11:40:18.000000000 +0200 @@ -137,6 +137,8 @@ m_bAutoPosReplyWin, m_bAutoSendThroughServer, m_bEnableMainwinMouseMovement, + m_bPopAlias, + m_bPopName, m_bPopEmail, m_bPopPhone, m_bPopFax, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/licq-20060807/plugins/qt-gui/src/optionsdlg.cpp new/licq-20060810/plugins/qt-gui/src/optionsdlg.cpp --- old/licq-20060807/plugins/qt-gui/src/optionsdlg.cpp 2006-08-07 19:48:38.000000000 +0200 +++ new/licq-20060810/plugins/qt-gui/src/optionsdlg.cpp 2006-08-10 11:40:19.000000000 +0200 @@ -243,6 +243,8 @@ chkMainWinSticky->setChecked(mainwin->m_bMainWinSticky); chkMsgWinSticky->setChecked(mainwin->m_bMsgWinSticky); chkSingleLineChatMode->setChecked(mainwin->m_bSingleLineChatMode); + popAlias->setChecked(mainwin->m_bPopAlias); + popName->setChecked(mainwin->m_bPopName); popEmail->setChecked(mainwin->m_bPopEmail); popPhone->setChecked(mainwin->m_bPopPhone); popFax->setChecked(mainwin->m_bPopFax); @@ -543,12 +545,14 @@ mainwin->m_bMsgWinSticky = chkMsgWinSticky->isChecked(); mainwin->m_bSingleLineChatMode = chkSingleLineChatMode->isChecked(); - mainwin->m_bPopEmail= popEmail->isChecked(); - mainwin->m_bPopPhone= popPhone->isChecked(); - mainwin->m_bPopFax= popFax->isChecked(); - mainwin->m_bPopCellular= popCellular->isChecked(); - mainwin->m_bPopIP= popIP->isChecked(); - mainwin->m_bPopLastOnline= popLastOnline->isChecked(); + mainwin->m_bPopAlias = popAlias->isChecked(); + mainwin->m_bPopName = popName->isChecked(); + mainwin->m_bPopEmail = popEmail->isChecked(); + mainwin->m_bPopPhone = popPhone->isChecked(); + mainwin->m_bPopFax = popFax->isChecked(); + mainwin->m_bPopCellular = popCellular->isChecked(); + mainwin->m_bPopIP = popIP->isChecked(); + mainwin->m_bPopLastOnline = popLastOnline->isChecked(); mainwin->m_bPopOnlineSince = popOnlineSince->isChecked(); mainwin->m_bPopIdleTime = popIdleTime->isChecked(); mainwin->m_bPopID = popID->isChecked(); @@ -1456,6 +1460,8 @@ boxPopWin = new QGroupBox(1, Horizontal, tr("Popup info"), w); + popAlias = new QCheckBox(tr("Alias"), boxPopWin); + popName = new QCheckBox(tr("Name"), boxPopWin); popEmail = new QCheckBox(tr("Email"), boxPopWin); popPhone = new QCheckBox(tr("Phone"), boxPopWin); popFax = new QCheckBox(tr("Fax"), boxPopWin); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/licq-20060807/plugins/qt-gui/src/optionsdlg.h new/licq-20060810/plugins/qt-gui/src/optionsdlg.h --- old/licq-20060807/plugins/qt-gui/src/optionsdlg.h 2006-08-07 19:48:39.000000000 +0200 +++ new/licq-20060810/plugins/qt-gui/src/optionsdlg.h 2006-08-10 11:40:19.000000000 +0200 @@ -135,8 +135,9 @@ // display tab QWidget* new_popup_options(); QGroupBox *boxPopWin; - QCheckBox *popEmail, *popPhone, *popFax, *popCellular, *popIP, - *popLastOnline, *popOnlineSince, *popIdleTime, *popID; + QCheckBox *popAlias, *popName, *popEmail, *popPhone, + *popFax, *popCellular, *popIP, + *popLastOnline, *popOnlineSince, *popIdleTime, *popID; QWidget* new_chat_options(); CMessageViewWidget *msgViewer; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/licq-20060807/plugins/qt-gui/src/userbox.cpp new/licq-20060810/plugins/qt-gui/src/userbox.cpp --- old/licq-20060807/plugins/qt-gui/src/userbox.cpp 2006-08-07 19:48:38.000000000 +0200 +++ new/licq-20060810/plugins/qt-gui/src/userbox.cpp 2006-08-10 11:40:19.000000000 +0200 @@ -1583,6 +1583,21 @@ QString s = strFileName + QString("<nobr>") + QString(ICQUser::StatusToStatusStr(item->m_nStatus, item->m_bStatusInvisible)) + QString("</nobr>"); + + if (*u->GetAlias() && gMainWindow->m_bPopAlias) + s += tr("<br><nobr>") + codec->toUnicode(u->GetAlias()) + tr("</nobr>"); + + if ((*u->GetFirstName() || *u->GetLastName()) && gMainWindow->m_bPopName) + { + s += tr("<br><nobr>"); + if (*u->GetFirstName()) + s += codec->toUnicode(u->GetFirstName()); + if (*u->GetFirstName() && *u->GetLastName()) + s += " "; + if (*u->GetLastName()) + s += codec->toUnicode(u->GetLastName()); + s += tr("</nobr>"); + } if (item->m_nStatusFull & ICQ_STATUS_FxBIRTHDAY) s += tr("<br><b>Birthday Today!</b>"); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...