← Back to branch summary

~ubuntu-branches/ubuntu/karmic/empathy/karmic-updates

« back to all changes in this revision

Viewing changes to debian/patches/20_libindicate.patch

  • Committer: Bazaar Package Importer
  • Author(s): Ken VanDine
  • Date: 2009-10-14 16:34:36 UTC
  • Revision ID: james.westby@ubuntu.com-20091014163436-44g3p0876xu08gr2
Tags: 2.28.0.1-1ubuntu6
https://launchpad.net/bugs/435329
https://launchpad.net/bugs/434316
* debian/patches/20_libindicate.patch
  - display the status icon when the indicator isn't present (LP: #435329)
  - don't attach notifications to the status icon if the icon 
    isn't visible, it was drawing a black line (LP: #434316)
* debian/patches/30_raise_not_toggle.patch
  - Updated to apply cleanly

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/20_libindicate.patch
5
5
#
6
6
 
7
7
=== modified file 'configure.ac'
8
 
--- configure.ac        2009-10-09 03:23:36 +0000
9
 
+++ configure.ac        2009-10-09 03:23:58 +0000
 
8
--- configure.ac        2009-10-15 03:43:55 +0000
 
9
+++ configure.ac        2009-10-15 03:44:19 +0000
10
10
@@ -41,6 +41,8 @@
11
11
 WEBKIT_REQUIRED=1.1.7
12
12
 KEYRING_REQUIRED=2.22
16
16
 
17
17
 # Use --enable-maintainer-mode to disabled deprecated symbols
18
18
 GNOME_MAINTAINER_MODE_DEFINES
19
 
@@ -407,6 +409,34 @@
 
19
@@ -408,6 +410,34 @@
20
20
 AM_CONDITIONAL(HAVE_NOTHERE, test "x$have_nothere" = "xyes")
21
21
 
22
22
 # -----------------------------------------------------------
51
51
 # Tests
52
52
 # -----------------------------------------------------------
