← Back to branch summary

~ubuntu-branches/ubuntu/precise/empathy/precise-proposed-201205180810

« back to all changes in this revision

Viewing changes to libempathy-gtk/empathy-contact-selector-dialog.c

  • Committer: Bazaar Package Importer
  • Author(s): Brian Curtis, Brian Curtis, Ken VanDine
  • Date: 2011-06-01 10:35:24 UTC
  • mfrom: (1.1.70 upstream) (6.3.44 experimental)
  • Revision ID: james.westby@ubuntu.com-20110601103524-wx3wgp71394730jt
Tags: 3.1.1-1ubuntu1
[ Brian Curtis ]
* Merge with Debian experimental, remaining Ubuntu changes:
* debian/control:
  - Drop geoclue/mapping build-depends (they are in Universe)
  - Add Vcz-Bzr link
  - Add Suggests on telepathy-idle
  - Bump telepathy-butterfly, telepathy-haze to recommends
  - Don't recommend the freedesktop sound theme we have an ubuntu one
  - Add build depend for libunity-dev
* debian/rules:
  - Use autoreconf.mk
  - Disable map and location
* debian/empathy.install:
  - Install message indicator configuration
* debian/indicators/empathy:
  - Message indicator configuration
* debian/patches/01_lpi.patch:
  - Add Launchpad integration
* debian/patches/10_use_notify_osd_icons.patch:
  - Use the notify-osd image for new messages
* debian/patches/34_start_raised_execpt_in_session.patch
  - If not started with the session, we should always raise
* debian/patches/36_chat_window_default_size.patch:
  - Make the default chat window size larger
* debian/patches/37_facebook_default.patch:
  - Make facebook the default chat account type
* debian/patches/38_lp_569289.patch
  - Set freenode as default IRC network for new IRC accounts 
* debian/patches/41_unity_launcher_progress.patch
  - Display file transfer progress in the unity launcher

[ Ken VanDine ]
* debian/control
  - build depend on libgcr-3-dev instead of libgcr-dev
  - dropped build depends for libindicate, we will use telepathy-indicator
  - Depend on dconf-gsettings-backend | gsettings-backend
  - Added a Recommends for telepathy-indicator
* +debian/empathy.gsettings-override
  - Added an override for notifications-focus
* debian/patches/series
  - commented out 23_idomessagedialog_for_voip_and_ft.patch, until ido has 
    been ported to gtk3

Show diffs side-by-side

added added

removed removed

Lines of Context:
libempathy-gtk/empathy-contact-selector-dialog.c
30
30
 
31
31
#include <libempathy/empathy-tp-contact-factory.h>
32
32
#include <libempathy/empathy-contact-manager.h>
33
 
#include <libempathy/empathy-dispatcher.h>
34
33
#include <libempathy/empathy-utils.h>
35
34
 
36
35
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
67
66
enum {
68
67
  PROP_0,
69
68
  PROP_SHOW_ACCOUNT_CHOOSER,
70
 
  PROP_FILTER_ACCOUNT
 
69
  PROP_FILTER_ACCOUNT,
 
70
  PROP_SELECTED_ACCOUNT
71
71
};
72
72
 
73
73
enum {
152
152
      g_object_unref (contact);
153
153
      members = g_list_delete_link (members, members);
154
154
  }
 
155
 
 
156
  g_object_notify (G_OBJECT (dialog), "selected-account");
155
157
}
156
158
 
157
159
static gboolean
376
378
    GParamSpec *pspec)
377
379
{
378
380
  EmpathyContactSelectorDialog *dialog = EMPATHY_CONTACT_SELECTOR_DIALOG (self);
 
381
  EmpathyContactSelectorDialogPriv *priv = GET_PRIV (dialog);
379
382
 
380
383
  switch (prop_id)
381
384
    {
389
392
            empathy_contact_selector_dialog_get_filter_account (dialog));
390
393
        break;
391
394
 
 
395
      case PROP_SELECTED_ACCOUNT:
 
396
        g_value_set_object (value, empathy_account_chooser_get_account (
 
397
              EMPATHY_ACCOUNT_CHOOSER (priv->account_chooser)));
 
398
        break;
 
399
 
392
400
      default:
393
401
        G_OBJECT_WARN_INVALID_PROPERTY_ID (self, prop_id, pspec);
394
402
        break;
402
410
    GParamSpec *pspec)
403
411
{
404
412
  EmpathyContactSelectorDialog *dialog = EMPATHY_CONTACT_SELECTOR_DIALOG (self);
 
413
  EmpathyContactSelectorDialogPriv *priv = GET_PRIV (dialog);
405
414
 
406
415
  switch (prop_id)
407
416
    {
415
424
            g_value_get_object (value));
416
425
        break;
417
426
 
 
427
      case PROP_SELECTED_ACCOUNT:
 
428
        empathy_account_chooser_set_account (
 
429
            EMPATHY_ACCOUNT_CHOOSER (priv->account_chooser),
 
430
            g_value_get_object (value));
 
431
        break;
 
432
 
418
433
      default:
419
434
        G_OBJECT_WARN_INVALID_PROPERTY_ID (self, prop_id, pspec);
420
435
        break;
491
506
        "account are displayed",
492
507
        TP_TYPE_ACCOUNT,
493
508
        G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
509
 
 
510
  g_object_class_install_property (object_class, PROP_SELECTED_ACCOUNT,
 
511
      g_param_spec_object ("selected-account",
 
512
        "Selected Account",
 
513
        "Current account selected in the account-chooser",
 
514
        TP_TYPE_ACCOUNT,
 
515
        G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
494
516
}
495
517
 
496
518
const gchar *