From b05ab5fc85b320430be9cfe10bf76701c75fc903 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Tue, 31 Aug 2010 00:04:16 -0400
Subject: daemon_screenname -> daemonScreenname

---
 plugins/Aim/AimPlugin.php    | 2 +-
 plugins/Irc/IrcPlugin.php    | 2 +-
 plugins/Msn/MsnPlugin.php    | 2 +-
 plugins/Xmpp/XmppPlugin.php  | 2 +-
 plugins/Xmpp/xmppmanager.php | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'plugins')

diff --git a/plugins/Aim/AimPlugin.php b/plugins/Aim/AimPlugin.php
index 1d06a8bda..231dc0b27 100644
--- a/plugins/Aim/AimPlugin.php
+++ b/plugins/Aim/AimPlugin.php
@@ -66,7 +66,7 @@ class AimPlugin extends ImPlugin
         return strtolower($screenname);
     }
 
-    function daemon_screenname()
+    function daemonScreenname()
     {
         return $this->user;
     }
diff --git a/plugins/Irc/IrcPlugin.php b/plugins/Irc/IrcPlugin.php
index 5434c4e7d..bebd0eaf3 100644
--- a/plugins/Irc/IrcPlugin.php
+++ b/plugins/Irc/IrcPlugin.php
@@ -95,7 +95,7 @@ class IrcPlugin extends ImPlugin {
      *
      * @return string Screenname
      */
-    public function daemon_screenname() {
+    public function daemonScreenname() {
         return $this->nick;
     }
 
diff --git a/plugins/Msn/MsnPlugin.php b/plugins/Msn/MsnPlugin.php
index a112a2070..68e57fa09 100644
--- a/plugins/Msn/MsnPlugin.php
+++ b/plugins/Msn/MsnPlugin.php
@@ -78,7 +78,7 @@ class MsnPlugin extends ImPlugin {
      *
      * @return string Screenname
      */
-    public function daemon_screenname() {
+    public function daemonScreenname() {
         return $this->user;
     }
 
diff --git a/plugins/Xmpp/XmppPlugin.php b/plugins/Xmpp/XmppPlugin.php
index 2cdc3272d..321496e7d 100644
--- a/plugins/Xmpp/XmppPlugin.php
+++ b/plugins/Xmpp/XmppPlugin.php
@@ -254,7 +254,7 @@ class XmppPlugin extends ImPlugin
         return false;
     }
 
-    function daemon_screenname()
+    function daemonScreenname()
     {
         $ret = $this->user . '@' . $this->server;
         if($this->resource)
diff --git a/plugins/Xmpp/xmppmanager.php b/plugins/Xmpp/xmppmanager.php
index 87d818668..c9cb49dd1 100644
--- a/plugins/Xmpp/xmppmanager.php
+++ b/plugins/Xmpp/xmppmanager.php
@@ -184,7 +184,7 @@ class XmppManager extends ImManager
         }
 
         common_log(LOG_DEBUG, "Sending ping #{$this->pingid}");
-		$this->conn->send("<iq from='{" . $this->plugin->daemon_screenname() . "}' to='{$this->plugin->server}' id='ping_{$this->pingid}' type='get'><ping xmlns='urn:xmpp:ping'/></iq>");
+		$this->conn->send("<iq from='{" . $this->plugin->daemonScreenname() . "}' to='{$this->plugin->server}' id='ping_{$this->pingid}' type='get'><ping xmlns='urn:xmpp:ping'/></iq>");
         $this->lastping = $now;
         return true;
     }
-- 
cgit v1.2.3-54-g00ecf