53
53
 AC_ARG_ENABLE(tests,
54
 
@@ -527,6 +557,7 @@
 
54
@@ -528,6 +558,7 @@
55
55
        Location awareness (Geoclue):  ${have_geoclue}
56
56
        Adium themes (Webkit).......:  ${have_webkit}
57
57
        Moblin widgets (Nbtk).......:  ${have_nbtk}
61
61
        NetworkManager integration..:  ${have_nm}
62
62
 
63
63
=== modified file 'data/empathy.schemas.in'
64
 
--- data/empathy.schemas.in     2009-10-09 03:23:36 +0000
65
 
+++ data/empathy.schemas.in     2009-10-09 03:23:58 +0000
 
64
--- data/empathy.schemas.in     2009-10-15 03:43:04 +0000
 
65
+++ data/empathy.schemas.in     2009-10-15 03:44:19 +0000
66
66
@@ -291,6 +291,21 @@
67
67
     </schema>
68
68
 
87
87
        <owner>empathy</owner>
88
88
 
89
89
=== modified file 'libempathy-gtk/empathy-conf.h'
90
 
--- libempathy-gtk/empathy-conf.h       2009-10-09 03:23:36 +0000
91
 
+++ libempathy-gtk/empathy-conf.h       2009-10-09 03:23:58 +0000
 
90
--- libempathy-gtk/empathy-conf.h       2009-10-15 03:43:04 +0000
 
91
+++ libempathy-gtk/empathy-conf.h       2009-10-15 03:44:19 +0000
92
92
@@ -74,6 +74,7 @@
93
93
 #define EMPATHY_PREFS_UI_AVATAR_DIRECTORY          EMPATHY_PREFS_PATH "/ui/avatar_directory"
94
94
 #define EMPATHY_PREFS_UI_SHOW_AVATARS              EMPATHY_PREFS_PATH "/ui/show_avatars"
99
99
 #define EMPATHY_PREFS_HINTS_CLOSE_MAIN_WINDOW      EMPATHY_PREFS_PATH "/hints/close_main_window"
100
100
 
101
101
=== modified file 'libempathy-gtk/empathy-ui-utils.c'
102
 
--- libempathy-gtk/empathy-ui-utils.c   2009-10-09 03:23:36 +0000
103
 
+++ libempathy-gtk/empathy-ui-utils.c   2009-10-09 03:23:58 +0000
 
102
--- libempathy-gtk/empathy-ui-utils.c   2009-10-15 03:43:04 +0000
 
103
+++ libempathy-gtk/empathy-ui-utils.c   2009-10-15 03:44:19 +0000
104
104
@@ -1269,24 +1269,35 @@
105
105
        Display      *dpy;
106
106
        GdkWindow    *gdk_window;
155
155
 /* Takes care of moving the window to the current workspace. */
156
156
 
157
157
=== modified file 'po/POTFILES.in'
158
 
--- po/POTFILES.in      2009-10-09 03:23:36 +0000
159
 
+++ po/POTFILES.in      2009-10-09 03:23:58 +0000
 
158
--- po/POTFILES.in      2009-10-15 03:43:04 +0000
 
159
+++ po/POTFILES.in      2009-10-15 03:44:19 +0000
160
160
@@ -79,6 +79,8 @@
161
161
 [type: gettext/glade]src/empathy-import-dialog.ui
162
162
 src/empathy-import-widget.c
168
168
 src/empathy-new-chatroom-dialog.c
169
169
 
170
170
=== modified file 'src/Makefile.am'
171
 
--- src/Makefile.am     2009-10-09 03:23:36 +0000
172
 
+++ src/Makefile.am     2009-10-09 03:23:58 +0000
 
171
--- src/Makefile.am     2009-10-15 03:43:04 +0000
 
172
+++ src/Makefile.am     2009-10-15 03:44:19 +0000
173
173
@@ -4,8 +4,10 @@
174
174
 AM_CPPFLAGS =                                          \
175
175
        -I$(top_srcdir)                                 \
210
210
        empathy-map-view.c                      \
211
211
 
212
212
=== modified file 'src/empathy-chat-window.c'
213
 
--- src/empathy-chat-window.c   2009-10-09 03:23:36 +0000
214
 
+++ src/empathy-chat-window.c   2009-10-09 03:23:58 +0000
 
213
--- src/empathy-chat-window.c   2009-10-15 03:43:04 +0000
 
214
+++ src/empathy-chat-window.c   2009-10-15 03:44:19 +0000
215
215
@@ -56,6 +56,11 @@
216
216
 #include "empathy-about-dialog.h"
217
217
 #include "empathy-misc.h"
361
361
 
362
362
=== added file 'src/empathy-indicator-manager.c'
363
363
--- src/empathy-indicator-manager.c     1970-01-01 00:00:00 +0000
364
 
+++ src/empathy-indicator-manager.c     2009-10-09 03:23:58 +0000
365
 
@@ -0,0 +1,458 @@
 
364
+++ src/empathy-indicator-manager.c     2009-10-15 03:44:19 +0000
 
365
@@ -0,0 +1,460 @@
366
366
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
367
367
+/*
368
368
+ * Copyright (C) 2009 Canonical Ltd.
405
405
+#include "empathy-misc.h"
406
406
+
407
407
+#include <libindicate/server.h>
 
408
+#include <libindicate/indicator.h>
 
409
+
 
410
+#define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER
 
411
+#include <libempathy/empathy-debug.h>
408
412
+
409
413
+#define INDICATOR_LOGIN_TIMEOUT 15
410
414
+#define EMPATHY_DESKTOP_PATH DESKTOPDIR "/empathy.desktop"
739
743
+      manager);
740
744
+}
741
745
+
742
 
+
743
746
+void
744
747
+empathy_indicator_manager_set_server_visible (EmpathyIndicatorManager *manager,
745
748
+    gboolean visible)
748
751
+
749
752
+  priv = GET_PRIV (manager);
750
753
+  if (visible) {
 
754
+    DEBUG ("Show indicator");
751
755
+    indicate_server_show (priv->indicate_server);
752
756
+  } else {
753
 
+    /* Causes a crash on next show currently due to object not being
754
 
+       unregistered from dbus
 
757
+    DEBUG ("Hide indicator");
755
758
+    indicate_server_hide (priv->indicate_server);
756
 
+    */
757
759
+  }
758
760
+}
759
761
+
824
826
 
825
827
=== added file 'src/empathy-indicator-manager.h'
826
828
--- src/empathy-indicator-manager.h     1970-01-01 00:00:00 +0000
827
 
+++ src/empathy-indicator-manager.h     2009-10-09 03:23:58 +0000
 
