Changed due to moving RegistrarDefs.h stuff into the BPrivate namespace and replacing kRosterPortName.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10813 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
0ffb21a672
commit
289adc045d
@ -1317,7 +1317,7 @@ const char*
|
|||||||
looper_name_for(const char *signature)
|
looper_name_for(const char *signature)
|
||||||
{
|
{
|
||||||
if (signature && !strcasecmp(signature, kRegistrarSignature))
|
if (signature && !strcasecmp(signature, kRegistrarSignature))
|
||||||
return kRosterPortName;
|
return BPrivate::get_roster_port_name();
|
||||||
return "AppLooperPort";
|
return "AppLooperPort";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -41,6 +41,8 @@
|
|||||||
// Globals ---------------------------------------------------------------------
|
// Globals ---------------------------------------------------------------------
|
||||||
BClipboard *be_clipboard = NULL;
|
BClipboard *be_clipboard = NULL;
|
||||||
|
|
||||||
|
using namespace BPrivate;
|
||||||
|
|
||||||
|
|
||||||
BClipboard::BClipboard(const char *name, bool transient)
|
BClipboard::BClipboard(const char *name, bool transient)
|
||||||
{
|
{
|
||||||
|
@ -31,6 +31,8 @@
|
|||||||
#include <Roster.h>
|
#include <Roster.h>
|
||||||
#include <RosterPrivate.h>
|
#include <RosterPrivate.h>
|
||||||
|
|
||||||
|
using namespace BPrivate;
|
||||||
|
|
||||||
// constructor
|
// constructor
|
||||||
/*! \brief Creates and initializes a new BMessageRunner.
|
/*! \brief Creates and initializes a new BMessageRunner.
|
||||||
|
|
||||||
|
@ -18,6 +18,8 @@
|
|||||||
#define DBG(x)
|
#define DBG(x)
|
||||||
#define OUT printf
|
#define OUT printf
|
||||||
|
|
||||||
|
using namespace BPrivate;
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
\class RegistrarThreadManager
|
\class RegistrarThreadManager
|
||||||
\brief RegistrarThreadManager is the master of all threads spawned by the registrar
|
\brief RegistrarThreadManager is the master of all threads spawned by the registrar
|
||||||
|
@ -53,6 +53,7 @@
|
|||||||
#include <Volume.h>
|
#include <Volume.h>
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
using namespace BPrivate;
|
||||||
|
|
||||||
// debugging
|
// debugging
|
||||||
//#define DBG(x) x
|
//#define DBG(x) x
|
||||||
@ -2180,7 +2181,7 @@ BRoster::InitMessengers()
|
|||||||
{
|
{
|
||||||
DBG(OUT("BRoster::InitMessengers()\n"));
|
DBG(OUT("BRoster::InitMessengers()\n"));
|
||||||
// find the registrar port
|
// find the registrar port
|
||||||
port_id rosterPort = find_port(kRosterPortName);
|
port_id rosterPort = find_port(BPrivate::get_roster_port_name());
|
||||||
port_info info;
|
port_info info;
|
||||||
if (rosterPort >= 0 && get_port_info(rosterPort, &info) == B_OK) {
|
if (rosterPort >= 0 && get_port_info(rosterPort, &info) == B_OK) {
|
||||||
DBG(OUT(" found roster port\n"));
|
DBG(OUT(" found roster port\n"));
|
||||||
|
@ -23,6 +23,8 @@
|
|||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
|
|
||||||
|
using namespace BPrivate;
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
NOT_IMPLEMENTED = B_ERROR,
|
NOT_IMPLEMENTED = B_ERROR,
|
||||||
};
|
};
|
||||||
|
@ -20,6 +20,8 @@
|
|||||||
#include <RegistrarDefs.h>
|
#include <RegistrarDefs.h>
|
||||||
#include <RosterPrivate.h> // For SendTo()
|
#include <RosterPrivate.h> // For SendTo()
|
||||||
|
|
||||||
|
using namespace BPrivate;
|
||||||
|
|
||||||
// Private helper functions
|
// Private helper functions
|
||||||
bool isValidMimeChar(const char ch);
|
bool isValidMimeChar(const char ch);
|
||||||
status_t toLower(const char *str, char *result);
|
status_t toLower(const char *str, char *result);
|
||||||
|
Loading…
Reference in New Issue
Block a user