← Back to branch summary

~vish/ubuntu/maverick/pidgin/bug25979

« back to all changes in this revision

Viewing changes to libpurple/dbus-server.c

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2009-10-09 19:40:26 UTC
  • mfrom: (1.4.1 upstream) (46.1.10 karmic)
  • Revision ID: james.westby@ubuntu.com-20091009194026-wbqqh0bsbz19nx5q
Tags: 1:2.6.2-1ubuntu7
https://launchpad.net/bugs/346840
https://launchpad.net/bugs/209440
* Don't stick the buddy list window to all desktops as some
  window managers have trouble to properly unstick it (LP: #346840)
  - debian/patches/11_buddy_list_really_show.patch
* Always use default tray icon size on KDE (LP: #209440)
  - debian/patches/62_tray_icon_size_kde.patch
* Use scrollbars in the preferences dialog if the screen height is
  below 700 px instead of 600 px
  - debian/patches/60_1024x600_gtkprefs.c.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
libpurple/dbus-server.c
421
421
}
422
422
 
423
423
#include "dbus-bindings.c"
 
424
#include "dbus-signals.c"
424
425
 
425
426
static gboolean
426
427
purple_dbus_dispatch_cb(DBusConnection *connection,
489
490
        DBusMessage *reply;
490
491
        GString *str;
491
492
        GList *bindings_list, *node;
 
493
        const char *signals;
 
494
        const char *type;
 
495
        const char *pointer_type;
492
496
 
493
497
        str = g_string_sized_new(0x1000); /* TODO: why this size? */
494
498
 
529
533
                }
530
534
        }
531
535
 
 
536
        if (sizeof(int) == sizeof(dbus_int32_t))
 
537
                pointer_type = "type='i'";
 
538
        else
 
539
                pointer_type = "type='x'";
 
540
 
 
541
        signals = dbus_signals;
 
542
        while ((type = strstr(signals, "type='p'")) != NULL) {
 
543
                g_string_append_len(str, signals, type - signals);
 
544
                g_string_append(str, pointer_type);
 
545
                signals = type + sizeof("type='p'") - 1;
 
546
        }
 
547
        g_string_append(str, signals);
 
548
 
532
549
        g_string_append(str, "</interface>\n</node>\n");
533
550
 
534
551
        reply = dbus_message_new_method_return(message);