829
+++ src/empathy-indicator-manager.h     2009-10-15 03:44:19 +0000
828
830
@@ -0,0 +1,77 @@
829
831
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
830
832
+/*
906
908
 
907
909
=== added file 'src/empathy-indicator.c'
908
910
--- src/empathy-indicator.c     1970-01-01 00:00:00 +0000
909
 
+++ src/empathy-indicator.c     2009-10-09 03:24:07 +0000
 
911
+++ src/empathy-indicator.c     2009-10-15 03:44:19 +0000
910
912
@@ -0,0 +1,318 @@
911
913
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
912
914
+/*
1229
1231
 
1230
1232
=== added file 'src/empathy-indicator.h'
1231
1233
--- src/empathy-indicator.h     1970-01-01 00:00:00 +0000
1232
 
+++ src/empathy-indicator.h     2009-10-09 03:23:58 +0000
 
1234
+++ src/empathy-indicator.h     2009-10-15 03:44:19 +0000
1233
1235
@@ -0,0 +1,65 @@
1234
1236
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
1235
1237
+/*
1298
1300
+#endif /* __EMPATHY-INDICATOR_H__ */
1299
1301
 
1300
1302
=== modified file 'src/empathy-main-window.c'
1301
 
--- src/empathy-main-window.c   2009-10-09 03:23:36 +0000
1302
 
+++ src/empathy-main-window.c   2009-10-09 03:23:58 +0000
1303
 
@@ -61,6 +61,10 @@
 
1303
--- src/empathy-main-window.c   2009-10-15 03:43:55 +0000
 
1304
+++ src/empathy-main-window.c   2009-10-15 03:44:19 +0000
 
1305
@@ -64,6 +64,10 @@
1304
1306
 #include "empathy-event-manager.h"
1305
1307
 #include "empathy-ft-manager.h"
1306
1308
 
1311
1313
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
1312
1314
 #include <libempathy/empathy-debug.h>
1313
1315
 
1314
 
@@ -111,6 +115,10 @@
 
1316
@@ -114,6 +118,10 @@
1315
1317
 
1316
1318
        /* Actions that are enabled when there are connected accounts */
1317
1319
        GList                  *actions_connected;
1322
1324
 } EmpathyMainWindow;
1323
1325
 
1324
1326
 static EmpathyMainWindow *window = NULL;
1325
 
@@ -600,6 +608,10 @@
 
1327
@@ -603,6 +611,10 @@
1326
1328
         /* someone is logging in */
1327
1329
         empathy_sound_play (GTK_WIDGET (window->window),
1328
1330
           EMPATHY_SOUND_CONTACT_CONNECTED);
1333
1335
     }
1334
1336
 }
1335
1337
 
1336
 
@@ -664,6 +676,10 @@
 
1338
@@ -667,6 +679,10 @@
1337
1339
        g_object_unref (window->event_manager);
1338
1340
        g_object_unref (window->ui_manager);
1339
1341
 
1344
1346
        g_free (window);
1345
1347
 }
1346
1348
 
1347
 
@@ -1238,6 +1254,10 @@
 
1349
@@ -1241,6 +1257,10 @@
1348
1350
                              "help_contents", "activate", main_window_help_contents_cb,
1349
1351
                              NULL);
1350
1352
 
1357
1359
 
1358
1360
 
1359
1361
=== modified file 'src/empathy-preferences.c'
1360
 
--- src/empathy-preferences.c   2009-10-09 03:23:36 +0000
1361
 
+++ src/empathy-preferences.c   2009-10-09 03:23:58 +0000
 
1362
--- src/empathy-preferences.c   2009-10-15 03:43:04 +0000
 
1363
+++ src/empathy-preferences.c   2009-10-15 03:44:19 +0000
1362
1364
@@ -53,6 +53,7 @@
1363
1365
 
1364
1366
        GtkWidget *checkbutton_show_smileys;
1392
1394
                "checkbutton_autoconnect", &preferences->checkbutton_autoconnect,
1393
1395
 
1394
1396
=== modified file 'src/empathy-preferences.ui'
1395
 
--- src/empathy-preferences.ui  2009-10-09 03:23:36 +0000
1396
 
+++ src/empathy-preferences.ui  2009-10-09 03:23:58 +0000
 
1397
--- src/empathy-preferences.ui  2009-10-15 03:43:04 +0000
 
1398
+++ src/empathy-preferences.ui  2009-10-15 03:44:19 +0000
1397
1399
@@ -250,6 +250,20 @@
1398
1400
                     <property name="position">1</property>
1399
1401
                   </packing>
1417
1419
                 <property name="position">1</property>
