changeset 531:aee9a279a0f3

Allow changing priority on the fly
author Mikael Berthe <mikael@lilotux.net>
date Tue, 22 Nov 2005 23:36:12 +0100
parents 365e1ded7f1a
children 2ac8d8e49e81
files mcabber/src/jabglue.c mcabber/src/jabglue.h mcabber/src/main.c
diffstat 3 files changed, 2 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/mcabber/src/jabglue.c	Mon Nov 21 21:31:12 2005 +0100
+++ b/mcabber/src/jabglue.c	Tue Nov 22 23:36:12 2005 +0100
@@ -40,7 +40,6 @@
 jconn jc;
 static time_t LastPingTime;
 static unsigned int KeepaliveDelay;
-static unsigned int prio;
 static int s_id;
 static int regmode, regdone;
 static enum imstatus mystatus = offline;
@@ -200,11 +199,6 @@
   KeepaliveDelay = delay;
 }
 
-inline void jb_set_priority(unsigned int priority)
-{
-  prio = priority;
-}
-
 void jb_main()
 {
   xmlnode x, z;
@@ -273,6 +267,7 @@
 {
   xmlnode x;
   gchar *utf8_msg;
+  unsigned int prio;
 
   if (!online) return;
 
@@ -314,6 +309,7 @@
         break;
   }
 
+  prio = settings_opt_get_int("priority");
   if (prio) {
     char strprio[8];
     snprintf(strprio, 8, "%u", prio);
--- a/mcabber/src/jabglue.h	Mon Nov 21 21:31:12 2005 +0100
+++ b/mcabber/src/jabglue.h	Tue Nov 22 23:36:12 2005 +0100
@@ -55,7 +55,6 @@
 void jb_keepalive();
 inline void jb_reset_keepalive();
 void jb_set_keepalive_delay(unsigned int delay);
-inline void jb_set_priority(unsigned int priority);
 void jb_room_join(const char *room, const char *nickname);
 void jb_room_unlock(const char *room);
 void jb_room_invite(const char *room, const char *jid, const char *reason);
--- a/mcabber/src/main.c	Mon Nov 21 21:31:12 2005 +0100
+++ b/mcabber/src/main.c	Tue Nov 22 23:36:12 2005 +0100
@@ -74,8 +74,6 @@
   ssl  = (settings_opt_get_int("ssl") > 0);
   port = (unsigned int) settings_opt_get_int("port");
 
-  jb_set_priority(settings_opt_get_int("priority"));
-
   /* Connect to server */
   scr_LogPrint(LPRINT_NORMAL|LPRINT_DEBUG, "Connecting to server: %s",
                servername);