gfgit/claws-mail
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

2007-03-24 [colin] 2.8.1cvs49

Browse source 
* src/main.c
		Fix a few launch problems on Maemo
		Patch by Jean-Luc Biord
This commit is contained in:
Colin Leroy 2007-03-24 22:47:18 +00:00
parent 7c67103498
commit a9619d8646
4 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2007-03-24 [colin] 2.8.1cvs49
* src/main.c
Fix a few launch problems on Maemo
Patch by Jean-Luc Biord
2007-03-24 [wwp] 2.8.1cvs48
* src/alertpanel.c

1
PATCHSETS
View file

@ -2465,3 +2465,4 @@
( cvs diff -u -r 1.155.2.57 -r 1.155.2.58 src/Makefile.am; cvs diff -u -r 1.25.2.34 -r 1.25.2.35 src/stock_pixmap.c; diff -u /dev/null src/pixmaps/edit_extern.xpm; diff -u /dev/null src/pixmaps/mail_sign.xpm; ) > 2.8.1cvs46.patchset
( cvs diff -u -r 1.207.2.154 -r 1.207.2.155 src/folderview.c; cvs diff -u -r 1.2.2.9 -r 1.2.2.10 tools/kdeservicemenu/README; ) > 2.8.1cvs47.patchset
( cvs diff -u -r 1.17.2.32 -r 1.17.2.33 src/alertpanel.c; cvs diff -u -r 1.5.2.10 -r 1.5.2.11 src/alertpanel.h; cvs diff -u -r 1.94.2.128 -r 1.94.2.129 src/messageview.c; cvs diff -u -r 1.395.2.291 -r 1.395.2.292 src/summaryview.c; ) > 2.8.1cvs48.patchset
( cvs diff -u -r 1.115.2.147 -r 1.115.2.148 src/main.c; ) > 2.8.1cvs49.patchset

2
configure.ac
View file

@ -11,7 +11,7 @@ MINOR_VERSION=8
MICRO_VERSION=1
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=48
EXTRA_VERSION=49
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=

18
src/main.c
View file

@ -119,10 +119,10 @@
#include <gtk/gtkmain.h>
#include <libosso.h>
#define OSSO_EXAMPLE_NAME "claws-mail"
#define OSSO_EXAMPLE_SERVICE "org.maemo."OSSO_EXAMPLE_NAME
#define OSSO_EXAMPLE_OBJECT "/org/maemo/"OSSO_EXAMPLE_NAME
#define OSSO_EXAMPLE_IFACE "org.maemo."OSSO_EXAMPLE_NAME
#define OSSO_NAME "clawsmail"
#define OSSO_SERVICE "com.nokia."OSSO_NAME
#define OSSO_OBJECT "/com/nokia/"OSSO_NAME
#define OSSO_IFACE "com.nokia."OSSO_NAME
typedef struct _AppData AppData;
struct _AppData {
@ -671,7 +671,7 @@ int main(int argc, char *argv[])
gtk_init(&argc, &argv);
#ifdef MAEMO
osso_context = osso_initialize(PACKAGE, VERSION, TRUE, NULL);
osso_context = osso_initialize(OSSO_SERVICE, "2.8.1", TRUE, NULL);
if (osso_context == NULL) {
return OSSO_ERROR;
}
@ -842,10 +842,10 @@ int main(int argc, char *argv[])
appdata->window = mainwin->window;
appdata->osso_context = osso_context;
result = osso_rpc_set_cb_f(appdata->osso_context,
OSSO_EXAMPLE_SERVICE,
OSSO_EXAMPLE_OBJECT,
OSSO_EXAMPLE_IFACE,
dbus_req_handler, appdata);
OSSO_SERVICE,
OSSO_OBJECT,
OSSO_IFACE,
dbus_req_handler, appdata);
if (result != OSSO_OK) {
return OSSO_ERROR;
}