1418
1420
 
1419
1421
=== modified file 'src/empathy-status-icon.c'
1420
 
--- src/empathy-status-icon.c   2009-10-09 03:23:36 +0000
1421
 
+++ src/empathy-status-icon.c   2009-10-09 03:23:58 +0000
 
1422
--- src/empathy-status-icon.c   2009-10-15 03:43:04 +0000
 
1423
+++ src/empathy-status-icon.c   2009-10-15 03:45:19 +0000
1422
1424
@@ -29,6 +29,7 @@
1423
1425
 #include <gdk/gdkkeysyms.h>
1424
1426
 #include <glib/gi18n.h>
1427
1429
 #include <libnotify/notification.h>
1428
1430
 #include <libnotify/notify.h>
1429
1431
 
1430
 
@@ -44,12 +45,18 @@
 
1432
@@ -44,12 +45,20 @@
1431
1433
 #include <libempathy-gtk/empathy-images.h>
1432
1434
 #include <libempathy-gtk/empathy-new-message-dialog.h>
1433
1435
 
1441
1443
 
1442
1444
+#ifdef HAVE_LIBINDICATE
1443
1445
+#include "empathy-indicator-manager.h"
 
1446
+#include <libindicate/server.h>
 
1447
+#include <libindicate/interests.h>
1444
1448
+#endif
1445
1449
+
1446
1450
 #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER
1447
1451
 #include <libempathy/empathy-debug.h>
1448
1452
 
1449
 
@@ -74,6 +81,9 @@
 
1453
@@ -74,6 +83,10 @@
1450
1454
        GtkAction           *new_message_item;
1451
1455
        GtkAction           *status_item;
1452
1456
        gboolean             notify_supports_actions;
1453
1457
+#ifdef HAVE_LIBINDICATE
1454
1458
+        EmpathyIndicatorManager *indicator_manager;
 
1459
+       IndicateServer      *indicate_server;
1455
1460
+#endif
1456
1461
 } EmpathyStatusIconPriv;
1457
1462
 
1458
1463
 G_DEFINE_TYPE (EmpathyStatusIcon, empathy_status_icon, G_TYPE_OBJECT);
1459
 
@@ -86,6 +96,33 @@
 
1464
@@ -86,6 +99,33 @@
1460
1465
        return FALSE;
1461
1466
 }
1462
1467
 
1490
1495
 static void
1491
1496
 status_icon_notification_closed_cb (NotifyNotification *notification,
1492
1497
                                    EmpathyStatusIcon  *icon)
1493
 
@@ -115,8 +152,14 @@
 
1498
@@ -115,8 +155,14 @@
1494
1499
                 */
1495
1500
                g_idle_add ((GSourceFunc) activate_event, priv->event);
1496
1501
        } else {
1507
1512
        }
1508
1513
 }
1509
1514
 
1510
 
@@ -347,6 +390,28 @@
 
1515
@@ -166,8 +212,13 @@
 
1516
                                                    priv->event->header, message_esc,
 
1517
                                                    NULL);
 
1518
                } else {
 
1519
-                       priv->notification = notify_notification_new_with_status_icon
 
1520
-                               (priv->event->header, message_esc, NULL, priv->icon);
 
1521
+                       if (gtk_status_icon_get_visible (priv->icon)) {
 
1522
+                               priv->notification = notify_notification_new_with_status_icon
 
1523
+                                       (priv->event->header, message_esc, NULL, priv->icon);
 
1524
+                       } else {
 
1525
+                               priv->notification = notify_notification_new 
 
1526
+                                       (priv->event->header, message_esc, NULL, NULL);
 
1527
+                       }
 
1528
                        notify_notification_set_timeout (priv->notification,
 
1529
                                                         NOTIFY_EXPIRES_DEFAULT);
 
1530
 
 
1531
@@ -346,6 +397,94 @@
 
1532
                empathy_window_present (GTK_WINDOW (priv->window), TRUE);
1511
1533
        }
1512
1534
 }
1513
 
 
1514
1535
+#ifdef HAVE_LIBINDICATE
1515
1536
+static void
 
1537
+empathy_status_icon_set_visible (gboolean show_icon, EmpathyStatusIcon *icon)
 
1538
+{
 
1539
+       EmpathyStatusIconPriv *priv = GET_PRIV (icon); 
 
1540
+       gtk_status_icon_set_visible (priv->icon, show_icon);
 
1541
+}
 
1542
+
 
