[Licq-devel] [PATCH] iterate through plugins when none defined

[Thomas Reitelbach]

Hi,

if one compiles --with-kde support then when first starting licq, it will try 
to load qt-gui by default and fail.
many users complained about this, and there has been a fix for it in the code. 
unfortunately things changed and the fix was no longer a fix, but unused code 
;)

my attached patch fixes the problem.
if one first starts licq, it will try to load qt-gui, then kde-gui, then 
jons-gtk-gui and then console.

the idea for the additional plugins to try came from LordVan on irc :)

Thomas

-- 
Be cautious in your daily affairs.

Index: src/licq.conf.h
===================================================================
RCS file: /cvsroot/licq/licq/src/licq.conf.h,v
retrieving revision 1.17
diff -u -3 -p -r1.17 licq.conf.h
--- src/licq.conf.h	27 Sep 2002 21:53:24 -0000	1.17
+++ src/licq.conf.h	7 Feb 2003 16:20:00 -0000
@@ -4,8 +4,7 @@ static const char LICQ_CONF[] =
 "Version = 1020\n"
 "\n"
 "[plugins]\n"
-"NumPlugins = 1\n"
-"Plugin1 = qt-gui\n"
+"NumPlugins = 0\n"
 "\n"
 "[network]\n"
 "AllowNewUsers = 1\n"
Index: src/licq.cpp
===================================================================
RCS file: /cvsroot/licq/licq/src/licq.cpp,v
retrieving revision 1.64
diff -u -3 -p -r1.64 licq.cpp
--- src/licq.cpp	18 Jan 2003 01:29:32 -0000	1.64
+++ src/licq.cpp	7 Feb 2003 16:20:00 -0000
@@ -344,7 +344,7 @@ bool CLicq::Init(int argc, char **argv)
   {
     unsigned short nNumPlugins = 0;
     char szData[MAX_FILENAME_LEN];
-    if (licqConf.SetSection("plugins") && licqConf.ReadNum("NumPlugins", nNumPlugins))
+    if (licqConf.SetSection("plugins") && licqConf.ReadNum("NumPlugins", nNumPlugins) && nNumPlugins > 0)
     {
       for (int i = 0; i < nNumPlugins; i++)
       {
@@ -353,11 +353,13 @@ bool CLicq::Init(int argc, char **argv)
         if (LoadPlugin(szData, argc, argv) == NULL) return false;
       }
     }
-    else  // If no plugins, try qt-gui
+    else  // If no plugins, try some defaults one by one
     {
       if (LoadPlugin("qt-gui", argc, argv) == NULL)
         if (LoadPlugin("kde-gui", argc, argv) == NULL)
-          return false;
+          if (LoadPlugin("jons-gtk-gui", argc, argv) == NULL)
+            if (LoadPlugin("console", argc, argv) == NULL)
+              return false;
     }
   }

@@ -656,13 +658,6 @@ void CLicq::StartPlugin(CPlugin *p)
 int CLicq::Main()
 {
   int nResult = 0;
-
-  if (list_plugins.size() == 0)
-  {
-    gLog.Warn("%sNo plugins specified on the command-line (-p option).\n%sSee the README for more information.\n",
-              L_WARNxSTR, L_BLANKxSTR);
-    return nResult;
-  }

   if (!licqDaemon->Start()) return 1;

msg02023/pgp00000.pgp
Description: signature