livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-5417; proper implementation for dbus.

Nicky 2012-03-11 13:35:20 +01:00
parent aace58f6e3
commit 6cef73bbac
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/llappviewerlinux.cpp
View File

@ -225,7 +225,10 @@ void viewerappapi_init(ViewerAppAPI *server)
}
}
gboolean viewer_app_api_GoSLURL(ViewerAppAPI *obj, gchar *slurl, gboolean **success_rtn, GError **error)
// <FS:ND> FIRE-5417; The xml manifest for dbus claims success_rtn is a boolean, not a boolean array
//gboolean viewer_app_api_GoSLURL(ViewerAppAPI *obj, gchar *slurl, gboolean **success_rtn, GError **error)
gboolean viewer_app_api_GoSLURL(ViewerAppAPI *obj, gchar *slurl, gboolean *success_rtn, GError **error)
// </FS:ND>
{
bool success = false;
@ -242,8 +245,14 @@ gboolean viewer_app_api_GoSLURL(ViewerAppAPI *obj, gchar *slurl, gboolean **succ
success = true;
}
*success_rtn = g_new (gboolean, 1);
(*success_rtn)[0] = (gboolean)success;
// <FS:ND> FIRE-5417; The xml manifest for dbus claims success_rtn is a boolean, not a boolean array
// *success_rtn = g_new (gboolean, 1);
// (*success_rtn)[0] = (gboolean)success;
*success_rtn = (gboolean)success;
// </FS:ND>
return TRUE; // the invokation succeeded, even if the actual dispatch didn't.
}

7
indra/newview/llappviewerlinux.h
View File

@ -78,7 +78,12 @@ typedef struct
} ViewerAppAPI;
extern "C" {
gboolean viewer_app_api_GoSLURL(ViewerAppAPI *obj, gchar *slurl, gboolean **success_rtn, GError **error);
// <FS:ND> FIRE-5417; The xml manifest for dbus claims success_rtn is a boolean, not a boolean array
// gboolean viewer_app_api_GoSLURL(ViewerAppAPI *obj, gchar *slurl, gboolean **success_rtn, GError **error);
gboolean viewer_app_api_GoSLURL(ViewerAppAPI *obj, gchar *slurl, gboolean *success_rtn, GError **error);
// <FS:ND>
}
#define VIEWERAPI_SERVICE "com.secondlife.ViewerAppAPIService"