1543
+static void
 
1544
+empathy_indicator_interest_status_icon (gboolean icon_visibility, 
 
1545
+       EmpathyStatusIcon *icon)
 
1546
+{
 
1547
+        EmpathyIndicatorManager *manager;
 
1548
+       manager = empathy_indicator_manager_dup_singleton();
 
1549
+
 
1550
+        gboolean use_libindicate = FALSE;
 
1551
+        empathy_conf_get_bool (empathy_conf_get (),
 
1552
+                              EMPATHY_PREFS_UI_USE_LIBINDICATE,
 
1553
+                              &use_libindicate);
 
1554
+
 
1555
+        if (use_libindicate && !icon_visibility) {
 
1556
+                empathy_indicator_manager_set_server_visible (manager,
 
1557
+                                TRUE);
 
1558
+                /* Hide the status icon so there are not two ways to access
 
1559
+                * empathy.
 
1560
+                 */
 
1561
+               DEBUG ("Hiding the icon, we are shown in the indicator");
 
1562
+                empathy_status_icon_set_visible (FALSE, icon);
 
1563
+        } else {
 
1564
+                empathy_indicator_manager_set_server_visible (manager,
 
1565
+                                FALSE);
 
1566
+               DEBUG ("Show the icon, we are not shown in the indicator");
 
1567
+                empathy_status_icon_set_visible (TRUE, icon);
 
1568
+        }
 
1569
+}
 
1570
+
 
1571
+static void
 
1572
+empathy_indicator_interest_added (IndicateServer * server, 
 
1573
+       IndicateInterests interest, EmpathyStatusIcon *icon)
 
1574
+{
 
1575
+       if (interest != INDICATE_INTEREST_SERVER_SIGNAL) {
 
1576
+               return;
 
1577
+       }
 
1578
+       DEBUG ("Indicator received interest-added signal");
 
1579
+        empathy_indicator_interest_status_icon(FALSE, icon);
 
1580
+}
 
1581
+
 
1582
+static void
 
1583
+empathy_indicator_interest_removed (IndicateServer * server, 
 
1584
+       IndicateInterests interest, EmpathyStatusIcon *icon)
 
1585
+{
 
1586
+       if (interest != INDICATE_INTEREST_SERVER_SIGNAL) {
 
1587
+               return;
 
1588
+       }
 
1589
+
 
1590
+       DEBUG ("Indicator received interest-removed signal");
 
1591
+       empathy_indicator_interest_status_icon(TRUE, icon);
 
1592
+}
 
1593
+
 
1594
+static void
1516
1595
+status_icon_set_use_libindicate (EmpathyStatusIcon *icon,
1517
 
+                           gboolean           use_libindicate)
 
1596
+                           gboolean use_libindicate)
1518
1597
+{
1519
1598
+       EmpathyStatusIconPriv *priv = GET_PRIV (icon);
1520
1599
+
1521
1600
+       if (use_libindicate) {
1522
1601
+               empathy_indicator_manager_set_server_visible (priv->indicator_manager,
1523
 
+                               TRUE);
1524
 
+               /* Hide the status icon so there are not two ways to access empathy.
1525
 
+                * Should use libindicate's "interest" to confirm someone is listening.
1526
 
+                */
1527
 
+               gtk_status_icon_set_visible (priv->icon, FALSE);
 
1602
+                       TRUE);
1528
1603
+       } else {
1529
1604
+               empathy_indicator_manager_set_server_visible (priv->indicator_manager,
1530
 
+                               FALSE);
1531
 
+               gtk_status_icon_set_visible (priv->icon, TRUE);
 
1605
+                       FALSE);
 
1606
+               empathy_status_icon_set_visible(TRUE, icon);
1532
1607
+       }
1533
1608
+}
1534
 
+#endif
1535
1609
+
1536
 
 static void
1537
 
 status_icon_notify_visibility_cb (EmpathyConf *conf,
1538
 
                                  const gchar *key,
1539
 
@@ -360,16 +425,56 @@
1540
 
        }
1541
 
 }
1542
 
 
1543
 
+#ifdef HAVE_LIBINDICATE
1544
1610
+static void
1545
1611
+status_icon_notify_libindicate_cb (EmpathyConf *conf,
1546
1612
+                                 const gchar *key,
1554
1620
+       }
1555
1621
+}
1556
1622
+#endif
1557
 
+
 
1623
 
1558
1624
 static void
