File xfce4-indicator-plugin-ayatana-indicator.patch of Package xfce4-panel-plugin-indicator

Overview Repositories Revisions Requests Users Attributes Meta

File xfce4-indicator-plugin-ayatana-indicator.patch of Package xfce4-panel-plugin-indicator (Revision c4bda8796c3f459ad6d0783c1577c7a0)

Currently displaying revision c4bda8796c3f459ad6d0783c1577c7a0 , Show latest

--- a/configure.ac
+++ b/configure.ac
@@ -90,8 +90,8 @@ XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0
         AC_DEFINE([XFCONF_LEGACY], [], [Use dbus-glib provided by xfconf 4.12 to obtain array type])
         XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.0])
 ])
-INDICATOR_PKGNAME=indicator3-0.4
-XDT_CHECK_PACKAGE([INDICATOR], [${INDICATOR_PKGNAME}], [12.10.1])
+INDICATOR_PKGNAME=ayatana-indicator3-0.4
+XDT_CHECK_PACKAGE([INDICATOR], [${INDICATOR_PKGNAME}], [0.6.0])
 
 dnl ********************************************************************
 dnl *** Check if libindicator has indicator-ng.h headery             ***
@@ -99,13 +99,13 @@ dnl *** At the moment this cannot be der
 dnl ********************************************************************
 AC_LANG_PUSH([C])
 CPPFLAGS=`$PKG_CONFIG --cflags ${INDICATOR_PKGNAME}`
-AC_CHECK_HEADERS([libindicator/indicator-ng.h], [HAVE_INDICATOR_NG_H=yes], [HAVE_INDICATOR_NG_H=no])
+AC_CHECK_HEADERS([libayatana-indicator/indicator-ng.h], [HAVE_INDICATOR_NG_H=yes], [HAVE_INDICATOR_NG_H=no])
 AC_LANG_POP
 
 dnl ****************************
 dnl *** Optional IDO library ***
 dnl ****************************
-XDT_CHECK_OPTIONAL_PACKAGE([IDO], [libido3-0.1], [13.10.0], [ido], [IDO library])
+XDT_CHECK_OPTIONAL_PACKAGE([IDO], [libayatana-ido3-0.4], [0.4.0], [ido], [IDO library])
 
 dnl ***********************************
 dnl *** Check for debugging support ***
--- a/panel-plugin/indicator-box.c
+++ b/panel-plugin/indicator-box.c
@@ -27,7 +27,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 #include <libxfce4panel/libxfce4panel.h>
-#include <libindicator/indicator-object.h>
+#include <libayatana-indicator/indicator-object.h>
 
 #include "indicator-box.h"
 #include "indicator-button.h"
--- a/panel-plugin/indicator-box.h
+++ b/panel-plugin/indicator-box.h
@@ -20,7 +20,7 @@
 
 #include <glib.h>
 #include <gtk/gtk.h>
-#include <libindicator/indicator-object.h>
+#include <libayatana-indicator/indicator-object.h>
 #include <libxfce4panel/libxfce4panel.h>
 #include "indicator-config.h"
 
--- a/panel-plugin/indicator-button.c
+++ b/panel-plugin/indicator-button.c
@@ -28,14 +28,12 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 #include <libxfce4panel/libxfce4panel.h>
-#include <libindicator/indicator-object.h>
+#include <libayatana-indicator/indicator-object.h>
 
 #include "indicator-button.h"
 #include "indicator-button-box.h"
 
 
-#include <libindicator/indicator-object.h>
-
 #define ICON_SIZE 22
 #define SPACING 2
 
--- a/panel-plugin/indicator-button.h
+++ b/panel-plugin/indicator-button.h
@@ -20,7 +20,7 @@
 
 #include <glib.h>
 #include <gtk/gtk.h>
-#include <libindicator/indicator-object.h>
+#include <libayatana-indicator/indicator-object.h>
 
 #include "indicator-config.h"
 #include "indicator-box.h"
--- a/panel-plugin/indicator.c
+++ b/panel-plugin/indicator.c
@@ -37,9 +37,9 @@
 #include <gtk/gtk.h>
 #include <libxfce4util/libxfce4util.h>
 #include <libxfce4panel/xfce-panel-plugin.h>
-#include <libindicator/indicator-object.h>
+#include <libayatana-indicator/indicator-object.h>
 #ifdef HAVE_LIBINDICATOR_INDICATOR_NG_H
-#include <libindicator/indicator-ng.h>
+#include <libayatana-indicator/indicator-ng.h>
 #endif
 
 #include "indicator.h"
