Paste #wZCHzYnhcVfgKcAlObmm

Paste Details

reply | raw

posted on Jul 6, 2017, 7:29:34 AM

diff --git a/configure.ac.in b/configure.ac.in
index 588a388..10944da 100644
a/configure.ac.in
b/configure.ac.in
83 83 XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.11.0])
84 84 XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-${LIBXFCE4PANEL_VERSION_API}], [4.11.0])
85 85 XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.0])
86 INDICATOR_PKGNAME=indicator3-0.4
87 XDT_CHECK_PACKAGE([INDICATOR], [${INDICATOR_PKGNAME}], [12.10.1])
86 INDICATOR_PKGNAME=ayatana-indicator3-0.4
87 XDT_CHECK_PACKAGE([INDICATOR], [${INDICATOR_PKGNAME}], [0.5.0])
88 88
89 89 dnl ********************************************************************
90 90 dnl *** Check if libindicator has indicator-ng.h headery ***
…
92 92 dnl ********************************************************************
93 93 AC_LANG_PUSH([C])
94 94 CPPFLAGS=`$PKG_CONFIG --cflags ${INDICATOR_PKGNAME}`
95 AC_CHECK_HEADERS([libindicator/indicator-ng.h], [HAVE_INDICATOR_NG_H=yes], [HAVE_INDICATOR_NG_H=no])
95 AC_CHECK_HEADERS([libayatana-indicator/indicator-ng.h], [HAVE_INDICATOR_NG_H=yes], [HAVE_INDICATOR_NG_H=no])
96 96 AC_LANG_POP
97 97
98 98 dnl ****************************
99 99 dnl *** Optional IDO library ***
100 100 dnl ****************************
101 XDT_CHECK_OPTIONAL_PACKAGE([IDO], [libido3-0.1], [13.10.0], [ido], [IDO library])
101 XDT_CHECK_OPTIONAL_PACKAGE([IDO], [libayatana-ido3-0.4], [0.4.0], [ido], [IDO library])
102 102
103 103 dnl ***********************************
104 104 dnl *** Check for debugging support *** 
diff --git a/panel-plugin/indicator-box.c b/panel-plugin/indicator-box.c
index 66523d6..98d8549 100644
a/panel-plugin/indicator-box.c
b/panel-plugin/indicator-box.c
28 28 #include <gtk/gtk.h>
29 29 //#include <exo/exo.h>
30 30 #include <libxfce4panel/libxfce4panel.h>
31 #include <libindicator/indicator-object.h>
31 #include <libayatana-indicator/indicator-object.h>
32 32
33 33 #include "indicator-box.h"
34 34 #include "indicator-button.h" 
diff --git a/panel-plugin/indicator-box.h b/panel-plugin/indicator-box.h
index 8647e04..b5ca139 100644
a/panel-plugin/indicator-box.h
b/panel-plugin/indicator-box.h
20 20
21 21 #include <glib.h>
22 22 #include <gtk/gtk.h>
23 #include <libindicator/indicator-object.h>
23 #include <libayatana-indicator/indicator-object.h>
24 24 #include <libxfce4panel/libxfce4panel.h>
25 25 #include "indicator-config.h"
26 26 
diff --git a/panel-plugin/indicator-button.c b/panel-plugin/indicator-button.c
index aa89c41..4c26a1a 100644
a/panel-plugin/indicator-button.c
b/panel-plugin/indicator-button.c
28 28 #include <glib.h>
29 29 #include <gtk/gtk.h>
30 30 #include <libxfce4panel/libxfce4panel.h>
31 #include <libindicator/indicator-object.h>
31 #include <libayatana-indicator/indicator-object.h>
32 32
33 33 #include "indicator-button.h"
34 34 #include "indicator-button-box.h"
35 35
36 36
37 #include <libindicator/indicator-object.h>
37 #include <libayatana-indicator/indicator-object.h>
38 38
39 39 #define ICON_SIZE 22
40 40 #define SPACING 2 
diff --git a/panel-plugin/indicator-button.h b/panel-plugin/indicator-button.h
index f0f1610..aa2c808 100644
a/panel-plugin/indicator-button.h
b/panel-plugin/indicator-button.h
20 20
21 21 #include <glib.h>
22 22 #include <gtk/gtk.h>
23 #include <libindicator/indicator-object.h>
23 #include <libayatana-indicator/indicator-object.h>
24 24
25 25 #include "indicator-config.h"
26 26 #include "indicator-box.h" 
diff --git a/panel-plugin/indicator.c b/panel-plugin/indicator.c
index 475e230..4b25c4d 100644
a/panel-plugin/indicator.c
b/panel-plugin/indicator.c
37 37 #include <gtk/gtk.h>
38 38 #include <libxfce4util/libxfce4util.h>
39 39 #include <libxfce4panel/xfce-panel-plugin.h>
40 #include <libindicator/indicator-object.h>
40 #include <libayatana-indicator/indicator-object.h>
41 41 #ifdef HAVE_LIBINDICATOR_INDICATOR_NG_H
42 #include <libindicator/indicator-ng.h>
42 #include <libayatana-indicator/indicator-ng.h>
43 43 #endif
44 44
45 45 #include "indicator.h"
…
48 48 #include "indicator-dialog.h"
49 49
50 50 #ifdef HAVE_IDO
51 #include <libido/libido.h>
51 #include <libayatana-ido/libayatana-ido.h>
52 52 #endif
53 53
54 54 /* prototypes */