1559
 
 status_icon_toggle_visibility (EmpathyStatusIcon *icon)
1560
 
 {
 
1625
 status_icon_notify_visibility_cb (EmpathyConf *conf,
 
1626
@@ -366,10 +505,35 @@
1561
1627
        EmpathyStatusIconPriv *priv = GET_PRIV (icon);
1562
1628
        gboolean               visible;
1563
 
+#ifdef HAVE_LIBINDICATE
1564
 
+       gboolean               use_libindicate;
1565
 
+#endif
1566
1629
 
 
1630
+
1567
1631
        visible = gtk_window_is_active (priv->window);
1568
1632
+#ifdef HAVE_LIBINDICATE
 
1633
+       gboolean               use_libindicate;
1569
1634
+       empathy_conf_get_bool (empathy_conf_get (),
1570
1635
+                              EMPATHY_PREFS_UI_USE_LIBINDICATE,
1571
1636
+                              &use_libindicate);
1578
1643
+               visible = GTK_WIDGET_VISIBLE (priv->window);
1579
1644
+       }
1580
1645
+#endif
 
1646
+
1581
1647
        status_icon_set_visibility (icon, !visible, TRUE);
1582
1648
 }
1583
1649
 
1593
1659
 static void
1594
1660
 status_icon_idle_notify_cb (EmpathyStatusIcon *icon)
1595
1661
 {
1596
 
@@ -550,6 +655,10 @@
 
1662
@@ -550,6 +714,10 @@
1597
1663
        g_object_unref (priv->account_manager);
1598
1664
        g_object_unref (priv->event_manager);
1599
1665
        g_object_unref (priv->ui_manager);
1604
1670
 }
1605
1671
 
1606
1672
 static void
1607
 
@@ -585,6 +694,13 @@
 
1673
@@ -585,6 +753,14 @@
1608
1674
                                 status_icon_notify_visibility_cb,
1609
1675
                                 icon);
1610
1676
 
1611
1677
+#ifdef HAVE_LIBINDICATE
 
1678
+
1612
1679
+       empathy_conf_notify_add (empathy_conf_get (),
1613
1680
+                                EMPATHY_PREFS_UI_USE_LIBINDICATE,
1614
1681
+                                status_icon_notify_libindicate_cb,
1618
1685
        status_icon_create_menu (icon);
1619
1686
        status_icon_idle_notify_cb (icon);
1620
1687
 
1621
 
@@ -625,6 +741,9 @@
 
1688
@@ -625,6 +801,9 @@
1622
1689
        EmpathyStatusIconPriv *priv;
1623
1690
        EmpathyStatusIcon     *icon;
1624
1691
        gboolean               should_hide;
1628
1695
 
1629
1696
        g_return_val_if_fail (GTK_IS_WINDOW (window), NULL);
1630
1697
 
1631
 
@@ -632,6 +751,12 @@
 
1698
@@ -632,6 +811,24 @@
1632
1699
        priv = GET_PRIV (icon);
1633
1700
 
1634
1701
        priv->window = g_object_ref (window);
1635
1702
+#ifdef HAVE_LIBINDICATE
1636
1703
+       priv->indicator_manager = empathy_indicator_manager_dup_singleton ();
 
1704
+       priv->indicate_server = indicate_server_ref_default ();
 
1705
+
1637
1706
+       g_signal_connect (priv->indicator_manager, "server-activate",
1638
1707
+                         G_CALLBACK (indicate_server_activate_cb),
1639
1708
+                         icon);
 
1709
+
 
1710
+       g_signal_connect (priv->indicate_server,
 
1711
+                         INDICATE_SERVER_SIGNAL_INTEREST_ADDED,
 
1712
+                         G_CALLBACK(empathy_indicator_interest_added),
 
1713
+                         icon);
 
1714
+
 
1715
+       g_signal_connect (priv->indicate_server,
 
1716
+                         INDICATE_SERVER_SIGNAL_INTEREST_REMOVED,
 
1717
+                         G_CALLBACK(empathy_indicator_interest_removed),
 
1718
+                         icon);
1640
1719
+#endif
1641
1720
 
1642
1721
        g_signal_connect_after (priv->window, "key-press-event",
1643
1722
                          G_CALLBACK (status_icon_key_press_event_cb),
1644
 
@@ -649,6 +774,13 @@
 
1723
@@ -649,6 +846,13 @@
1645
1724
                should_hide = TRUE;
1646
1725
        }
1647
1726