@@ -48,7 +48,7 @@
 #include "indicator-dialog.h"
 
 #ifdef HAVE_IDO
-#include <libido/libido.h>
+#include <libayatana-ido/libayatana-ido.h>
 #endif
 
 /* prototypes */
--- a/panel-plugin/indicator-dialog.c
+++ b/panel-plugin/indicator-dialog.c
@@ -53,26 +53,26 @@
 static const gchar *pretty_names[][3] =
 {
   /* raw name,                           pretty name,                                 icon-name(?) */
-  { "libapplication.so",                 N_("Application Indicators"),               "application-default-icon" },
-  { "libsoundmenu.so",                   N_("Sound Menu"),                           "preferences-desktop-sound" },
-  { "com.canonical.indicator.sound",     N_("Sound Menu"),                           "preferences-desktop-sound" },
-  { "libprintersmenu.so",                N_("Printers Menu"),                        "printer" },
-  { "libpower.so",                       N_("Power Management"),                     NULL },
-  { "com.canonical.indicator.power",     N_("Power Management"),                     NULL },
-  { "libappmenu.so",                     N_("Application Menus (Global Menu)"),      "menu-editor" },
-  { "libsession.so",                     N_("Session Management"),                   NULL },
-  { "com.canonical.indicator.session",   N_("Session Management"),                   NULL },
-  { "libmessaging.so",                   N_("Messaging Menu"),                       "indicator-messages-new" },
-  { "com.canonical.indicator.messages",  N_("Messaging Menu"),                       "indicator-messages-new" },
-  { "libdatetime.so",                    N_("Date and Time"),                        "time-admin" },
-  { "com.canonical.indicator.datetime",  N_("Date and Time"),                        "time-admin" },
-  { "libbluetooth.so",                   N_("Bluetooth"),                            "bluetooth-active" },
-  { "com.canonical.indicator.bluetooth", N_("Bluetooth"),                            "bluetooth-active" },
-  { "libsyncindicator.so",               N_("Sync Menu"),                            "sync-client-updating" },
-  { "com.canonical.indicator.keyboard",  N_("Keyboard"),                             NULL },
-  { "com.canonical.indicator.location",  N_("Location"),                             NULL },
-  { "com.canonical.indicator.network",   N_("Network"),                              NULL },
-  { "libworkrave.so",                    N_("Workrave"),                             "workrave" },
+  { "libayatana-application.so",         N_("Application Indicators"),               "application-default-icon" },
+  { "libayatana-soundmenu.so",           N_("Sound Menu"),                           "preferences-desktop-sound" },
+  { "org.ayatana.indicator.sound",       N_("Sound Menu"),                           "preferences-desktop-sound" },
+  { "libayatana-printersmenu.so",        N_("Printers Menu"),                        "printer" },
+  { "libayatana-power.so",               N_("Power Management"),                     NULL },
+  { "org.ayatana.indicator.power",       N_("Power Management"),                     NULL },
+  { "libayatana-appmenu.so",             N_("Application Menus (Global Menu)"),      "menu-editor" },
+  { "libayatana-session.so",             N_("Session Management"),                   NULL },
+  { "org.ayatana.indicator.session",     N_("Session Management"),                   NULL },
+  { "libayatana-messaging.so",           N_("Messaging Menu"),                       "indicator-messages-new" },
+  { "org.ayatana.indicator.messages",    N_("Messaging Menu"),                       "indicator-messages-new" },
+  { "libayatana-datetime.so",            N_("Date and Time"),                        "time-admin" },
+  { "org.ayatana.indicator.datetime",    N_("Date and Time"),                        "time-admin" },
+  { "libayatana-bluetooth.so",           N_("Bluetooth"),                            "bluetooth-active" },
+  { "org.ayatana.indicator.bluetooth",   N_("Bluetooth"),                            "bluetooth-active" },
+  { "libayatana-syncindicator.so",       N_("Sync Menu"),                            "sync-client-updating" },
+  { "org.ayatana.indicator.keyboard",    N_("Keyboard"),                             NULL },
+  { "org.ayatana.indicator.location",    N_("Location"),                             NULL },
+  { "org.ayatana.indicator.network",     N_("Network"),                              NULL },
+  { "libayatana-workrave.so",            N_("Workrave"),                             "workrave" },
 };

Places

File xfce4-indicator-plugin-ayatana-indicator.patch of Package xfce4-panel-plugin-indicator (Revision c4bda8796c3f459ad6d0783c1577c7a0)

Places