Mercurial > pidgin.yaz
changeset 22092:028128f35e41
merge of '735c3286464306d43a2109836ecbdc3bc26b479f'
and '86444fc78caf0bd737a735a030502a10877ed050'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sun, 13 Jan 2008 19:38:12 +0000 |
| parents | 02fc6697f38c (current diff) 542d35f101ff (diff) |
| children | c55e5058499a |
| files | COPYRIGHT |
| diffstat | 4 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/COPYRIGHT Sun Jan 13 01:00:29 2008 +0000 +++ b/COPYRIGHT Sun Jan 13 19:38:12 2008 +0000 @@ -371,6 +371,7 @@ Richard Stellingwerff Charlie Stockman David Stoddard +Andreas Stührk Oleg Sukhodolsky Sun Microsystems Mårten Svantesson (fursten)
--- a/libpurple/dbus-server.c Sun Jan 13 01:00:29 2008 +0000 +++ b/libpurple/dbus-server.c Sun Jan 13 19:38:12 2008 +0000 @@ -729,7 +729,7 @@ if (id == 0 && val != NULL) error = TRUE; /* Some error happened. */ dbus_message_iter_append_basic(iter, - (sizeof(void *) == 4) ? DBUS_TYPE_UINT32 : DBUS_TYPE_UINT64, &id); + (sizeof(id) == sizeof(dbus_int32_t)) ? DBUS_TYPE_INT32 : DBUS_TYPE_INT64, &id); break; default: /* no conversion implemented */ g_return_val_if_reached(TRUE);
--- a/pidgin/gtkmain.c Sun Jan 13 01:00:29 2008 +0000 +++ b/pidgin/gtkmain.c Sun Jan 13 19:38:12 2008 +0000 @@ -508,6 +508,7 @@ {"session", required_argument, NULL, 's'}, {"version", no_argument, NULL, 'v'}, {"display", required_argument, NULL, 'D'}, + {"sync", no_argument, NULL, 'S'}, {0, 0, 0, 0} }; @@ -517,7 +518,7 @@ debug_enabled = FALSE; #endif - /* This is the first Glib function call. Make sure to initialize GThread bfeore then */ + /* Initialize GThread before calling any Glib or GTK+ functions. */ g_thread_init(NULL); #ifdef ENABLE_NLS @@ -654,6 +655,7 @@ opt_si = FALSE; break; case 'D': /* --display */ + case 'S': /* --sync */ /* handled by gtk_init_check below */ break; case '?': /* show terse help */
--- a/po/POTFILES.in Sun Jan 13 01:00:29 2008 +0000 +++ b/po/POTFILES.in Sun Jan 13 19:38:12 2008 +0000 @@ -72,6 +72,7 @@ libpurple/protocols/bonjour/bonjour.c libpurple/protocols/bonjour/bonjour.h libpurple/protocols/bonjour/jabber.c +libpurple/protocols/bonjour/mdns_win32.c libpurple/protocols/gg/gg.c libpurple/protocols/irc/cmds.c libpurple/protocols/irc/dcc_send.c @@ -213,6 +214,7 @@ pidgin/pidgin.h pidgin/pidgincombobox.c pidgin/pidginstock.c +pidgin/pidgintooltip.c pidgin/pixmaps/emotes/default/24/default.theme.in pidgin/pixmaps/emotes/none/none.theme.in pidgin/plugins/cap/cap.c