From 26c8bb5e185dd06ce4f90ff51c97f5d21d3c2758 Mon Sep 17 00:00:00 2001 From: Daniel Kondor Date: Tue, 16 Jan 2024 22:39:31 +0100 Subject: [PATCH 01/24] shortcuts: be careful when modifying the icon list --- shortcuts/src/applet-bookmarks.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/shortcuts/src/applet-bookmarks.c b/shortcuts/src/applet-bookmarks.c index b8fb2e2d2..4060faf97 100755 --- a/shortcuts/src/applet-bookmarks.c +++ b/shortcuts/src/applet-bookmarks.c @@ -167,10 +167,15 @@ void cd_shortcuts_on_bookmarks_event (CairoDockFMEventType iEventType, const gch GldiContainer *pContainer = CD_APPLET_MY_ICONS_LIST_CONTAINER; CD_APPLET_LEAVE_IF_FAIL (pContainer != NULL); - // split the list: items can have been removed + // make a copy of a sublist that can be manipulated independently + // of pIconsList which is part of our subdock's icons pOldBookmarkList = pIconsList->next; - pIconsList->next = NULL; - pOldBookmarkList->prev = NULL; + if (pOldBookmarkList) + { + pOldBookmarkList->prev = NULL; + pOldBookmarkList = g_list_copy (pOldBookmarkList); + pIconsList->next->prev = pIconsList; + } // Bookmarks file has been modified if (iEventType == CAIRO_DOCK_FILE_CREATED || iEventType == CAIRO_DOCK_FILE_MODIFIED) @@ -222,7 +227,6 @@ void cd_shortcuts_on_bookmarks_event (CairoDockFMEventType iEventType, const gch pExistingIcon = pExistingIconNode->data; // move this node to the subdock icons list pOldBookmarkList = g_list_delete_link (pOldBookmarkList, pExistingIconNode); - pIconsList = g_list_insert (pIconsList, pExistingIcon, 1); // after the home, will be sorted later if (cUserName && g_strcmp0 (pExistingIcon->cName, cUserName) != 0) { CD_APPLET_REMOVE_ICON_FROM_MY_ICONS_LIST (pExistingIcon); // will destroy it @@ -230,7 +234,7 @@ void cd_shortcuts_on_bookmarks_event (CairoDockFMEventType iEventType, const gch } else { - fCurrentOrder++; + pExistingIcon->fOrder = fCurrentOrder++; g_free (cOneBookmark); } } @@ -255,8 +259,6 @@ void cd_shortcuts_on_bookmarks_event (CairoDockFMEventType iEventType, const gch } g_free (cBookmarksList); - _remove_old_icons_and_free_list (pOldBookmarkList); - /* Again, since 'Home Folder' is always the first bookmark, * the head of the list won't change even if there are only bookmarks * (so we don't need to re-assigne it to the container). @@ -264,6 +266,7 @@ void cd_shortcuts_on_bookmarks_event (CairoDockFMEventType iEventType, const gch cairo_dock_sort_icons_by_order (pIconsList); } } + _remove_old_icons_and_free_list (pOldBookmarkList); CD_APPLET_LEAVE(); } From 48a6254b8b656e51ce1b35a5304f73e971156d55 Mon Sep 17 00:00:00 2001 From: Daniel Kondor Date: Wed, 17 Jan 2024 23:28:10 +0100 Subject: [PATCH 02/24] shortcuts: fix sorting the icon list --- shortcuts/src/applet-bookmarks.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/shortcuts/src/applet-bookmarks.c b/shortcuts/src/applet-bookmarks.c index 4060faf97..7234235ba 100755 --- a/shortcuts/src/applet-bookmarks.c +++ b/shortcuts/src/applet-bookmarks.c @@ -153,28 +153,29 @@ void cd_shortcuts_on_bookmarks_event (CairoDockFMEventType iEventType, const gch GList *pOldBookmarkList; Icon *icon; GList *ic; + double fCurrentOrder = 1.; // optimization: skip the disks and networks, and point on the first bookmark. for (ic = pIconsList; ic != NULL; ic = ic->next) { icon = ic->data; + icon->fOrder = fCurrentOrder++; if (icon->iGroup == (CairoDockIconGroup) CD_BOOKMARK_GROUP) break; } /* Note that since the first bookmark is always the Home Folder, * 'pIconsList' will never change when inserting/removing a bookmark. */ - pIconsList = ic; GldiContainer *pContainer = CD_APPLET_MY_ICONS_LIST_CONTAINER; CD_APPLET_LEAVE_IF_FAIL (pContainer != NULL); // make a copy of a sublist that can be manipulated independently // of pIconsList which is part of our subdock's icons - pOldBookmarkList = pIconsList->next; + pOldBookmarkList = ic->next; if (pOldBookmarkList) { pOldBookmarkList->prev = NULL; pOldBookmarkList = g_list_copy (pOldBookmarkList); - pIconsList->next->prev = pIconsList; + ic->next->prev = ic; } // Bookmarks file has been modified @@ -202,7 +203,6 @@ void cd_shortcuts_on_bookmarks_event (CairoDockFMEventType iEventType, const gch * reorder each icon in case a bookmark has changed its place, or * if a new one appeared (the first one is always the Home Folder). */ - double fCurrentOrder = 1.; gchar *cOneBookmark; Icon *pNewIcon, *pExistingIcon; GList *pExistingIconNode; From 2b9848c3192bf3ea4d57334424d62d422a26324e Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 8 Mar 2024 16:10:48 +0900 Subject: [PATCH 03/24] vala: move generated C source from vala source properly valac generates C source from vala source and outputs the result on the same directory as vala source. But cmake working directory may be different from the vala source directory. So to move generated source properly, specify the origination directory for mv command explicitly. --- Dbus/interfaces/vala/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dbus/interfaces/vala/CMakeLists.txt b/Dbus/interfaces/vala/CMakeLists.txt index d3047694e..f3d7d5fd2 100644 --- a/Dbus/interfaces/vala/CMakeLists.txt +++ b/Dbus/interfaces/vala/CMakeLists.txt @@ -26,7 +26,7 @@ if ("${VALAC_FOUND}" STREQUAL "TRUE") -o ${CDAPPLET}.c ${CMAKE_CURRENT_SOURCE_DIR}/${CDAPPLET}.vala) # it seems that valac can only produce the output c file into the current directory... - execute_process(COMMAND mv ${CDAPPLET}.c ${VALA_DIR}/src/${CDAPPLET}.c) + execute_process(COMMAND mv ${CMAKE_CURRENT_SOURCE_DIR}/${CDAPPLET}.c ${VALA_DIR}/src/${CDAPPLET}.c) # valac is a bad boy, it messes up the signal names. execute_process(COMMAND From 48a51b7524b2e933b3a98abda60dc21243f58e5b Mon Sep 17 00:00:00 2001 From: Daniel Kondor Date: Sat, 9 Mar 2024 13:13:58 +0100 Subject: [PATCH 04/24] Dbus: remove code generated by valac These should be regenerated during the build. See also https://github.com/Cairo-Dock/cairo-dock-plug-ins/pull/16 --- Dbus/interfaces/vala/src/CDApplet.c | 3530 --------------------- Dbus/interfaces/vala/src/CDApplet.h | 244 -- Dbus/interfaces/vala/src/CDApplet.vapi | 127 - Dbus/interfaces/vala/src/ValaVapiPath.txt | 1 - 4 files changed, 3902 deletions(-) delete mode 100644 Dbus/interfaces/vala/src/CDApplet.c delete mode 100644 Dbus/interfaces/vala/src/CDApplet.h delete mode 100644 Dbus/interfaces/vala/src/CDApplet.vapi delete mode 100644 Dbus/interfaces/vala/src/ValaVapiPath.txt diff --git a/Dbus/interfaces/vala/src/CDApplet.c b/Dbus/interfaces/vala/src/CDApplet.c deleted file mode 100644 index 1a072cc81..000000000 --- a/Dbus/interfaces/vala/src/CDApplet.c +++ /dev/null @@ -1,3530 +0,0 @@ -/* CDApplet.c generated by valac 0.10.0, the Vala compiler - * generated from CDApplet.vala, do not modify */ - -/* This is a part of the external applet for Cairo-Dock - -Copyright : (C) 2010-2011 by Fabounet -E-mail : fabounet@glx-dock.org - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. -http://www.gnu.org/licenses/licenses.html#GPL */ -/*/ To compile it manually:*/ -/*/ valac -q -C --disable-warnings --disable-dbus-transformation --pkg gio-2.0 --vapi=CDApplet-simple.vapi --internal-vapi=CDApplet.vapi --header=CDApplet-simple.h --internal-header=CDApplet.h CDApplet.vala*/ -/*/ gcc --shared -fPIC -o CDApplet.so $(pkg-config --cflags --libs gobject-2.0 gio-2.0) CDApplet.c*/ -/*///////////////////////*/ -/*/// dependancies //////*/ -/*///////////////////////*/ - -#include -#include -#include -#include -#include -#include -#include - - -#define CAIRO_DOCK_APPLET_TYPE_IAPPLET (cairo_dock_applet_iapplet_get_type ()) -#define CAIRO_DOCK_APPLET_IAPPLET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CAIRO_DOCK_APPLET_TYPE_IAPPLET, CairoDockAppletIApplet)) -#define CAIRO_DOCK_APPLET_IS_IAPPLET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CAIRO_DOCK_APPLET_TYPE_IAPPLET)) -#define CAIRO_DOCK_APPLET_IAPPLET_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), CAIRO_DOCK_APPLET_TYPE_IAPPLET, CairoDockAppletIAppletIface)) - -typedef struct _CairoDockAppletIApplet CairoDockAppletIApplet; -typedef struct _CairoDockAppletIAppletIface CairoDockAppletIAppletIface; - -#define CAIRO_DOCK_APPLET_TYPE_IAPPLET_PROXY (cairo_dock_applet_iapplet_proxy_get_type ()) -typedef GDBusProxy CairoDockAppletIAppletProxy; -typedef GDBusProxyClass CairoDockAppletIAppletProxyClass; -#define _g_free0(var) (var = (g_free (var), NULL)) -#define _g_variant_unref0(var) ((var == NULL) ? NULL : (var = (g_variant_unref (var), NULL))) -#define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL))) - -#define CAIRO_DOCK_APPLET_TYPE_ISUB_APPLET (cairo_dock_applet_isub_applet_get_type ()) -#define CAIRO_DOCK_APPLET_ISUB_APPLET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CAIRO_DOCK_APPLET_TYPE_ISUB_APPLET, CairoDockAppletISubApplet)) -#define CAIRO_DOCK_APPLET_IS_ISUB_APPLET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CAIRO_DOCK_APPLET_TYPE_ISUB_APPLET)) -#define CAIRO_DOCK_APPLET_ISUB_APPLET_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), CAIRO_DOCK_APPLET_TYPE_ISUB_APPLET, CairoDockAppletISubAppletIface)) - -typedef struct _CairoDockAppletISubApplet CairoDockAppletISubApplet; -typedef struct _CairoDockAppletISubAppletIface CairoDockAppletISubAppletIface; - -#define CAIRO_DOCK_APPLET_TYPE_ISUB_APPLET_PROXY (cairo_dock_applet_isub_applet_proxy_get_type ()) -typedef GDBusProxy CairoDockAppletISubAppletProxy; -typedef GDBusProxyClass CairoDockAppletISubAppletProxyClass; - -#define CAIRO_DOCK_APPLET_TYPE_CD_APPLET (cairo_dock_applet_cd_applet_get_type ()) -#define CAIRO_DOCK_APPLET_CD_APPLET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CAIRO_DOCK_APPLET_TYPE_CD_APPLET, CairoDockAppletCDApplet)) -#define CAIRO_DOCK_APPLET_CD_APPLET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CAIRO_DOCK_APPLET_TYPE_CD_APPLET, CairoDockAppletCDAppletClass)) -#define CAIRO_DOCK_APPLET_IS_CD_APPLET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CAIRO_DOCK_APPLET_TYPE_CD_APPLET)) -#define CAIRO_DOCK_APPLET_IS_CD_APPLET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CAIRO_DOCK_APPLET_TYPE_CD_APPLET)) -#define CAIRO_DOCK_APPLET_CD_APPLET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CAIRO_DOCK_APPLET_TYPE_CD_APPLET, CairoDockAppletCDAppletClass)) - -typedef struct _CairoDockAppletCDApplet CairoDockAppletCDApplet; -typedef struct _CairoDockAppletCDAppletClass CairoDockAppletCDAppletClass; -typedef struct _CairoDockAppletCDAppletPrivate CairoDockAppletCDAppletPrivate; - -#define CAIRO_DOCK_APPLET_CD_APPLET_TYPE_SCREEN_POSITION (cairo_dock_applet_cd_applet_screen_position_get_type ()) - -#define CAIRO_DOCK_APPLET_CD_APPLET_TYPE_CONTAINER_TYPE (cairo_dock_applet_cd_applet_container_type_get_type ()) - -#define CAIRO_DOCK_APPLET_CD_APPLET_TYPE_EMBLEM_POSITION (cairo_dock_applet_cd_applet_emblem_position_get_type ()) - -#define CAIRO_DOCK_APPLET_CD_APPLET_TYPE_MENU_ITEM_TYPE (cairo_dock_applet_cd_applet_menu_item_type_get_type ()) -#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) -#define _g_main_loop_unref0(var) ((var == NULL) ? NULL : (var = (g_main_loop_unref (var), NULL))) -#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) -#define _g_key_file_free0(var) ((var == NULL) ? NULL : (var = (g_key_file_free (var), NULL))) - -struct _CairoDockAppletIAppletIface { - GTypeInterface parent_iface; - GVariant* (*Get) (CairoDockAppletIApplet* self, const char* cProperty, GError** error); - GHashTable* (*GetAll) (CairoDockAppletIApplet* self, GError** error); - void (*SetQuickInfo) (CairoDockAppletIApplet* self, const char* cQuickInfo, GError** error); - void (*SetLabel) (CairoDockAppletIApplet* self, const char* cLabel, GError** error); - void (*SetIcon) (CairoDockAppletIApplet* self, const char* cImage, GError** error); - void (*SetEmblem) (CairoDockAppletIApplet* self, const char* cImage, gint iPosition, GError** error); - void (*Animate) (CairoDockAppletIApplet* self, const char* cAnimation, gint iRounds, GError** error); - void (*DemandsAttention) (CairoDockAppletIApplet* self, gboolean bStart, const char* cAnimation, GError** error); - void (*ShowDialog) (CairoDockAppletIApplet* self, const char* cMessage, gint iDuration, GError** error); - void (*PopupDialog) (CairoDockAppletIApplet* self, GHashTable* hDialogAttributes, GHashTable* hWidgetAttributes, GError** error); - void (*AddDataRenderer) (CairoDockAppletIApplet* self, const char* cType, gint iNbValues, const char* cTheme, GError** error); - void (*RenderValues) (CairoDockAppletIApplet* self, double* pValues, int pValues_length1, GError** error); - void (*ControlAppli) (CairoDockAppletIApplet* self, const char* cApplicationClass, GError** error); - void (*ShowAppli) (CairoDockAppletIApplet* self, gboolean bShow, GError** error); - void (*AddMenuItems) (CairoDockAppletIApplet* self, GHashTable** pItems, int pItems_length1, GError** error); - void (*BindShortkey) (CairoDockAppletIApplet* self, char** cShortkeys, int cShortkeys_length1, GError** error); -}; - -struct _CairoDockAppletISubAppletIface { - GTypeInterface parent_iface; - void (*SetQuickInfo) (CairoDockAppletISubApplet* self, const char* cQuickInfo, const char* cIconID, GError** error); - void (*SetLabel) (CairoDockAppletISubApplet* self, const char* cLabel, const char* cIconID, GError** error); - void (*SetIcon) (CairoDockAppletISubApplet* self, const char* cImage, const char* cIconID, GError** error); - void (*SetEmblem) (CairoDockAppletISubApplet* self, const char* cImage, gint iPosition, const char* cIconID, GError** error); - void (*Animate) (CairoDockAppletISubApplet* self, const char* cAnimation, gint iNbRounds, const char* cIconID, GError** error); - void (*ShowDialog) (CairoDockAppletISubApplet* self, const char* message, gint iDuration, const char* cIconID, GError** error); - void (*AddSubIcons) (CairoDockAppletISubApplet* self, char** pIconFields, int pIconFields_length1, GError** error); - void (*RemoveSubIcon) (CairoDockAppletISubApplet* self, const char* cIconID, GError** error); -}; - -struct _CairoDockAppletCDApplet { - GObject parent_instance; - CairoDockAppletCDAppletPrivate * priv; - CairoDockAppletIApplet* icon; - CairoDockAppletISubApplet* sub_icons; - char* cAppletName; - char* cConfFile; - char* cParentAppName; - char* cBusPath; -}; - -struct _CairoDockAppletCDAppletClass { - GObjectClass parent_class; - void (*on_click) (CairoDockAppletCDApplet* self, gint iState); - void (*on_middle_click) (CairoDockAppletCDApplet* self); - void (*on_build_menu) (CairoDockAppletCDApplet* self); - void (*on_menu_select) (CairoDockAppletCDApplet* self, gint iNumEntry); - void (*on_scroll) (CairoDockAppletCDApplet* self, gboolean bScrollUp); - void (*on_drop_data) (CairoDockAppletCDApplet* self, const char* cReceivedData); - void (*on_answer) (CairoDockAppletCDApplet* self, GVariant* answer); - void (*on_answer_dialog) (CairoDockAppletCDApplet* self, gint iButton, GVariant* answer); - void (*on_shortkey) (CairoDockAppletCDApplet* self, const char* cKey); - void (*on_change_focus) (CairoDockAppletCDApplet* self, gboolean bIsActive); - void (*on_click_sub_icon) (CairoDockAppletCDApplet* self, gint iState, const char* cIconID); - void (*on_middle_click_sub_icon) (CairoDockAppletCDApplet* self, const char* cIconID); - void (*on_scroll_sub_icon) (CairoDockAppletCDApplet* self, gboolean bScrollUp, const char* cIconID); - void (*on_drop_data_sub_icon) (CairoDockAppletCDApplet* self, const char* cReceivedData, const char* cIconID); - void (*on_build_menu_sub_icon) (CairoDockAppletCDApplet* self, const char* cIconID); - void (*on_menu_select_sub_icon) (CairoDockAppletCDApplet* self, gint iNumEntry, const char* cIconID); - void (*begin) (CairoDockAppletCDApplet* self); - void (*end) (CairoDockAppletCDApplet* self); - void (*reload) (CairoDockAppletCDApplet* self); - void (*get_config) (CairoDockAppletCDApplet* self, GKeyFile* keyfile); -}; - -struct _CairoDockAppletCDAppletPrivate { - GMainLoop* loop; - char* _cMenuIconId; -}; - -typedef enum { - CAIRO_DOCK_APPLET_CD_APPLET_SCREEN_POSITION_BOTTOM = 0, - CAIRO_DOCK_APPLET_CD_APPLET_SCREEN_POSITION_TOP, - CAIRO_DOCK_APPLET_CD_APPLET_SCREEN_POSITION_RIGHT, - CAIRO_DOCK_APPLET_CD_APPLET_SCREEN_POSITION_LEFT -} CairoDockAppletCDAppletScreenPosition; - -typedef enum { - CAIRO_DOCK_APPLET_CD_APPLET_CONTAINER_TYPE_DOCK = 0, - CAIRO_DOCK_APPLET_CD_APPLET_CONTAINER_TYPE_DESKLET -} CairoDockAppletCDAppletContainerType; - -typedef enum { - CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_UPPER_LEFT = 0, - CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_LOWER_RIGHT, - CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_LOWER_LEFT, - CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_UPPER_RIGHT, - CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_MIDDLE -} CairoDockAppletCDAppletEmblemPosition; - -typedef enum { - CAIRO_DOCK_APPLET_CD_APPLET_MENU_ITEM_TYPE_MENU_ENTRY = 0, - CAIRO_DOCK_APPLET_CD_APPLET_MENU_ITEM_TYPE_MENU_SUB_MENU, - CAIRO_DOCK_APPLET_CD_APPLET_MENU_ITEM_TYPE_MENU_SEPARATOR, - CAIRO_DOCK_APPLET_CD_APPLET_MENU_ITEM_TYPE_MENU_CHECKBOX, - CAIRO_DOCK_APPLET_CD_APPLET_MENU_ITEM_TYPE_MENU_RADIO_BUTTON -} CairoDockAppletCDAppletMenuItemType; - - -static gpointer cairo_dock_applet_cd_applet_parent_class = NULL; - -GType cairo_dock_applet_iapplet_proxy_get_type (void) G_GNUC_CONST; -guint cairo_dock_applet_iapplet_register_object (void* object, GDBusConnection* connection, const gchar* path, GError** error); -GType cairo_dock_applet_iapplet_get_type (void) G_GNUC_CONST; -GVariant* cairo_dock_applet_iapplet_Get (CairoDockAppletIApplet* self, const char* cProperty, GError** error); -GHashTable* cairo_dock_applet_iapplet_GetAll (CairoDockAppletIApplet* self, GError** error); -void cairo_dock_applet_iapplet_SetQuickInfo (CairoDockAppletIApplet* self, const char* cQuickInfo, GError** error); -void cairo_dock_applet_iapplet_SetLabel (CairoDockAppletIApplet* self, const char* cLabel, GError** error); -void cairo_dock_applet_iapplet_SetIcon (CairoDockAppletIApplet* self, const char* cImage, GError** error); -void cairo_dock_applet_iapplet_SetEmblem (CairoDockAppletIApplet* self, const char* cImage, gint iPosition, GError** error); -void cairo_dock_applet_iapplet_Animate (CairoDockAppletIApplet* self, const char* cAnimation, gint iRounds, GError** error); -void cairo_dock_applet_iapplet_DemandsAttention (CairoDockAppletIApplet* self, gboolean bStart, const char* cAnimation, GError** error); -void cairo_dock_applet_iapplet_ShowDialog (CairoDockAppletIApplet* self, const char* cMessage, gint iDuration, GError** error); -void cairo_dock_applet_iapplet_PopupDialog (CairoDockAppletIApplet* self, GHashTable* hDialogAttributes, GHashTable* hWidgetAttributes, GError** error); -void cairo_dock_applet_iapplet_AddDataRenderer (CairoDockAppletIApplet* self, const char* cType, gint iNbValues, const char* cTheme, GError** error); -void cairo_dock_applet_iapplet_RenderValues (CairoDockAppletIApplet* self, double* pValues, int pValues_length1, GError** error); -void cairo_dock_applet_iapplet_ControlAppli (CairoDockAppletIApplet* self, const char* cApplicationClass, GError** error); -void cairo_dock_applet_iapplet_ShowAppli (CairoDockAppletIApplet* self, gboolean bShow, GError** error); -void cairo_dock_applet_iapplet_AddMenuItems (CairoDockAppletIApplet* self, GHashTable** pItems, int pItems_length1, GError** error); -void cairo_dock_applet_iapplet_BindShortkey (CairoDockAppletIApplet* self, char** cShortkeys, int cShortkeys_length1, GError** error); -static void cairo_dock_applet_iapplet_proxy_g_signal (GDBusProxy* proxy, const gchar* sender_name, const gchar* signal_name, GVariant* parameters); -static void _dbus_handle_cairo_dock_applet_iapplet_on_click (CairoDockAppletIApplet* self, GVariant* parameters); -static void _dbus_handle_cairo_dock_applet_iapplet_on_middle_click (CairoDockAppletIApplet* self, GVariant* parameters); -static void _dbus_handle_cairo_dock_applet_iapplet_on_build_menu (CairoDockAppletIApplet* self, GVariant* parameters); -static void _dbus_handle_cairo_dock_applet_iapplet_on_menu_select (CairoDockAppletIApplet* self, GVariant* parameters); -static void _dbus_handle_cairo_dock_applet_iapplet_on_scroll (CairoDockAppletIApplet* self, GVariant* parameters); -static void _dbus_handle_cairo_dock_applet_iapplet_on_drop_data (CairoDockAppletIApplet* self, GVariant* parameters); -static void _dbus_handle_cairo_dock_applet_iapplet_on_answer (CairoDockAppletIApplet* self, GVariant* parameters); -static void _dbus_handle_cairo_dock_applet_iapplet_on_answer_dialog (CairoDockAppletIApplet* self, GVariant* parameters); -static void _dbus_handle_cairo_dock_applet_iapplet_on_shortkey (CairoDockAppletIApplet* self, GVariant* parameters); -static void _dbus_handle_cairo_dock_applet_iapplet_on_change_focus (CairoDockAppletIApplet* self, GVariant* parameters); -static void _dbus_handle_cairo_dock_applet_iapplet_on_stop_module (CairoDockAppletIApplet* self, GVariant* parameters); -static void _dbus_handle_cairo_dock_applet_iapplet_on_reload_module (CairoDockAppletIApplet* self, GVariant* parameters); -static GVariant* cairo_dock_applet_iapplet_proxy_Get (CairoDockAppletIApplet* self, const char* cProperty, GError** error); -static GHashTable* cairo_dock_applet_iapplet_proxy_GetAll (CairoDockAppletIApplet* self, GError** error); -static void cairo_dock_applet_iapplet_proxy_SetQuickInfo (CairoDockAppletIApplet* self, const char* cQuickInfo, GError** error); -static void cairo_dock_applet_iapplet_proxy_SetLabel (CairoDockAppletIApplet* self, const char* cLabel, GError** error); -static void cairo_dock_applet_iapplet_proxy_SetIcon (CairoDockAppletIApplet* self, const char* cImage, GError** error); -static void cairo_dock_applet_iapplet_proxy_SetEmblem (CairoDockAppletIApplet* self, const char* cImage, gint iPosition, GError** error); -static void cairo_dock_applet_iapplet_proxy_Animate (CairoDockAppletIApplet* self, const char* cAnimation, gint iRounds, GError** error); -static void cairo_dock_applet_iapplet_proxy_DemandsAttention (CairoDockAppletIApplet* self, gboolean bStart, const char* cAnimation, GError** error); -static void cairo_dock_applet_iapplet_proxy_ShowDialog (CairoDockAppletIApplet* self, const char* cMessage, gint iDuration, GError** error); -static void cairo_dock_applet_iapplet_proxy_PopupDialog (CairoDockAppletIApplet* self, GHashTable* hDialogAttributes, GHashTable* hWidgetAttributes, GError** error); -static void cairo_dock_applet_iapplet_proxy_AddDataRenderer (CairoDockAppletIApplet* self, const char* cType, gint iNbValues, const char* cTheme, GError** error); -static void cairo_dock_applet_iapplet_proxy_RenderValues (CairoDockAppletIApplet* self, double* pValues, int pValues_length1, GError** error); -static void cairo_dock_applet_iapplet_proxy_ControlAppli (CairoDockAppletIApplet* self, const char* cApplicationClass, GError** error); -static void cairo_dock_applet_iapplet_proxy_ShowAppli (CairoDockAppletIApplet* self, gboolean bShow, GError** error); -static void cairo_dock_applet_iapplet_proxy_AddMenuItems (CairoDockAppletIApplet* self, GHashTable** pItems, int pItems_length1, GError** error); -static void cairo_dock_applet_iapplet_proxy_BindShortkey (CairoDockAppletIApplet* self, char** cShortkeys, int cShortkeys_length1, GError** error); -static void cairo_dock_applet_iapplet_proxy_cairo_dock_applet_iapplet_interface_init (CairoDockAppletIAppletIface* iface); -static void cairo_dock_applet_iapplet_dbus_interface_method_call (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* method_name, GVariant* parameters, GDBusMethodInvocation* invocation, gpointer user_data); -static void _dbus_cairo_dock_applet_iapplet_Get (CairoDockAppletIApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation); -static void _dbus_cairo_dock_applet_iapplet_GetAll (CairoDockAppletIApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation); -static void _dbus_cairo_dock_applet_iapplet_SetQuickInfo (CairoDockAppletIApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation); -static void _dbus_cairo_dock_applet_iapplet_SetLabel (CairoDockAppletIApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation); -static void _dbus_cairo_dock_applet_iapplet_SetIcon (CairoDockAppletIApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation); -static void _dbus_cairo_dock_applet_iapplet_SetEmblem (CairoDockAppletIApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation); -static void _dbus_cairo_dock_applet_iapplet_Animate (CairoDockAppletIApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation); -static void _dbus_cairo_dock_applet_iapplet_DemandsAttention (CairoDockAppletIApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation); -static void _dbus_cairo_dock_applet_iapplet_ShowDialog (CairoDockAppletIApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation); -static void _dbus_cairo_dock_applet_iapplet_PopupDialog (CairoDockAppletIApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation); -static void _dbus_cairo_dock_applet_iapplet_AddDataRenderer (CairoDockAppletIApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation); -static void _dbus_cairo_dock_applet_iapplet_RenderValues (CairoDockAppletIApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation); -static void _dbus_cairo_dock_applet_iapplet_ControlAppli (CairoDockAppletIApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation); -static void _dbus_cairo_dock_applet_iapplet_ShowAppli (CairoDockAppletIApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation); -static void _dbus_cairo_dock_applet_iapplet_AddMenuItems (CairoDockAppletIApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation); -static void _dbus_cairo_dock_applet_iapplet_BindShortkey (CairoDockAppletIApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation); -static GVariant* cairo_dock_applet_iapplet_dbus_interface_get_property (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* property_name, GError** error, gpointer user_data); -static gboolean cairo_dock_applet_iapplet_dbus_interface_set_property (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* property_name, GVariant* value, GError** error, gpointer user_data); -static void _dbus_cairo_dock_applet_iapplet_on_click (GObject* _sender, gint iState, gpointer* _data); -static void _dbus_cairo_dock_applet_iapplet_on_middle_click (GObject* _sender, gpointer* _data); -static void _dbus_cairo_dock_applet_iapplet_on_build_menu (GObject* _sender, gpointer* _data); -static void _dbus_cairo_dock_applet_iapplet_on_menu_select (GObject* _sender, gint iNumEntry, gpointer* _data); -static void _dbus_cairo_dock_applet_iapplet_on_scroll (GObject* _sender, gboolean bScrollUp, gpointer* _data); -static void _dbus_cairo_dock_applet_iapplet_on_drop_data (GObject* _sender, const char* cReceivedData, gpointer* _data); -static void _dbus_cairo_dock_applet_iapplet_on_answer (GObject* _sender, GVariant* answer, gpointer* _data); -static void _dbus_cairo_dock_applet_iapplet_on_answer_dialog (GObject* _sender, gint iButton, GVariant* answer, gpointer* _data); -static void _dbus_cairo_dock_applet_iapplet_on_shortkey (GObject* _sender, const char* cKey, gpointer* _data); -static void _dbus_cairo_dock_applet_iapplet_on_change_focus (GObject* _sender, gboolean bIsActive, gpointer* _data); -static void _dbus_cairo_dock_applet_iapplet_on_stop_module (GObject* _sender, gpointer* _data); -static void _dbus_cairo_dock_applet_iapplet_on_reload_module (GObject* _sender, gboolean bConfigHasChanged, gpointer* _data); -static void _cairo_dock_applet_iapplet_unregister_object (gpointer user_data); -GType cairo_dock_applet_isub_applet_proxy_get_type (void) G_GNUC_CONST; -guint cairo_dock_applet_isub_applet_register_object (void* object, GDBusConnection* connection, const gchar* path, GError** error); -GType cairo_dock_applet_isub_applet_get_type (void) G_GNUC_CONST; -void cairo_dock_applet_isub_applet_SetQuickInfo (CairoDockAppletISubApplet* self, const char* cQuickInfo, const char* cIconID, GError** error); -void cairo_dock_applet_isub_applet_SetLabel (CairoDockAppletISubApplet* self, const char* cLabel, const char* cIconID, GError** error); -void cairo_dock_applet_isub_applet_SetIcon (CairoDockAppletISubApplet* self, const char* cImage, const char* cIconID, GError** error); -void cairo_dock_applet_isub_applet_SetEmblem (CairoDockAppletISubApplet* self, const char* cImage, gint iPosition, const char* cIconID, GError** error); -void cairo_dock_applet_isub_applet_Animate (CairoDockAppletISubApplet* self, const char* cAnimation, gint iNbRounds, const char* cIconID, GError** error); -void cairo_dock_applet_isub_applet_ShowDialog (CairoDockAppletISubApplet* self, const char* message, gint iDuration, const char* cIconID, GError** error); -void cairo_dock_applet_isub_applet_AddSubIcons (CairoDockAppletISubApplet* self, char** pIconFields, int pIconFields_length1, GError** error); -void cairo_dock_applet_isub_applet_RemoveSubIcon (CairoDockAppletISubApplet* self, const char* cIconID, GError** error); -static void cairo_dock_applet_isub_applet_proxy_g_signal (GDBusProxy* proxy, const gchar* sender_name, const gchar* signal_name, GVariant* parameters); -static void _dbus_handle_cairo_dock_applet_isub_applet_on_click_sub_icon (CairoDockAppletISubApplet* self, GVariant* parameters); -static void _dbus_handle_cairo_dock_applet_isub_applet_on_middle_click_sub_icon (CairoDockAppletISubApplet* self, GVariant* parameters); -static void _dbus_handle_cairo_dock_applet_isub_applet_on_scroll_sub_icon (CairoDockAppletISubApplet* self, GVariant* parameters); -static void _dbus_handle_cairo_dock_applet_isub_applet_on_drop_data_sub_icon (CairoDockAppletISubApplet* self, GVariant* parameters); -static void _dbus_handle_cairo_dock_applet_isub_applet_on_build_menu_sub_icon (CairoDockAppletISubApplet* self, GVariant* parameters); -static void cairo_dock_applet_isub_applet_proxy_SetQuickInfo (CairoDockAppletISubApplet* self, const char* cQuickInfo, const char* cIconID, GError** error); -static void cairo_dock_applet_isub_applet_proxy_SetLabel (CairoDockAppletISubApplet* self, const char* cLabel, const char* cIconID, GError** error); -static void cairo_dock_applet_isub_applet_proxy_SetIcon (CairoDockAppletISubApplet* self, const char* cImage, const char* cIconID, GError** error); -static void cairo_dock_applet_isub_applet_proxy_SetEmblem (CairoDockAppletISubApplet* self, const char* cImage, gint iPosition, const char* cIconID, GError** error); -static void cairo_dock_applet_isub_applet_proxy_Animate (CairoDockAppletISubApplet* self, const char* cAnimation, gint iNbRounds, const char* cIconID, GError** error); -static void cairo_dock_applet_isub_applet_proxy_ShowDialog (CairoDockAppletISubApplet* self, const char* message, gint iDuration, const char* cIconID, GError** error); -static void cairo_dock_applet_isub_applet_proxy_AddSubIcons (CairoDockAppletISubApplet* self, char** pIconFields, int pIconFields_length1, GError** error); -static void cairo_dock_applet_isub_applet_proxy_RemoveSubIcon (CairoDockAppletISubApplet* self, const char* cIconID, GError** error); -static void cairo_dock_applet_isub_applet_proxy_cairo_dock_applet_isub_applet_interface_init (CairoDockAppletISubAppletIface* iface); -static void cairo_dock_applet_isub_applet_dbus_interface_method_call (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* method_name, GVariant* parameters, GDBusMethodInvocation* invocation, gpointer user_data); -static void _dbus_cairo_dock_applet_isub_applet_SetQuickInfo (CairoDockAppletISubApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation); -static void _dbus_cairo_dock_applet_isub_applet_SetLabel (CairoDockAppletISubApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation); -static void _dbus_cairo_dock_applet_isub_applet_SetIcon (CairoDockAppletISubApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation); -static void _dbus_cairo_dock_applet_isub_applet_SetEmblem (CairoDockAppletISubApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation); -static void _dbus_cairo_dock_applet_isub_applet_Animate (CairoDockAppletISubApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation); -static void _dbus_cairo_dock_applet_isub_applet_ShowDialog (CairoDockAppletISubApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation); -static void _dbus_cairo_dock_applet_isub_applet_AddSubIcons (CairoDockAppletISubApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation); -static void _dbus_cairo_dock_applet_isub_applet_RemoveSubIcon (CairoDockAppletISubApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation); -static GVariant* cairo_dock_applet_isub_applet_dbus_interface_get_property (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* property_name, GError** error, gpointer user_data); -static gboolean cairo_dock_applet_isub_applet_dbus_interface_set_property (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* property_name, GVariant* value, GError** error, gpointer user_data); -static void _dbus_cairo_dock_applet_isub_applet_on_click_sub_icon (GObject* _sender, gint iState, const char* cIconID, gpointer* _data); -static void _dbus_cairo_dock_applet_isub_applet_on_middle_click_sub_icon (GObject* _sender, const char* cIconID, gpointer* _data); -static void _dbus_cairo_dock_applet_isub_applet_on_scroll_sub_icon (GObject* _sender, gboolean bScrollUp, const char* cIconID, gpointer* _data); -static void _dbus_cairo_dock_applet_isub_applet_on_drop_data_sub_icon (GObject* _sender, const char* cReceivedData, const char* cIconID, gpointer* _data); -static void _dbus_cairo_dock_applet_isub_applet_on_build_menu_sub_icon (GObject* _sender, const char* cIconID, gpointer* _data); -static void _cairo_dock_applet_isub_applet_unregister_object (gpointer user_data); -GType cairo_dock_applet_cd_applet_get_type (void) G_GNUC_CONST; -#define CAIRO_DOCK_APPLET_CD_APPLET_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CAIRO_DOCK_APPLET_TYPE_CD_APPLET, CairoDockAppletCDAppletPrivate)) -enum { - CAIRO_DOCK_APPLET_CD_APPLET_DUMMY_PROPERTY -}; -GType cairo_dock_applet_cd_applet_screen_position_get_type (void) G_GNUC_CONST; -GType cairo_dock_applet_cd_applet_container_type_get_type (void) G_GNUC_CONST; -GType cairo_dock_applet_cd_applet_emblem_position_get_type (void) G_GNUC_CONST; -GType cairo_dock_applet_cd_applet_menu_item_type_get_type (void) G_GNUC_CONST; -CairoDockAppletCDApplet* cairo_dock_applet_cd_applet_new (char** argv, int argv_length1); -CairoDockAppletCDApplet* cairo_dock_applet_cd_applet_construct (GType object_type, char** argv, int argv_length1); -static void _cairo_dock_applet_cd_applet_get_config (CairoDockAppletCDApplet* self); -static void _cairo_dock_applet_cd_applet_connect_to_bus (CairoDockAppletCDApplet* self); -void cairo_dock_applet_cd_applet_run (CairoDockAppletCDApplet* self); -void cairo_dock_applet_cd_applet_begin (CairoDockAppletCDApplet* self); -void cairo_dock_applet_cd_applet_on_click (CairoDockAppletCDApplet* self, gint iState); -static void cairo_dock_applet_cd_applet_real_on_click (CairoDockAppletCDApplet* self, gint iState); -void cairo_dock_applet_cd_applet_on_middle_click (CairoDockAppletCDApplet* self); -static void cairo_dock_applet_cd_applet_real_on_middle_click (CairoDockAppletCDApplet* self); -static void _cairo_dock_applet_cd_applet_on_build_menu (CairoDockAppletCDApplet* self); -void cairo_dock_applet_cd_applet_on_build_menu (CairoDockAppletCDApplet* self); -static void cairo_dock_applet_cd_applet_real_on_build_menu (CairoDockAppletCDApplet* self); -static void _cairo_dock_applet_cd_applet_on_menu_select (CairoDockAppletCDApplet* self, gint iNumEntry); -void cairo_dock_applet_cd_applet_on_menu_select (CairoDockAppletCDApplet* self, gint iNumEntry); -void cairo_dock_applet_cd_applet_on_menu_select_sub_icon (CairoDockAppletCDApplet* self, gint iNumEntry, const char* cIconID); -static void cairo_dock_applet_cd_applet_real_on_menu_select (CairoDockAppletCDApplet* self, gint iNumEntry); -void cairo_dock_applet_cd_applet_on_scroll (CairoDockAppletCDApplet* self, gboolean bScrollUp); -static void cairo_dock_applet_cd_applet_real_on_scroll (CairoDockAppletCDApplet* self, gboolean bScrollUp); -void cairo_dock_applet_cd_applet_on_drop_data (CairoDockAppletCDApplet* self, const char* cReceivedData); -static void cairo_dock_applet_cd_applet_real_on_drop_data (CairoDockAppletCDApplet* self, const char* cReceivedData); -void cairo_dock_applet_cd_applet_on_answer (CairoDockAppletCDApplet* self, GVariant* answer); -static void cairo_dock_applet_cd_applet_real_on_answer (CairoDockAppletCDApplet* self, GVariant* answer); -void cairo_dock_applet_cd_applet_on_answer_dialog (CairoDockAppletCDApplet* self, gint iButton, GVariant* answer); -static void cairo_dock_applet_cd_applet_real_on_answer_dialog (CairoDockAppletCDApplet* self, gint iButton, GVariant* answer); -void cairo_dock_applet_cd_applet_on_shortkey (CairoDockAppletCDApplet* self, const char* cKey); -static void cairo_dock_applet_cd_applet_real_on_shortkey (CairoDockAppletCDApplet* self, const char* cKey); -void cairo_dock_applet_cd_applet_on_change_focus (CairoDockAppletCDApplet* self, gboolean bIsActive); -static void cairo_dock_applet_cd_applet_real_on_change_focus (CairoDockAppletCDApplet* self, gboolean bIsActive); -void cairo_dock_applet_cd_applet_on_click_sub_icon (CairoDockAppletCDApplet* self, gint iState, const char* cIconID); -static void cairo_dock_applet_cd_applet_real_on_click_sub_icon (CairoDockAppletCDApplet* self, gint iState, const char* cIconID); -void cairo_dock_applet_cd_applet_on_middle_click_sub_icon (CairoDockAppletCDApplet* self, const char* cIconID); -static void cairo_dock_applet_cd_applet_real_on_middle_click_sub_icon (CairoDockAppletCDApplet* self, const char* cIconID); -void cairo_dock_applet_cd_applet_on_scroll_sub_icon (CairoDockAppletCDApplet* self, gboolean bScrollUp, const char* cIconID); -static void cairo_dock_applet_cd_applet_real_on_scroll_sub_icon (CairoDockAppletCDApplet* self, gboolean bScrollUp, const char* cIconID); -void cairo_dock_applet_cd_applet_on_drop_data_sub_icon (CairoDockAppletCDApplet* self, const char* cReceivedData, const char* cIconID); -static void cairo_dock_applet_cd_applet_real_on_drop_data_sub_icon (CairoDockAppletCDApplet* self, const char* cReceivedData, const char* cIconID); -static void _cairo_dock_applet_cd_applet_on_build_menu_sub_icon (CairoDockAppletCDApplet* self, const char* cIconID); -void cairo_dock_applet_cd_applet_on_build_menu_sub_icon (CairoDockAppletCDApplet* self, const char* cIconID); -static void cairo_dock_applet_cd_applet_real_on_build_menu_sub_icon (CairoDockAppletCDApplet* self, const char* cIconID); -static void cairo_dock_applet_cd_applet_real_on_menu_select_sub_icon (CairoDockAppletCDApplet* self, gint iNumEntry, const char* cIconID); -static void cairo_dock_applet_cd_applet_real_begin (CairoDockAppletCDApplet* self); -void cairo_dock_applet_cd_applet_end (CairoDockAppletCDApplet* self); -static void cairo_dock_applet_cd_applet_real_end (CairoDockAppletCDApplet* self); -static void _cairo_dock_applet_cd_applet_on_stop (CairoDockAppletCDApplet* self); -void cairo_dock_applet_cd_applet_reload (CairoDockAppletCDApplet* self); -static void cairo_dock_applet_cd_applet_real_reload (CairoDockAppletCDApplet* self); -static void _cairo_dock_applet_cd_applet_on_reload (CairoDockAppletCDApplet* self, gboolean bConfigHasChanged); -void cairo_dock_applet_cd_applet_get_config (CairoDockAppletCDApplet* self, GKeyFile* keyfile); -static void cairo_dock_applet_cd_applet_real_get_config (CairoDockAppletCDApplet* self, GKeyFile* keyfile); -static void _cairo_dock_applet_cd_applet_on_click_cairo_dock_applet_iapplet_on_click (CairoDockAppletIApplet* _sender, gint iState, gpointer self); -static void _cairo_dock_applet_cd_applet_on_middle_click_cairo_dock_applet_iapplet_on_middle_click (CairoDockAppletIApplet* _sender, gpointer self); -static void __cairo_dock_applet_cd_applet_on_build_menu_cairo_dock_applet_iapplet_on_build_menu (CairoDockAppletIApplet* _sender, gpointer self); -static void __cairo_dock_applet_cd_applet_on_menu_select_cairo_dock_applet_iapplet_on_menu_select (CairoDockAppletIApplet* _sender, gint iNumEntry, gpointer self); -static void _cairo_dock_applet_cd_applet_on_scroll_cairo_dock_applet_iapplet_on_scroll (CairoDockAppletIApplet* _sender, gboolean bScrollUp, gpointer self); -static void _cairo_dock_applet_cd_applet_on_drop_data_cairo_dock_applet_iapplet_on_drop_data (CairoDockAppletIApplet* _sender, const char* cReceivedData, gpointer self); -static void _cairo_dock_applet_cd_applet_on_answer_cairo_dock_applet_iapplet_on_answer (CairoDockAppletIApplet* _sender, GVariant* answer, gpointer self); -static void _cairo_dock_applet_cd_applet_on_answer_dialog_cairo_dock_applet_iapplet_on_answer_dialog (CairoDockAppletIApplet* _sender, gint iButton, GVariant* answer, gpointer self); -static void _cairo_dock_applet_cd_applet_on_shortkey_cairo_dock_applet_iapplet_on_shortkey (CairoDockAppletIApplet* _sender, const char* cKey, gpointer self); -static void _cairo_dock_applet_cd_applet_on_change_focus_cairo_dock_applet_iapplet_on_change_focus (CairoDockAppletIApplet* _sender, gboolean bIsActive, gpointer self); -static void __cairo_dock_applet_cd_applet_on_stop_cairo_dock_applet_iapplet_on_stop_module (CairoDockAppletIApplet* _sender, gpointer self); -static void __cairo_dock_applet_cd_applet_on_reload_cairo_dock_applet_iapplet_on_reload_module (CairoDockAppletIApplet* _sender, gboolean bConfigHasChanged, gpointer self); -static void _cairo_dock_applet_cd_applet_on_click_sub_icon_cairo_dock_applet_isub_applet_on_click_sub_icon (CairoDockAppletISubApplet* _sender, gint iState, const char* cIconID, gpointer self); -static void _cairo_dock_applet_cd_applet_on_middle_click_sub_icon_cairo_dock_applet_isub_applet_on_middle_click_sub_icon (CairoDockAppletISubApplet* _sender, const char* cIconID, gpointer self); -static void _cairo_dock_applet_cd_applet_on_scroll_sub_icon_cairo_dock_applet_isub_applet_on_scroll_sub_icon (CairoDockAppletISubApplet* _sender, gboolean bScrollUp, const char* cIconID, gpointer self); -static void _cairo_dock_applet_cd_applet_on_drop_data_sub_icon_cairo_dock_applet_isub_applet_on_drop_data_sub_icon (CairoDockAppletISubApplet* _sender, const char* cReceivedData, const char* cIconID, gpointer self); -static void __cairo_dock_applet_cd_applet_on_build_menu_sub_icon_cairo_dock_applet_isub_applet_on_build_menu_sub_icon (CairoDockAppletISubApplet* _sender, const char* cIconID, gpointer self); -static void cairo_dock_applet_cd_applet_finalize (GObject* obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); - -static const GDBusArgInfo _cairo_dock_applet_iapplet_dbus_arg_info_Get_cProperty = {-1, "cProperty", "s"}; -static const GDBusArgInfo _cairo_dock_applet_iapplet_dbus_arg_info_Get_result = {-1, "result", "v"}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_Get_in[] = {&_cairo_dock_applet_iapplet_dbus_arg_info_Get_cProperty, NULL}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_Get_out[] = {&_cairo_dock_applet_iapplet_dbus_arg_info_Get_result, NULL}; -static const GDBusMethodInfo _cairo_dock_applet_iapplet_dbus_method_info_Get = {-1, "Get", (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_Get_in), (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_Get_out)}; -static const GDBusArgInfo _cairo_dock_applet_iapplet_dbus_arg_info_GetAll_result = {-1, "result", "a{sv}"}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_GetAll_in[] = {NULL}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_GetAll_out[] = {&_cairo_dock_applet_iapplet_dbus_arg_info_GetAll_result, NULL}; -static const GDBusMethodInfo _cairo_dock_applet_iapplet_dbus_method_info_GetAll = {-1, "GetAll", (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_GetAll_in), (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_GetAll_out)}; -static const GDBusArgInfo _cairo_dock_applet_iapplet_dbus_arg_info_SetQuickInfo_cQuickInfo = {-1, "cQuickInfo", "s"}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_SetQuickInfo_in[] = {&_cairo_dock_applet_iapplet_dbus_arg_info_SetQuickInfo_cQuickInfo, NULL}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_SetQuickInfo_out[] = {NULL}; -static const GDBusMethodInfo _cairo_dock_applet_iapplet_dbus_method_info_SetQuickInfo = {-1, "SetQuickInfo", (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_SetQuickInfo_in), (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_SetQuickInfo_out)}; -static const GDBusArgInfo _cairo_dock_applet_iapplet_dbus_arg_info_SetLabel_cLabel = {-1, "cLabel", "s"}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_SetLabel_in[] = {&_cairo_dock_applet_iapplet_dbus_arg_info_SetLabel_cLabel, NULL}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_SetLabel_out[] = {NULL}; -static const GDBusMethodInfo _cairo_dock_applet_iapplet_dbus_method_info_SetLabel = {-1, "SetLabel", (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_SetLabel_in), (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_SetLabel_out)}; -static const GDBusArgInfo _cairo_dock_applet_iapplet_dbus_arg_info_SetIcon_cImage = {-1, "cImage", "s"}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_SetIcon_in[] = {&_cairo_dock_applet_iapplet_dbus_arg_info_SetIcon_cImage, NULL}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_SetIcon_out[] = {NULL}; -static const GDBusMethodInfo _cairo_dock_applet_iapplet_dbus_method_info_SetIcon = {-1, "SetIcon", (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_SetIcon_in), (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_SetIcon_out)}; -static const GDBusArgInfo _cairo_dock_applet_iapplet_dbus_arg_info_SetEmblem_cImage = {-1, "cImage", "s"}; -static const GDBusArgInfo _cairo_dock_applet_iapplet_dbus_arg_info_SetEmblem_iPosition = {-1, "iPosition", "i"}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_SetEmblem_in[] = {&_cairo_dock_applet_iapplet_dbus_arg_info_SetEmblem_cImage, &_cairo_dock_applet_iapplet_dbus_arg_info_SetEmblem_iPosition, NULL}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_SetEmblem_out[] = {NULL}; -static const GDBusMethodInfo _cairo_dock_applet_iapplet_dbus_method_info_SetEmblem = {-1, "SetEmblem", (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_SetEmblem_in), (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_SetEmblem_out)}; -static const GDBusArgInfo _cairo_dock_applet_iapplet_dbus_arg_info_Animate_cAnimation = {-1, "cAnimation", "s"}; -static const GDBusArgInfo _cairo_dock_applet_iapplet_dbus_arg_info_Animate_iRounds = {-1, "iRounds", "i"}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_Animate_in[] = {&_cairo_dock_applet_iapplet_dbus_arg_info_Animate_cAnimation, &_cairo_dock_applet_iapplet_dbus_arg_info_Animate_iRounds, NULL}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_Animate_out[] = {NULL}; -static const GDBusMethodInfo _cairo_dock_applet_iapplet_dbus_method_info_Animate = {-1, "Animate", (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_Animate_in), (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_Animate_out)}; -static const GDBusArgInfo _cairo_dock_applet_iapplet_dbus_arg_info_DemandsAttention_bStart = {-1, "bStart", "b"}; -static const GDBusArgInfo _cairo_dock_applet_iapplet_dbus_arg_info_DemandsAttention_cAnimation = {-1, "cAnimation", "s"}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_DemandsAttention_in[] = {&_cairo_dock_applet_iapplet_dbus_arg_info_DemandsAttention_bStart, &_cairo_dock_applet_iapplet_dbus_arg_info_DemandsAttention_cAnimation, NULL}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_DemandsAttention_out[] = {NULL}; -static const GDBusMethodInfo _cairo_dock_applet_iapplet_dbus_method_info_DemandsAttention = {-1, "DemandsAttention", (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_DemandsAttention_in), (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_DemandsAttention_out)}; -static const GDBusArgInfo _cairo_dock_applet_iapplet_dbus_arg_info_ShowDialog_cMessage = {-1, "cMessage", "s"}; -static const GDBusArgInfo _cairo_dock_applet_iapplet_dbus_arg_info_ShowDialog_iDuration = {-1, "iDuration", "i"}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_ShowDialog_in[] = {&_cairo_dock_applet_iapplet_dbus_arg_info_ShowDialog_cMessage, &_cairo_dock_applet_iapplet_dbus_arg_info_ShowDialog_iDuration, NULL}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_ShowDialog_out[] = {NULL}; -static const GDBusMethodInfo _cairo_dock_applet_iapplet_dbus_method_info_ShowDialog = {-1, "ShowDialog", (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_ShowDialog_in), (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_ShowDialog_out)}; -static const GDBusArgInfo _cairo_dock_applet_iapplet_dbus_arg_info_PopupDialog_hDialogAttributes = {-1, "hDialogAttributes", "a{sv}"}; -static const GDBusArgInfo _cairo_dock_applet_iapplet_dbus_arg_info_PopupDialog_hWidgetAttributes = {-1, "hWidgetAttributes", "a{sv}"}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_PopupDialog_in[] = {&_cairo_dock_applet_iapplet_dbus_arg_info_PopupDialog_hDialogAttributes, &_cairo_dock_applet_iapplet_dbus_arg_info_PopupDialog_hWidgetAttributes, NULL}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_PopupDialog_out[] = {NULL}; -static const GDBusMethodInfo _cairo_dock_applet_iapplet_dbus_method_info_PopupDialog = {-1, "PopupDialog", (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_PopupDialog_in), (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_PopupDialog_out)}; -static const GDBusArgInfo _cairo_dock_applet_iapplet_dbus_arg_info_AddDataRenderer_cType = {-1, "cType", "s"}; -static const GDBusArgInfo _cairo_dock_applet_iapplet_dbus_arg_info_AddDataRenderer_iNbValues = {-1, "iNbValues", "i"}; -static const GDBusArgInfo _cairo_dock_applet_iapplet_dbus_arg_info_AddDataRenderer_cTheme = {-1, "cTheme", "s"}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_AddDataRenderer_in[] = {&_cairo_dock_applet_iapplet_dbus_arg_info_AddDataRenderer_cType, &_cairo_dock_applet_iapplet_dbus_arg_info_AddDataRenderer_iNbValues, &_cairo_dock_applet_iapplet_dbus_arg_info_AddDataRenderer_cTheme, NULL}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_AddDataRenderer_out[] = {NULL}; -static const GDBusMethodInfo _cairo_dock_applet_iapplet_dbus_method_info_AddDataRenderer = {-1, "AddDataRenderer", (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_AddDataRenderer_in), (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_AddDataRenderer_out)}; -static const GDBusArgInfo _cairo_dock_applet_iapplet_dbus_arg_info_RenderValues_pValues = {-1, "pValues", "ad"}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_RenderValues_in[] = {&_cairo_dock_applet_iapplet_dbus_arg_info_RenderValues_pValues, NULL}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_RenderValues_out[] = {NULL}; -static const GDBusMethodInfo _cairo_dock_applet_iapplet_dbus_method_info_RenderValues = {-1, "RenderValues", (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_RenderValues_in), (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_RenderValues_out)}; -static const GDBusArgInfo _cairo_dock_applet_iapplet_dbus_arg_info_ControlAppli_cApplicationClass = {-1, "cApplicationClass", "s"}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_ControlAppli_in[] = {&_cairo_dock_applet_iapplet_dbus_arg_info_ControlAppli_cApplicationClass, NULL}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_ControlAppli_out[] = {NULL}; -static const GDBusMethodInfo _cairo_dock_applet_iapplet_dbus_method_info_ControlAppli = {-1, "ControlAppli", (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_ControlAppli_in), (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_ControlAppli_out)}; -static const GDBusArgInfo _cairo_dock_applet_iapplet_dbus_arg_info_ShowAppli_bShow = {-1, "bShow", "b"}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_ShowAppli_in[] = {&_cairo_dock_applet_iapplet_dbus_arg_info_ShowAppli_bShow, NULL}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_ShowAppli_out[] = {NULL}; -static const GDBusMethodInfo _cairo_dock_applet_iapplet_dbus_method_info_ShowAppli = {-1, "ShowAppli", (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_ShowAppli_in), (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_ShowAppli_out)}; -static const GDBusArgInfo _cairo_dock_applet_iapplet_dbus_arg_info_AddMenuItems_pItems = {-1, "pItems", "aa{sv}"}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_AddMenuItems_in[] = {&_cairo_dock_applet_iapplet_dbus_arg_info_AddMenuItems_pItems, NULL}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_AddMenuItems_out[] = {NULL}; -static const GDBusMethodInfo _cairo_dock_applet_iapplet_dbus_method_info_AddMenuItems = {-1, "AddMenuItems", (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_AddMenuItems_in), (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_AddMenuItems_out)}; -static const GDBusArgInfo _cairo_dock_applet_iapplet_dbus_arg_info_BindShortkey_cShortkeys = {-1, "cShortkeys", "as"}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_BindShortkey_in[] = {&_cairo_dock_applet_iapplet_dbus_arg_info_BindShortkey_cShortkeys, NULL}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_BindShortkey_out[] = {NULL}; -static const GDBusMethodInfo _cairo_dock_applet_iapplet_dbus_method_info_BindShortkey = {-1, "BindShortkey", (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_BindShortkey_in), (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_BindShortkey_out)}; -static const GDBusMethodInfo * const _cairo_dock_applet_iapplet_dbus_method_info[] = {&_cairo_dock_applet_iapplet_dbus_method_info_Get, &_cairo_dock_applet_iapplet_dbus_method_info_GetAll, &_cairo_dock_applet_iapplet_dbus_method_info_SetQuickInfo, &_cairo_dock_applet_iapplet_dbus_method_info_SetLabel, &_cairo_dock_applet_iapplet_dbus_method_info_SetIcon, &_cairo_dock_applet_iapplet_dbus_method_info_SetEmblem, &_cairo_dock_applet_iapplet_dbus_method_info_Animate, &_cairo_dock_applet_iapplet_dbus_method_info_DemandsAttention, &_cairo_dock_applet_iapplet_dbus_method_info_ShowDialog, &_cairo_dock_applet_iapplet_dbus_method_info_PopupDialog, &_cairo_dock_applet_iapplet_dbus_method_info_AddDataRenderer, &_cairo_dock_applet_iapplet_dbus_method_info_RenderValues, &_cairo_dock_applet_iapplet_dbus_method_info_ControlAppli, &_cairo_dock_applet_iapplet_dbus_method_info_ShowAppli, &_cairo_dock_applet_iapplet_dbus_method_info_AddMenuItems, &_cairo_dock_applet_iapplet_dbus_method_info_BindShortkey, NULL}; -static const GDBusArgInfo _cairo_dock_applet_iapplet_dbus_arg_info_on_click_iState = {-1, "iState", "i"}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_on_click[] = {&_cairo_dock_applet_iapplet_dbus_arg_info_on_click_iState, NULL}; -static const GDBusSignalInfo _cairo_dock_applet_iapplet_dbus_signal_info_on_click = {-1, "on_click", (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_on_click)}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_on_middle_click[] = {NULL}; -static const GDBusSignalInfo _cairo_dock_applet_iapplet_dbus_signal_info_on_middle_click = {-1, "on_middle_click", (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_on_middle_click)}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_on_build_menu[] = {NULL}; -static const GDBusSignalInfo _cairo_dock_applet_iapplet_dbus_signal_info_on_build_menu = {-1, "on_build_menu", (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_on_build_menu)}; -static const GDBusArgInfo _cairo_dock_applet_iapplet_dbus_arg_info_on_menu_select_iNumEntry = {-1, "iNumEntry", "i"}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_on_menu_select[] = {&_cairo_dock_applet_iapplet_dbus_arg_info_on_menu_select_iNumEntry, NULL}; -static const GDBusSignalInfo _cairo_dock_applet_iapplet_dbus_signal_info_on_menu_select = {-1, "on_menu_select", (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_on_menu_select)}; -static const GDBusArgInfo _cairo_dock_applet_iapplet_dbus_arg_info_on_scroll_bScrollUp = {-1, "bScrollUp", "b"}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_on_scroll[] = {&_cairo_dock_applet_iapplet_dbus_arg_info_on_scroll_bScrollUp, NULL}; -static const GDBusSignalInfo _cairo_dock_applet_iapplet_dbus_signal_info_on_scroll = {-1, "on_scroll", (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_on_scroll)}; -static const GDBusArgInfo _cairo_dock_applet_iapplet_dbus_arg_info_on_drop_data_cReceivedData = {-1, "cReceivedData", "s"}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_on_drop_data[] = {&_cairo_dock_applet_iapplet_dbus_arg_info_on_drop_data_cReceivedData, NULL}; -static const GDBusSignalInfo _cairo_dock_applet_iapplet_dbus_signal_info_on_drop_data = {-1, "on_drop_data", (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_on_drop_data)}; -static const GDBusArgInfo _cairo_dock_applet_iapplet_dbus_arg_info_on_answer_answer = {-1, "answer", "v"}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_on_answer[] = {&_cairo_dock_applet_iapplet_dbus_arg_info_on_answer_answer, NULL}; -static const GDBusSignalInfo _cairo_dock_applet_iapplet_dbus_signal_info_on_answer = {-1, "on_answer", (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_on_answer)}; -static const GDBusArgInfo _cairo_dock_applet_iapplet_dbus_arg_info_on_answer_dialog_iButton = {-1, "iButton", "i"}; -static const GDBusArgInfo _cairo_dock_applet_iapplet_dbus_arg_info_on_answer_dialog_answer = {-1, "answer", "v"}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_on_answer_dialog[] = {&_cairo_dock_applet_iapplet_dbus_arg_info_on_answer_dialog_iButton, &_cairo_dock_applet_iapplet_dbus_arg_info_on_answer_dialog_answer, NULL}; -static const GDBusSignalInfo _cairo_dock_applet_iapplet_dbus_signal_info_on_answer_dialog = {-1, "on_answer_dialog", (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_on_answer_dialog)}; -static const GDBusArgInfo _cairo_dock_applet_iapplet_dbus_arg_info_on_shortkey_cKey = {-1, "cKey", "s"}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_on_shortkey[] = {&_cairo_dock_applet_iapplet_dbus_arg_info_on_shortkey_cKey, NULL}; -static const GDBusSignalInfo _cairo_dock_applet_iapplet_dbus_signal_info_on_shortkey = {-1, "on_shortkey", (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_on_shortkey)}; -static const GDBusArgInfo _cairo_dock_applet_iapplet_dbus_arg_info_on_change_focus_bIsActive = {-1, "bIsActive", "b"}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_on_change_focus[] = {&_cairo_dock_applet_iapplet_dbus_arg_info_on_change_focus_bIsActive, NULL}; -static const GDBusSignalInfo _cairo_dock_applet_iapplet_dbus_signal_info_on_change_focus = {-1, "on_change_focus", (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_on_change_focus)}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_on_stop_module[] = {NULL}; -static const GDBusSignalInfo _cairo_dock_applet_iapplet_dbus_signal_info_on_stop_module = {-1, "on_stop_module", (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_on_stop_module)}; -static const GDBusArgInfo _cairo_dock_applet_iapplet_dbus_arg_info_on_reload_module_bConfigHasChanged = {-1, "bConfigHasChanged", "b"}; -static const GDBusArgInfo * const _cairo_dock_applet_iapplet_dbus_arg_info_on_reload_module[] = {&_cairo_dock_applet_iapplet_dbus_arg_info_on_reload_module_bConfigHasChanged, NULL}; -static const GDBusSignalInfo _cairo_dock_applet_iapplet_dbus_signal_info_on_reload_module = {-1, "on_reload_module", (GDBusArgInfo **) (&_cairo_dock_applet_iapplet_dbus_arg_info_on_reload_module)}; -static const GDBusSignalInfo * const _cairo_dock_applet_iapplet_dbus_signal_info[] = {&_cairo_dock_applet_iapplet_dbus_signal_info_on_click, &_cairo_dock_applet_iapplet_dbus_signal_info_on_middle_click, &_cairo_dock_applet_iapplet_dbus_signal_info_on_build_menu, &_cairo_dock_applet_iapplet_dbus_signal_info_on_menu_select, &_cairo_dock_applet_iapplet_dbus_signal_info_on_scroll, &_cairo_dock_applet_iapplet_dbus_signal_info_on_drop_data, &_cairo_dock_applet_iapplet_dbus_signal_info_on_answer, &_cairo_dock_applet_iapplet_dbus_signal_info_on_answer_dialog, &_cairo_dock_applet_iapplet_dbus_signal_info_on_shortkey, &_cairo_dock_applet_iapplet_dbus_signal_info_on_change_focus, &_cairo_dock_applet_iapplet_dbus_signal_info_on_stop_module, &_cairo_dock_applet_iapplet_dbus_signal_info_on_reload_module, NULL}; -static const GDBusPropertyInfo * const _cairo_dock_applet_iapplet_dbus_property_info[] = {NULL}; -static const GDBusInterfaceInfo _cairo_dock_applet_iapplet_dbus_interface_info = {-1, "org.cairodock.CairoDock.applet", (GDBusMethodInfo **) (&_cairo_dock_applet_iapplet_dbus_method_info), (GDBusSignalInfo **) (&_cairo_dock_applet_iapplet_dbus_signal_info), (GDBusPropertyInfo **) (&_cairo_dock_applet_iapplet_dbus_property_info)}; -static const GDBusInterfaceVTable _cairo_dock_applet_iapplet_dbus_interface_vtable = {cairo_dock_applet_iapplet_dbus_interface_method_call, cairo_dock_applet_iapplet_dbus_interface_get_property, cairo_dock_applet_iapplet_dbus_interface_set_property}; -static const GDBusArgInfo _cairo_dock_applet_isub_applet_dbus_arg_info_SetQuickInfo_cQuickInfo = {-1, "cQuickInfo", "s"}; -static const GDBusArgInfo _cairo_dock_applet_isub_applet_dbus_arg_info_SetQuickInfo_cIconID = {-1, "cIconID", "s"}; -static const GDBusArgInfo * const _cairo_dock_applet_isub_applet_dbus_arg_info_SetQuickInfo_in[] = {&_cairo_dock_applet_isub_applet_dbus_arg_info_SetQuickInfo_cQuickInfo, &_cairo_dock_applet_isub_applet_dbus_arg_info_SetQuickInfo_cIconID, NULL}; -static const GDBusArgInfo * const _cairo_dock_applet_isub_applet_dbus_arg_info_SetQuickInfo_out[] = {NULL}; -static const GDBusMethodInfo _cairo_dock_applet_isub_applet_dbus_method_info_SetQuickInfo = {-1, "SetQuickInfo", (GDBusArgInfo **) (&_cairo_dock_applet_isub_applet_dbus_arg_info_SetQuickInfo_in), (GDBusArgInfo **) (&_cairo_dock_applet_isub_applet_dbus_arg_info_SetQuickInfo_out)}; -static const GDBusArgInfo _cairo_dock_applet_isub_applet_dbus_arg_info_SetLabel_cLabel = {-1, "cLabel", "s"}; -static const GDBusArgInfo _cairo_dock_applet_isub_applet_dbus_arg_info_SetLabel_cIconID = {-1, "cIconID", "s"}; -static const GDBusArgInfo * const _cairo_dock_applet_isub_applet_dbus_arg_info_SetLabel_in[] = {&_cairo_dock_applet_isub_applet_dbus_arg_info_SetLabel_cLabel, &_cairo_dock_applet_isub_applet_dbus_arg_info_SetLabel_cIconID, NULL}; -static const GDBusArgInfo * const _cairo_dock_applet_isub_applet_dbus_arg_info_SetLabel_out[] = {NULL}; -static const GDBusMethodInfo _cairo_dock_applet_isub_applet_dbus_method_info_SetLabel = {-1, "SetLabel", (GDBusArgInfo **) (&_cairo_dock_applet_isub_applet_dbus_arg_info_SetLabel_in), (GDBusArgInfo **) (&_cairo_dock_applet_isub_applet_dbus_arg_info_SetLabel_out)}; -static const GDBusArgInfo _cairo_dock_applet_isub_applet_dbus_arg_info_SetIcon_cImage = {-1, "cImage", "s"}; -static const GDBusArgInfo _cairo_dock_applet_isub_applet_dbus_arg_info_SetIcon_cIconID = {-1, "cIconID", "s"}; -static const GDBusArgInfo * const _cairo_dock_applet_isub_applet_dbus_arg_info_SetIcon_in[] = {&_cairo_dock_applet_isub_applet_dbus_arg_info_SetIcon_cImage, &_cairo_dock_applet_isub_applet_dbus_arg_info_SetIcon_cIconID, NULL}; -static const GDBusArgInfo * const _cairo_dock_applet_isub_applet_dbus_arg_info_SetIcon_out[] = {NULL}; -static const GDBusMethodInfo _cairo_dock_applet_isub_applet_dbus_method_info_SetIcon = {-1, "SetIcon", (GDBusArgInfo **) (&_cairo_dock_applet_isub_applet_dbus_arg_info_SetIcon_in), (GDBusArgInfo **) (&_cairo_dock_applet_isub_applet_dbus_arg_info_SetIcon_out)}; -static const GDBusArgInfo _cairo_dock_applet_isub_applet_dbus_arg_info_SetEmblem_cImage = {-1, "cImage", "s"}; -static const GDBusArgInfo _cairo_dock_applet_isub_applet_dbus_arg_info_SetEmblem_iPosition = {-1, "iPosition", "i"}; -static const GDBusArgInfo _cairo_dock_applet_isub_applet_dbus_arg_info_SetEmblem_cIconID = {-1, "cIconID", "s"}; -static const GDBusArgInfo * const _cairo_dock_applet_isub_applet_dbus_arg_info_SetEmblem_in[] = {&_cairo_dock_applet_isub_applet_dbus_arg_info_SetEmblem_cImage, &_cairo_dock_applet_isub_applet_dbus_arg_info_SetEmblem_iPosition, &_cairo_dock_applet_isub_applet_dbus_arg_info_SetEmblem_cIconID, NULL}; -static const GDBusArgInfo * const _cairo_dock_applet_isub_applet_dbus_arg_info_SetEmblem_out[] = {NULL}; -static const GDBusMethodInfo _cairo_dock_applet_isub_applet_dbus_method_info_SetEmblem = {-1, "SetEmblem", (GDBusArgInfo **) (&_cairo_dock_applet_isub_applet_dbus_arg_info_SetEmblem_in), (GDBusArgInfo **) (&_cairo_dock_applet_isub_applet_dbus_arg_info_SetEmblem_out)}; -static const GDBusArgInfo _cairo_dock_applet_isub_applet_dbus_arg_info_Animate_cAnimation = {-1, "cAnimation", "s"}; -static const GDBusArgInfo _cairo_dock_applet_isub_applet_dbus_arg_info_Animate_iNbRounds = {-1, "iNbRounds", "i"}; -static const GDBusArgInfo _cairo_dock_applet_isub_applet_dbus_arg_info_Animate_cIconID = {-1, "cIconID", "s"}; -static const GDBusArgInfo * const _cairo_dock_applet_isub_applet_dbus_arg_info_Animate_in[] = {&_cairo_dock_applet_isub_applet_dbus_arg_info_Animate_cAnimation, &_cairo_dock_applet_isub_applet_dbus_arg_info_Animate_iNbRounds, &_cairo_dock_applet_isub_applet_dbus_arg_info_Animate_cIconID, NULL}; -static const GDBusArgInfo * const _cairo_dock_applet_isub_applet_dbus_arg_info_Animate_out[] = {NULL}; -static const GDBusMethodInfo _cairo_dock_applet_isub_applet_dbus_method_info_Animate = {-1, "Animate", (GDBusArgInfo **) (&_cairo_dock_applet_isub_applet_dbus_arg_info_Animate_in), (GDBusArgInfo **) (&_cairo_dock_applet_isub_applet_dbus_arg_info_Animate_out)}; -static const GDBusArgInfo _cairo_dock_applet_isub_applet_dbus_arg_info_ShowDialog_message = {-1, "message", "s"}; -static const GDBusArgInfo _cairo_dock_applet_isub_applet_dbus_arg_info_ShowDialog_iDuration = {-1, "iDuration", "i"}; -static const GDBusArgInfo _cairo_dock_applet_isub_applet_dbus_arg_info_ShowDialog_cIconID = {-1, "cIconID", "s"}; -static const GDBusArgInfo * const _cairo_dock_applet_isub_applet_dbus_arg_info_ShowDialog_in[] = {&_cairo_dock_applet_isub_applet_dbus_arg_info_ShowDialog_message, &_cairo_dock_applet_isub_applet_dbus_arg_info_ShowDialog_iDuration, &_cairo_dock_applet_isub_applet_dbus_arg_info_ShowDialog_cIconID, NULL}; -static const GDBusArgInfo * const _cairo_dock_applet_isub_applet_dbus_arg_info_ShowDialog_out[] = {NULL}; -static const GDBusMethodInfo _cairo_dock_applet_isub_applet_dbus_method_info_ShowDialog = {-1, "ShowDialog", (GDBusArgInfo **) (&_cairo_dock_applet_isub_applet_dbus_arg_info_ShowDialog_in), (GDBusArgInfo **) (&_cairo_dock_applet_isub_applet_dbus_arg_info_ShowDialog_out)}; -static const GDBusArgInfo _cairo_dock_applet_isub_applet_dbus_arg_info_AddSubIcons_pIconFields = {-1, "pIconFields", "as"}; -static const GDBusArgInfo * const _cairo_dock_applet_isub_applet_dbus_arg_info_AddSubIcons_in[] = {&_cairo_dock_applet_isub_applet_dbus_arg_info_AddSubIcons_pIconFields, NULL}; -static const GDBusArgInfo * const _cairo_dock_applet_isub_applet_dbus_arg_info_AddSubIcons_out[] = {NULL}; -static const GDBusMethodInfo _cairo_dock_applet_isub_applet_dbus_method_info_AddSubIcons = {-1, "AddSubIcons", (GDBusArgInfo **) (&_cairo_dock_applet_isub_applet_dbus_arg_info_AddSubIcons_in), (GDBusArgInfo **) (&_cairo_dock_applet_isub_applet_dbus_arg_info_AddSubIcons_out)}; -static const GDBusArgInfo _cairo_dock_applet_isub_applet_dbus_arg_info_RemoveSubIcon_cIconID = {-1, "cIconID", "s"}; -static const GDBusArgInfo * const _cairo_dock_applet_isub_applet_dbus_arg_info_RemoveSubIcon_in[] = {&_cairo_dock_applet_isub_applet_dbus_arg_info_RemoveSubIcon_cIconID, NULL}; -static const GDBusArgInfo * const _cairo_dock_applet_isub_applet_dbus_arg_info_RemoveSubIcon_out[] = {NULL}; -static const GDBusMethodInfo _cairo_dock_applet_isub_applet_dbus_method_info_RemoveSubIcon = {-1, "RemoveSubIcon", (GDBusArgInfo **) (&_cairo_dock_applet_isub_applet_dbus_arg_info_RemoveSubIcon_in), (GDBusArgInfo **) (&_cairo_dock_applet_isub_applet_dbus_arg_info_RemoveSubIcon_out)}; -static const GDBusMethodInfo * const _cairo_dock_applet_isub_applet_dbus_method_info[] = {&_cairo_dock_applet_isub_applet_dbus_method_info_SetQuickInfo, &_cairo_dock_applet_isub_applet_dbus_method_info_SetLabel, &_cairo_dock_applet_isub_applet_dbus_method_info_SetIcon, &_cairo_dock_applet_isub_applet_dbus_method_info_SetEmblem, &_cairo_dock_applet_isub_applet_dbus_method_info_Animate, &_cairo_dock_applet_isub_applet_dbus_method_info_ShowDialog, &_cairo_dock_applet_isub_applet_dbus_method_info_AddSubIcons, &_cairo_dock_applet_isub_applet_dbus_method_info_RemoveSubIcon, NULL}; -static const GDBusArgInfo _cairo_dock_applet_isub_applet_dbus_arg_info_on_click_sub_icon_iState = {-1, "iState", "i"}; -static const GDBusArgInfo _cairo_dock_applet_isub_applet_dbus_arg_info_on_click_sub_icon_cIconID = {-1, "cIconID", "s"}; -static const GDBusArgInfo * const _cairo_dock_applet_isub_applet_dbus_arg_info_on_click_sub_icon[] = {&_cairo_dock_applet_isub_applet_dbus_arg_info_on_click_sub_icon_iState, &_cairo_dock_applet_isub_applet_dbus_arg_info_on_click_sub_icon_cIconID, NULL}; -static const GDBusSignalInfo _cairo_dock_applet_isub_applet_dbus_signal_info_on_click_sub_icon = {-1, "on_clickSubIcon", (GDBusArgInfo **) (&_cairo_dock_applet_isub_applet_dbus_arg_info_on_click_sub_icon)}; -static const GDBusArgInfo _cairo_dock_applet_isub_applet_dbus_arg_info_on_middle_click_sub_icon_cIconID = {-1, "cIconID", "s"}; -static const GDBusArgInfo * const _cairo_dock_applet_isub_applet_dbus_arg_info_on_middle_click_sub_icon[] = {&_cairo_dock_applet_isub_applet_dbus_arg_info_on_middle_click_sub_icon_cIconID, NULL}; -static const GDBusSignalInfo _cairo_dock_applet_isub_applet_dbus_signal_info_on_middle_click_sub_icon = {-1, "on_middle_clickSubIcon", (GDBusArgInfo **) (&_cairo_dock_applet_isub_applet_dbus_arg_info_on_middle_click_sub_icon)}; -static const GDBusArgInfo _cairo_dock_applet_isub_applet_dbus_arg_info_on_scroll_sub_icon_bScrollUp = {-1, "bScrollUp", "b"}; -static const GDBusArgInfo _cairo_dock_applet_isub_applet_dbus_arg_info_on_scroll_sub_icon_cIconID = {-1, "cIconID", "s"}; -static const GDBusArgInfo * const _cairo_dock_applet_isub_applet_dbus_arg_info_on_scroll_sub_icon[] = {&_cairo_dock_applet_isub_applet_dbus_arg_info_on_scroll_sub_icon_bScrollUp, &_cairo_dock_applet_isub_applet_dbus_arg_info_on_scroll_sub_icon_cIconID, NULL}; -static const GDBusSignalInfo _cairo_dock_applet_isub_applet_dbus_signal_info_on_scroll_sub_icon = {-1, "on_scrollSubIcon", (GDBusArgInfo **) (&_cairo_dock_applet_isub_applet_dbus_arg_info_on_scroll_sub_icon)}; -static const GDBusArgInfo _cairo_dock_applet_isub_applet_dbus_arg_info_on_drop_data_sub_icon_cReceivedData = {-1, "cReceivedData", "s"}; -static const GDBusArgInfo _cairo_dock_applet_isub_applet_dbus_arg_info_on_drop_data_sub_icon_cIconID = {-1, "cIconID", "s"}; -static const GDBusArgInfo * const _cairo_dock_applet_isub_applet_dbus_arg_info_on_drop_data_sub_icon[] = {&_cairo_dock_applet_isub_applet_dbus_arg_info_on_drop_data_sub_icon_cReceivedData, &_cairo_dock_applet_isub_applet_dbus_arg_info_on_drop_data_sub_icon_cIconID, NULL}; -static const GDBusSignalInfo _cairo_dock_applet_isub_applet_dbus_signal_info_on_drop_data_sub_icon = {-1, "on_drop_dataSubIcon", (GDBusArgInfo **) (&_cairo_dock_applet_isub_applet_dbus_arg_info_on_drop_data_sub_icon)}; -static const GDBusArgInfo _cairo_dock_applet_isub_applet_dbus_arg_info_on_build_menu_sub_icon_cIconID = {-1, "cIconID", "s"}; -static const GDBusArgInfo * const _cairo_dock_applet_isub_applet_dbus_arg_info_on_build_menu_sub_icon[] = {&_cairo_dock_applet_isub_applet_dbus_arg_info_on_build_menu_sub_icon_cIconID, NULL}; -static const GDBusSignalInfo _cairo_dock_applet_isub_applet_dbus_signal_info_on_build_menu_sub_icon = {-1, "on_build_menuSubIcon", (GDBusArgInfo **) (&_cairo_dock_applet_isub_applet_dbus_arg_info_on_build_menu_sub_icon)}; -static const GDBusSignalInfo * const _cairo_dock_applet_isub_applet_dbus_signal_info[] = {&_cairo_dock_applet_isub_applet_dbus_signal_info_on_click_sub_icon, &_cairo_dock_applet_isub_applet_dbus_signal_info_on_middle_click_sub_icon, &_cairo_dock_applet_isub_applet_dbus_signal_info_on_scroll_sub_icon, &_cairo_dock_applet_isub_applet_dbus_signal_info_on_drop_data_sub_icon, &_cairo_dock_applet_isub_applet_dbus_signal_info_on_build_menu_sub_icon, NULL}; -static const GDBusPropertyInfo * const _cairo_dock_applet_isub_applet_dbus_property_info[] = {NULL}; -static const GDBusInterfaceInfo _cairo_dock_applet_isub_applet_dbus_interface_info = {-1, "org.cairodock.CairoDock.subapplet", (GDBusMethodInfo **) (&_cairo_dock_applet_isub_applet_dbus_method_info), (GDBusSignalInfo **) (&_cairo_dock_applet_isub_applet_dbus_signal_info), (GDBusPropertyInfo **) (&_cairo_dock_applet_isub_applet_dbus_property_info)}; -static const GDBusInterfaceVTable _cairo_dock_applet_isub_applet_dbus_interface_vtable = {cairo_dock_applet_isub_applet_dbus_interface_method_call, cairo_dock_applet_isub_applet_dbus_interface_get_property, cairo_dock_applet_isub_applet_dbus_interface_set_property}; - -static void g_cclosure_user_marshal_VOID__VARIANT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void g_cclosure_user_marshal_VOID__INT_VARIANT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void g_cclosure_user_marshal_VOID__INT_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void g_cclosure_user_marshal_VOID__BOOLEAN_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); -static void g_cclosure_user_marshal_VOID__STRING_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); - -GVariant* cairo_dock_applet_iapplet_Get (CairoDockAppletIApplet* self, const char* cProperty, GError** error) { - return CAIRO_DOCK_APPLET_IAPPLET_GET_INTERFACE (self)->Get (self, cProperty, error); -} - - -GHashTable* cairo_dock_applet_iapplet_GetAll (CairoDockAppletIApplet* self, GError** error) { - return CAIRO_DOCK_APPLET_IAPPLET_GET_INTERFACE (self)->GetAll (self, error); -} - - -void cairo_dock_applet_iapplet_SetQuickInfo (CairoDockAppletIApplet* self, const char* cQuickInfo, GError** error) { - CAIRO_DOCK_APPLET_IAPPLET_GET_INTERFACE (self)->SetQuickInfo (self, cQuickInfo, error); -} - - -void cairo_dock_applet_iapplet_SetLabel (CairoDockAppletIApplet* self, const char* cLabel, GError** error) { - CAIRO_DOCK_APPLET_IAPPLET_GET_INTERFACE (self)->SetLabel (self, cLabel, error); -} - - -void cairo_dock_applet_iapplet_SetIcon (CairoDockAppletIApplet* self, const char* cImage, GError** error) { - CAIRO_DOCK_APPLET_IAPPLET_GET_INTERFACE (self)->SetIcon (self, cImage, error); -} - - -void cairo_dock_applet_iapplet_SetEmblem (CairoDockAppletIApplet* self, const char* cImage, gint iPosition, GError** error) { - CAIRO_DOCK_APPLET_IAPPLET_GET_INTERFACE (self)->SetEmblem (self, cImage, iPosition, error); -} - - -void cairo_dock_applet_iapplet_Animate (CairoDockAppletIApplet* self, const char* cAnimation, gint iRounds, GError** error) { - CAIRO_DOCK_APPLET_IAPPLET_GET_INTERFACE (self)->Animate (self, cAnimation, iRounds, error); -} - - -void cairo_dock_applet_iapplet_DemandsAttention (CairoDockAppletIApplet* self, gboolean bStart, const char* cAnimation, GError** error) { - CAIRO_DOCK_APPLET_IAPPLET_GET_INTERFACE (self)->DemandsAttention (self, bStart, cAnimation, error); -} - - -void cairo_dock_applet_iapplet_ShowDialog (CairoDockAppletIApplet* self, const char* cMessage, gint iDuration, GError** error) { - CAIRO_DOCK_APPLET_IAPPLET_GET_INTERFACE (self)->ShowDialog (self, cMessage, iDuration, error); -} - - -void cairo_dock_applet_iapplet_PopupDialog (CairoDockAppletIApplet* self, GHashTable* hDialogAttributes, GHashTable* hWidgetAttributes, GError** error) { - CAIRO_DOCK_APPLET_IAPPLET_GET_INTERFACE (self)->PopupDialog (self, hDialogAttributes, hWidgetAttributes, error); -} - - -void cairo_dock_applet_iapplet_AddDataRenderer (CairoDockAppletIApplet* self, const char* cType, gint iNbValues, const char* cTheme, GError** error) { - CAIRO_DOCK_APPLET_IAPPLET_GET_INTERFACE (self)->AddDataRenderer (self, cType, iNbValues, cTheme, error); -} - - -void cairo_dock_applet_iapplet_RenderValues (CairoDockAppletIApplet* self, double* pValues, int pValues_length1, GError** error) { - CAIRO_DOCK_APPLET_IAPPLET_GET_INTERFACE (self)->RenderValues (self, pValues, pValues_length1, error); -} - - -void cairo_dock_applet_iapplet_ControlAppli (CairoDockAppletIApplet* self, const char* cApplicationClass, GError** error) { - CAIRO_DOCK_APPLET_IAPPLET_GET_INTERFACE (self)->ControlAppli (self, cApplicationClass, error); -} - - -void cairo_dock_applet_iapplet_ShowAppli (CairoDockAppletIApplet* self, gboolean bShow, GError** error) { - CAIRO_DOCK_APPLET_IAPPLET_GET_INTERFACE (self)->ShowAppli (self, bShow, error); -} - - -void cairo_dock_applet_iapplet_AddMenuItems (CairoDockAppletIApplet* self, GHashTable** pItems, int pItems_length1, GError** error) { - CAIRO_DOCK_APPLET_IAPPLET_GET_INTERFACE (self)->AddMenuItems (self, pItems, pItems_length1, error); -} - - -void cairo_dock_applet_iapplet_BindShortkey (CairoDockAppletIApplet* self, char** cShortkeys, int cShortkeys_length1, GError** error) { - CAIRO_DOCK_APPLET_IAPPLET_GET_INTERFACE (self)->BindShortkey (self, cShortkeys, cShortkeys_length1, error); -} - - -static void cairo_dock_applet_iapplet_base_init (CairoDockAppletIAppletIface * iface) { - static gboolean initialized = FALSE; - if (!initialized) { - initialized = TRUE; - g_signal_new ("on_click", CAIRO_DOCK_APPLET_TYPE_IAPPLET, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); - g_signal_new ("on_middle_click", CAIRO_DOCK_APPLET_TYPE_IAPPLET, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - g_signal_new ("on_build_menu", CAIRO_DOCK_APPLET_TYPE_IAPPLET, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - g_signal_new ("on_menu_select", CAIRO_DOCK_APPLET_TYPE_IAPPLET, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); - g_signal_new ("on_scroll", CAIRO_DOCK_APPLET_TYPE_IAPPLET, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); - g_signal_new ("on_drop_data", CAIRO_DOCK_APPLET_TYPE_IAPPLET, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); - g_signal_new ("on_answer", CAIRO_DOCK_APPLET_TYPE_IAPPLET, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__VARIANT, G_TYPE_NONE, 1, G_TYPE_VARIANT); - g_signal_new ("on_answer_dialog", CAIRO_DOCK_APPLET_TYPE_IAPPLET, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__INT_VARIANT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_VARIANT); - g_signal_new ("on_shortkey", CAIRO_DOCK_APPLET_TYPE_IAPPLET, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); - g_signal_new ("on_change_focus", CAIRO_DOCK_APPLET_TYPE_IAPPLET, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); - g_signal_new ("on_stop_module", CAIRO_DOCK_APPLET_TYPE_IAPPLET, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - g_signal_new ("on_reload_module", CAIRO_DOCK_APPLET_TYPE_IAPPLET, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); - } -} - - -GType cairo_dock_applet_iapplet_get_type (void) { - static volatile gsize cairo_dock_applet_iapplet_type_id__volatile = 0; - if (g_once_init_enter (&cairo_dock_applet_iapplet_type_id__volatile)) { - static const GTypeInfo g_define_type_info = { sizeof (CairoDockAppletIAppletIface), (GBaseInitFunc) cairo_dock_applet_iapplet_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; - GType cairo_dock_applet_iapplet_type_id; - cairo_dock_applet_iapplet_type_id = g_type_register_static (G_TYPE_INTERFACE, "CairoDockAppletIApplet", &g_define_type_info, 0); - g_type_interface_add_prerequisite (cairo_dock_applet_iapplet_type_id, G_TYPE_OBJECT); - g_once_init_leave (&cairo_dock_applet_iapplet_type_id__volatile, cairo_dock_applet_iapplet_type_id); - } - return cairo_dock_applet_iapplet_type_id__volatile; -} - - -G_DEFINE_TYPE_EXTENDED (CairoDockAppletIAppletProxy, cairo_dock_applet_iapplet_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (CAIRO_DOCK_APPLET_TYPE_IAPPLET, cairo_dock_applet_iapplet_proxy_cairo_dock_applet_iapplet_interface_init) ); -static void cairo_dock_applet_iapplet_proxy_class_init (CairoDockAppletIAppletProxyClass* klass) { - G_DBUS_PROXY_CLASS (klass)->g_signal = cairo_dock_applet_iapplet_proxy_g_signal; -} - - -static void _dbus_handle_cairo_dock_applet_iapplet_on_click (CairoDockAppletIApplet* self, GVariant* parameters) { - gint iState = 0; - GVariant* _tmp0_; - GVariantIter _arguments_iter; - g_variant_iter_init (&_arguments_iter, parameters); - _tmp0_ = g_variant_iter_next_value (&_arguments_iter); - iState = g_variant_get_int32 (_tmp0_); - g_variant_unref (_tmp0_); - g_signal_emit_by_name (self, "on-click", iState); -} - - -static void _dbus_handle_cairo_dock_applet_iapplet_on_middle_click (CairoDockAppletIApplet* self, GVariant* parameters) { - GVariantIter _arguments_iter; - g_variant_iter_init (&_arguments_iter, parameters); - g_signal_emit_by_name (self, "on-middle-click"); -} - - -static void _dbus_handle_cairo_dock_applet_iapplet_on_build_menu (CairoDockAppletIApplet* self, GVariant* parameters) { - GVariantIter _arguments_iter; - g_variant_iter_init (&_arguments_iter, parameters); - g_signal_emit_by_name (self, "on-build-menu"); -} - - -static void _dbus_handle_cairo_dock_applet_iapplet_on_menu_select (CairoDockAppletIApplet* self, GVariant* parameters) { - gint iNumEntry = 0; - GVariant* _tmp1_; - GVariantIter _arguments_iter; - g_variant_iter_init (&_arguments_iter, parameters); - _tmp1_ = g_variant_iter_next_value (&_arguments_iter); - iNumEntry = g_variant_get_int32 (_tmp1_); - g_variant_unref (_tmp1_); - g_signal_emit_by_name (self, "on-menu-select", iNumEntry); -} - - -static void _dbus_handle_cairo_dock_applet_iapplet_on_scroll (CairoDockAppletIApplet* self, GVariant* parameters) { - gboolean bScrollUp = FALSE; - GVariant* _tmp2_; - GVariantIter _arguments_iter; - g_variant_iter_init (&_arguments_iter, parameters); - _tmp2_ = g_variant_iter_next_value (&_arguments_iter); - bScrollUp = g_variant_get_boolean (_tmp2_); - g_variant_unref (_tmp2_); - g_signal_emit_by_name (self, "on-scroll", bScrollUp); -} - - -static void _dbus_handle_cairo_dock_applet_iapplet_on_drop_data (CairoDockAppletIApplet* self, GVariant* parameters) { - char* cReceivedData = NULL; - GVariant* _tmp3_; - GVariantIter _arguments_iter; - g_variant_iter_init (&_arguments_iter, parameters); - _tmp3_ = g_variant_iter_next_value (&_arguments_iter); - cReceivedData = g_variant_dup_string (_tmp3_, NULL); - g_variant_unref (_tmp3_); - g_signal_emit_by_name (self, "on-drop-data", cReceivedData); - _g_free0 (cReceivedData); -} - - -static void _dbus_handle_cairo_dock_applet_iapplet_on_answer (CairoDockAppletIApplet* self, GVariant* parameters) { - GVariant* answer = NULL; - GVariant* _tmp4_; - GVariantIter _arguments_iter; - g_variant_iter_init (&_arguments_iter, parameters); - _tmp4_ = g_variant_iter_next_value (&_arguments_iter); - answer = g_variant_get_variant (_tmp4_); - g_variant_unref (_tmp4_); - g_signal_emit_by_name (self, "on-answer", answer); - _g_variant_unref0 (answer); -} - - -static void _dbus_handle_cairo_dock_applet_iapplet_on_answer_dialog (CairoDockAppletIApplet* self, GVariant* parameters) { - gint iButton = 0; - GVariant* _tmp5_; - GVariant* answer = NULL; - GVariant* _tmp6_; - GVariantIter _arguments_iter; - g_variant_iter_init (&_arguments_iter, parameters); - _tmp5_ = g_variant_iter_next_value (&_arguments_iter); - iButton = g_variant_get_int32 (_tmp5_); - g_variant_unref (_tmp5_); - _tmp6_ = g_variant_iter_next_value (&_arguments_iter); - answer = g_variant_get_variant (_tmp6_); - g_variant_unref (_tmp6_); - g_signal_emit_by_name (self, "on-answer-dialog", iButton, answer); - _g_variant_unref0 (answer); -} - - -static void _dbus_handle_cairo_dock_applet_iapplet_on_shortkey (CairoDockAppletIApplet* self, GVariant* parameters) { - char* cKey = NULL; - GVariant* _tmp7_; - GVariantIter _arguments_iter; - g_variant_iter_init (&_arguments_iter, parameters); - _tmp7_ = g_variant_iter_next_value (&_arguments_iter); - cKey = g_variant_dup_string (_tmp7_, NULL); - g_variant_unref (_tmp7_); - g_signal_emit_by_name (self, "on-shortkey", cKey); - _g_free0 (cKey); -} - - -static void _dbus_handle_cairo_dock_applet_iapplet_on_change_focus (CairoDockAppletIApplet* self, GVariant* parameters) { - gboolean bIsActive = FALSE; - GVariant* _tmp8_; - GVariantIter _arguments_iter; - g_variant_iter_init (&_arguments_iter, parameters); - _tmp8_ = g_variant_iter_next_value (&_arguments_iter); - bIsActive = g_variant_get_boolean (_tmp8_); - g_variant_unref (_tmp8_); - g_signal_emit_by_name (self, "on-change-focus", bIsActive); -} - - -static void _dbus_handle_cairo_dock_applet_iapplet_on_stop_module (CairoDockAppletIApplet* self, GVariant* parameters) { - GVariantIter _arguments_iter; - g_variant_iter_init (&_arguments_iter, parameters); - g_signal_emit_by_name (self, "on-stop-module"); -} - - -static void _dbus_handle_cairo_dock_applet_iapplet_on_reload_module (CairoDockAppletIApplet* self, GVariant* parameters) { - gboolean bConfigHasChanged = FALSE; - GVariant* _tmp9_; - GVariantIter _arguments_iter; - g_variant_iter_init (&_arguments_iter, parameters); - _tmp9_ = g_variant_iter_next_value (&_arguments_iter); - bConfigHasChanged = g_variant_get_boolean (_tmp9_); - g_variant_unref (_tmp9_); - g_signal_emit_by_name (self, "on-reload-module", bConfigHasChanged); -} - - -static void cairo_dock_applet_iapplet_proxy_g_signal (GDBusProxy* proxy, const gchar* sender_name, const gchar* signal_name, GVariant* parameters) { - if (strcmp (signal_name, "on_click") == 0) { - _dbus_handle_cairo_dock_applet_iapplet_on_click (proxy, parameters); - } else if (strcmp (signal_name, "on_middle_click") == 0) { - _dbus_handle_cairo_dock_applet_iapplet_on_middle_click (proxy, parameters); - } else if (strcmp (signal_name, "on_build_menu") == 0) { - _dbus_handle_cairo_dock_applet_iapplet_on_build_menu (proxy, parameters); - } else if (strcmp (signal_name, "on_menu_select") == 0) { - _dbus_handle_cairo_dock_applet_iapplet_on_menu_select (proxy, parameters); - } else if (strcmp (signal_name, "on_scroll") == 0) { - _dbus_handle_cairo_dock_applet_iapplet_on_scroll (proxy, parameters); - } else if (strcmp (signal_name, "on_drop_data") == 0) { - _dbus_handle_cairo_dock_applet_iapplet_on_drop_data (proxy, parameters); - } else if (strcmp (signal_name, "on_answer") == 0) { - _dbus_handle_cairo_dock_applet_iapplet_on_answer (proxy, parameters); - } else if (strcmp (signal_name, "on_answer_dialog") == 0) { - _dbus_handle_cairo_dock_applet_iapplet_on_answer_dialog (proxy, parameters); - } else if (strcmp (signal_name, "on_shortkey") == 0) { - _dbus_handle_cairo_dock_applet_iapplet_on_shortkey (proxy, parameters); - } else if (strcmp (signal_name, "on_change_focus") == 0) { - _dbus_handle_cairo_dock_applet_iapplet_on_change_focus (proxy, parameters); - } else if (strcmp (signal_name, "on_stop_module") == 0) { - _dbus_handle_cairo_dock_applet_iapplet_on_stop_module (proxy, parameters); - } else if (strcmp (signal_name, "on_reload_module") == 0) { - _dbus_handle_cairo_dock_applet_iapplet_on_reload_module (proxy, parameters); - } -} - - -static void cairo_dock_applet_iapplet_proxy_init (CairoDockAppletIAppletProxy* self) { -} - - -static GVariant* cairo_dock_applet_iapplet_proxy_Get (CairoDockAppletIApplet* self, const char* cProperty, GError** error) { - GVariant *_arguments, *_reply; - GVariantBuilder _arguments_builder; - GVariantIter _reply_iter; - GVariant* _result; - GVariant* _tmp10_; - g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (cProperty)); - _arguments = g_variant_builder_end (&_arguments_builder); - _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.cairodock.CairoDock.applet.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, error); - if (!_reply) { - return NULL; - } - g_variant_iter_init (&_reply_iter, _reply); - _tmp10_ = g_variant_iter_next_value (&_reply_iter); - _result = g_variant_get_variant (_tmp10_); - g_variant_unref (_tmp10_); - g_variant_unref (_reply); - return _result; -} - - -static GHashTable* cairo_dock_applet_iapplet_proxy_GetAll (CairoDockAppletIApplet* self, GError** error) { - GVariant *_arguments, *_reply; - GVariantBuilder _arguments_builder; - GVariantIter _reply_iter; - GHashTable* _result; - GVariant* _tmp11_; - GHashTable* _tmp12_; - GVariantIter _tmp13_; - GVariant* _tmp14_; - GVariant* _tmp15_; - g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); - _arguments = g_variant_builder_end (&_arguments_builder); - _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.cairodock.CairoDock.applet.GetAll", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, error); - if (!_reply) { - return NULL; - } - g_variant_iter_init (&_reply_iter, _reply); - _tmp11_ = g_variant_iter_next_value (&_reply_iter); - _tmp12_ = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); - g_variant_iter_init (&_tmp13_, _tmp11_); - while (g_variant_iter_loop (&_tmp13_, "{?*}", &_tmp14_, &_tmp15_)) { - g_hash_table_insert (_tmp12_, g_variant_dup_string (_tmp14_, NULL), g_variant_get_variant (_tmp15_)); - } - _result = _tmp12_; - g_variant_unref (_tmp11_); - g_variant_unref (_reply); - return _result; -} - - -static void cairo_dock_applet_iapplet_proxy_SetQuickInfo (CairoDockAppletIApplet* self, const char* cQuickInfo, GError** error) { - GVariant *_arguments, *_reply; - GVariantBuilder _arguments_builder; - GVariantIter _reply_iter; - g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (cQuickInfo)); - _arguments = g_variant_builder_end (&_arguments_builder); - _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.cairodock.CairoDock.applet.SetQuickInfo", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, error); - if (!_reply) { - return; - } - g_variant_iter_init (&_reply_iter, _reply); - g_variant_unref (_reply); -} - - -static void cairo_dock_applet_iapplet_proxy_SetLabel (CairoDockAppletIApplet* self, const char* cLabel, GError** error) { - GVariant *_arguments, *_reply; - GVariantBuilder _arguments_builder; - GVariantIter _reply_iter; - g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (cLabel)); - _arguments = g_variant_builder_end (&_arguments_builder); - _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.cairodock.CairoDock.applet.SetLabel", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, error); - if (!_reply) { - return; - } - g_variant_iter_init (&_reply_iter, _reply); - g_variant_unref (_reply); -} - - -static void cairo_dock_applet_iapplet_proxy_SetIcon (CairoDockAppletIApplet* self, const char* cImage, GError** error) { - GVariant *_arguments, *_reply; - GVariantBuilder _arguments_builder; - GVariantIter _reply_iter; - g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (cImage)); - _arguments = g_variant_builder_end (&_arguments_builder); - _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.cairodock.CairoDock.applet.SetIcon", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, error); - if (!_reply) { - return; - } - g_variant_iter_init (&_reply_iter, _reply); - g_variant_unref (_reply); -} - - -static void cairo_dock_applet_iapplet_proxy_SetEmblem (CairoDockAppletIApplet* self, const char* cImage, gint iPosition, GError** error) { - GVariant *_arguments, *_reply; - GVariantBuilder _arguments_builder; - GVariantIter _reply_iter; - g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (cImage)); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_int32 (iPosition)); - _arguments = g_variant_builder_end (&_arguments_builder); - _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.cairodock.CairoDock.applet.SetEmblem", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, error); - if (!_reply) { - return; - } - g_variant_iter_init (&_reply_iter, _reply); - g_variant_unref (_reply); -} - - -static void cairo_dock_applet_iapplet_proxy_Animate (CairoDockAppletIApplet* self, const char* cAnimation, gint iRounds, GError** error) { - GVariant *_arguments, *_reply; - GVariantBuilder _arguments_builder; - GVariantIter _reply_iter; - g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (cAnimation)); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_int32 (iRounds)); - _arguments = g_variant_builder_end (&_arguments_builder); - _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.cairodock.CairoDock.applet.Animate", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, error); - if (!_reply) { - return; - } - g_variant_iter_init (&_reply_iter, _reply); - g_variant_unref (_reply); -} - - -static void cairo_dock_applet_iapplet_proxy_DemandsAttention (CairoDockAppletIApplet* self, gboolean bStart, const char* cAnimation, GError** error) { - GVariant *_arguments, *_reply; - GVariantBuilder _arguments_builder; - GVariantIter _reply_iter; - g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_boolean (bStart)); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (cAnimation)); - _arguments = g_variant_builder_end (&_arguments_builder); - _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.cairodock.CairoDock.applet.DemandsAttention", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, error); - if (!_reply) { - return; - } - g_variant_iter_init (&_reply_iter, _reply); - g_variant_unref (_reply); -} - - -static void cairo_dock_applet_iapplet_proxy_ShowDialog (CairoDockAppletIApplet* self, const char* cMessage, gint iDuration, GError** error) { - GVariant *_arguments, *_reply; - GVariantBuilder _arguments_builder; - GVariantIter _reply_iter; - g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (cMessage)); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_int32 (iDuration)); - _arguments = g_variant_builder_end (&_arguments_builder); - _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.cairodock.CairoDock.applet.ShowDialog", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, error); - if (!_reply) { - return; - } - g_variant_iter_init (&_reply_iter, _reply); - g_variant_unref (_reply); -} - - -static void cairo_dock_applet_iapplet_proxy_PopupDialog (CairoDockAppletIApplet* self, GHashTable* hDialogAttributes, GHashTable* hWidgetAttributes, GError** error) { - GVariant *_arguments, *_reply; - GVariantBuilder _arguments_builder; - GVariantBuilder _tmp16_; - GHashTableIter _tmp17_; - gpointer _tmp18_, _tmp19_; - GVariantBuilder _tmp20_; - GHashTableIter _tmp21_; - gpointer _tmp22_, _tmp23_; - GVariantIter _reply_iter; - g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); - g_hash_table_iter_init (&_tmp17_, hDialogAttributes); - g_variant_builder_init (&_tmp16_, G_VARIANT_TYPE_DICTIONARY); - while (g_hash_table_iter_next (&_tmp17_, &_tmp18_, &_tmp19_)) { - char* _key; - GVariant* _value; - _key = (char*) _tmp18_; - _value = (GVariant*) _tmp19_; - g_variant_builder_add (&_tmp16_, "{?*}", g_variant_new_string (_key), g_variant_new_variant (_value)); - } - g_variant_builder_add_value (&_arguments_builder, g_variant_builder_end (&_tmp16_)); - g_hash_table_iter_init (&_tmp21_, hWidgetAttributes); - g_variant_builder_init (&_tmp20_, G_VARIANT_TYPE_DICTIONARY); - while (g_hash_table_iter_next (&_tmp21_, &_tmp22_, &_tmp23_)) { - char* _key; - GVariant* _value; - _key = (char*) _tmp22_; - _value = (GVariant*) _tmp23_; - g_variant_builder_add (&_tmp20_, "{?*}", g_variant_new_string (_key), g_variant_new_variant (_value)); - } - g_variant_builder_add_value (&_arguments_builder, g_variant_builder_end (&_tmp20_)); - _arguments = g_variant_builder_end (&_arguments_builder); - _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.cairodock.CairoDock.applet.PopupDialog", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, error); - if (!_reply) { - return; - } - g_variant_iter_init (&_reply_iter, _reply); - g_variant_unref (_reply); -} - - -static void cairo_dock_applet_iapplet_proxy_AddDataRenderer (CairoDockAppletIApplet* self, const char* cType, gint iNbValues, const char* cTheme, GError** error) { - GVariant *_arguments, *_reply; - GVariantBuilder _arguments_builder; - GVariantIter _reply_iter; - g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (cType)); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_int32 (iNbValues)); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (cTheme)); - _arguments = g_variant_builder_end (&_arguments_builder); - _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.cairodock.CairoDock.applet.AddDataRenderer", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, error); - if (!_reply) { - return; - } - g_variant_iter_init (&_reply_iter, _reply); - g_variant_unref (_reply); -} - - -static void cairo_dock_applet_iapplet_proxy_RenderValues (CairoDockAppletIApplet* self, double* pValues, int pValues_length1, GError** error) { - GVariant *_arguments, *_reply; - GVariantBuilder _arguments_builder; - double* _tmp24_; - GVariantBuilder _tmp25_; - int _tmp26_; - GVariantIter _reply_iter; - g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); - _tmp24_ = pValues; - g_variant_builder_init (&_tmp25_, G_VARIANT_TYPE_ARRAY); - for (_tmp26_ = 0; _tmp26_ < pValues_length1; _tmp26_++) { - g_variant_builder_add_value (&_tmp25_, g_variant_new_double (*_tmp24_)); - _tmp24_++; - } - g_variant_builder_add_value (&_arguments_builder, g_variant_builder_end (&_tmp25_)); - _arguments = g_variant_builder_end (&_arguments_builder); - _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.cairodock.CairoDock.applet.RenderValues", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, error); - if (!_reply) { - return; - } - g_variant_iter_init (&_reply_iter, _reply); - g_variant_unref (_reply); -} - - -static void cairo_dock_applet_iapplet_proxy_ControlAppli (CairoDockAppletIApplet* self, const char* cApplicationClass, GError** error) { - GVariant *_arguments, *_reply; - GVariantBuilder _arguments_builder; - GVariantIter _reply_iter; - g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (cApplicationClass)); - _arguments = g_variant_builder_end (&_arguments_builder); - _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.cairodock.CairoDock.applet.ControlAppli", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, error); - if (!_reply) { - return; - } - g_variant_iter_init (&_reply_iter, _reply); - g_variant_unref (_reply); -} - - -static void cairo_dock_applet_iapplet_proxy_ShowAppli (CairoDockAppletIApplet* self, gboolean bShow, GError** error) { - GVariant *_arguments, *_reply; - GVariantBuilder _arguments_builder; - GVariantIter _reply_iter; - g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_boolean (bShow)); - _arguments = g_variant_builder_end (&_arguments_builder); - _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.cairodock.CairoDock.applet.ShowAppli", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, error); - if (!_reply) { - return; - } - g_variant_iter_init (&_reply_iter, _reply); - g_variant_unref (_reply); -} - - -static void cairo_dock_applet_iapplet_proxy_AddMenuItems (CairoDockAppletIApplet* self, GHashTable** pItems, int pItems_length1, GError** error) { - GVariant *_arguments, *_reply; - GVariantBuilder _arguments_builder; - GHashTable** _tmp27_; - GVariantBuilder _tmp28_; - int _tmp29_; - GVariantIter _reply_iter; - g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); - _tmp27_ = pItems; - g_variant_builder_init (&_tmp28_, G_VARIANT_TYPE_ARRAY); - for (_tmp29_ = 0; _tmp29_ < pItems_length1; _tmp29_++) { - GVariantBuilder _tmp30_; - GHashTableIter _tmp31_; - gpointer _tmp32_, _tmp33_; - g_hash_table_iter_init (&_tmp31_, *_tmp27_); - g_variant_builder_init (&_tmp30_, G_VARIANT_TYPE_DICTIONARY); - while (g_hash_table_iter_next (&_tmp31_, &_tmp32_, &_tmp33_)) { - char* _key; - GVariant* _value; - _key = (char*) _tmp32_; - _value = (GVariant*) _tmp33_; - g_variant_builder_add (&_tmp30_, "{?*}", g_variant_new_string (_key), g_variant_new_variant (_value)); - } - g_variant_builder_add_value (&_tmp28_, g_variant_builder_end (&_tmp30_)); - _tmp27_++; - } - g_variant_builder_add_value (&_arguments_builder, g_variant_builder_end (&_tmp28_)); - _arguments = g_variant_builder_end (&_arguments_builder); - _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.cairodock.CairoDock.applet.AddMenuItems", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, error); - if (!_reply) { - return; - } - g_variant_iter_init (&_reply_iter, _reply); - g_variant_unref (_reply); -} - - -static void cairo_dock_applet_iapplet_proxy_BindShortkey (CairoDockAppletIApplet* self, char** cShortkeys, int cShortkeys_length1, GError** error) { - GVariant *_arguments, *_reply; - GVariantBuilder _arguments_builder; - char** _tmp34_; - GVariantBuilder _tmp35_; - int _tmp36_; - GVariantIter _reply_iter; - g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); - _tmp34_ = cShortkeys; - g_variant_builder_init (&_tmp35_, G_VARIANT_TYPE_ARRAY); - for (_tmp36_ = 0; _tmp36_ < cShortkeys_length1; _tmp36_++) { - g_variant_builder_add_value (&_tmp35_, g_variant_new_string (*_tmp34_)); - _tmp34_++; - } - g_variant_builder_add_value (&_arguments_builder, g_variant_builder_end (&_tmp35_)); - _arguments = g_variant_builder_end (&_arguments_builder); - _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.cairodock.CairoDock.applet.BindShortkey", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, error); - if (!_reply) { - return; - } - g_variant_iter_init (&_reply_iter, _reply); - g_variant_unref (_reply); -} - - -static void cairo_dock_applet_iapplet_proxy_cairo_dock_applet_iapplet_interface_init (CairoDockAppletIAppletIface* iface) { - iface->Get = cairo_dock_applet_iapplet_proxy_Get; - iface->GetAll = cairo_dock_applet_iapplet_proxy_GetAll; - iface->SetQuickInfo = cairo_dock_applet_iapplet_proxy_SetQuickInfo; - iface->SetLabel = cairo_dock_applet_iapplet_proxy_SetLabel; - iface->SetIcon = cairo_dock_applet_iapplet_proxy_SetIcon; - iface->SetEmblem = cairo_dock_applet_iapplet_proxy_SetEmblem; - iface->Animate = cairo_dock_applet_iapplet_proxy_Animate; - iface->DemandsAttention = cairo_dock_applet_iapplet_proxy_DemandsAttention; - iface->ShowDialog = cairo_dock_applet_iapplet_proxy_ShowDialog; - iface->PopupDialog = cairo_dock_applet_iapplet_proxy_PopupDialog; - iface->AddDataRenderer = cairo_dock_applet_iapplet_proxy_AddDataRenderer; - iface->RenderValues = cairo_dock_applet_iapplet_proxy_RenderValues; - iface->ControlAppli = cairo_dock_applet_iapplet_proxy_ControlAppli; - iface->ShowAppli = cairo_dock_applet_iapplet_proxy_ShowAppli; - iface->AddMenuItems = cairo_dock_applet_iapplet_proxy_AddMenuItems; - iface->BindShortkey = cairo_dock_applet_iapplet_proxy_BindShortkey; -} - - -static void _dbus_cairo_dock_applet_iapplet_Get (CairoDockAppletIApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation) { - GError* error; - char* cProperty = NULL; - GVariant* _tmp37_; - GVariant* result; - GVariantIter _arguments_iter; - GVariant* _reply; - GVariantBuilder _reply_builder; - error = NULL; - g_variant_iter_init (&_arguments_iter, parameters); - _tmp37_ = g_variant_iter_next_value (&_arguments_iter); - cProperty = g_variant_dup_string (_tmp37_, NULL); - g_variant_unref (_tmp37_); - result = cairo_dock_applet_iapplet_Get (self, cProperty, &error); - if (error) { - g_dbus_method_invocation_return_gerror (invocation, error); - return; - } - g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE); - _g_free0 (cProperty); - g_variant_builder_add_value (&_reply_builder, g_variant_new_variant (result)); - _g_variant_unref0 (result); - _reply = g_variant_builder_end (&_reply_builder); - g_dbus_method_invocation_return_value (invocation, _reply); -} - - -static void _dbus_cairo_dock_applet_iapplet_GetAll (CairoDockAppletIApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation) { - GError* error; - GHashTable* result; - GVariantIter _arguments_iter; - GVariant* _reply; - GVariantBuilder _reply_builder; - GVariantBuilder _tmp38_; - GHashTableIter _tmp39_; - gpointer _tmp40_, _tmp41_; - error = NULL; - g_variant_iter_init (&_arguments_iter, parameters); - result = cairo_dock_applet_iapplet_GetAll (self, &error); - if (error) { - g_dbus_method_invocation_return_gerror (invocation, error); - return; - } - g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE); - g_hash_table_iter_init (&_tmp39_, result); - g_variant_builder_init (&_tmp38_, G_VARIANT_TYPE_DICTIONARY); - while (g_hash_table_iter_next (&_tmp39_, &_tmp40_, &_tmp41_)) { - char* _key; - GVariant* _value; - _key = (char*) _tmp40_; - _value = (GVariant*) _tmp41_; - g_variant_builder_add (&_tmp38_, "{?*}", g_variant_new_string (_key), g_variant_new_variant (_value)); - } - g_variant_builder_add_value (&_reply_builder, g_variant_builder_end (&_tmp38_)); - _g_hash_table_unref0 (result); - _reply = g_variant_builder_end (&_reply_builder); - g_dbus_method_invocation_return_value (invocation, _reply); -} - - -static void _dbus_cairo_dock_applet_iapplet_SetQuickInfo (CairoDockAppletIApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation) { - GError* error; - char* cQuickInfo = NULL; - GVariant* _tmp42_; - GVariantIter _arguments_iter; - GVariant* _reply; - GVariantBuilder _reply_builder; - error = NULL; - g_variant_iter_init (&_arguments_iter, parameters); - _tmp42_ = g_variant_iter_next_value (&_arguments_iter); - cQuickInfo = g_variant_dup_string (_tmp42_, NULL); - g_variant_unref (_tmp42_); - cairo_dock_applet_iapplet_SetQuickInfo (self, cQuickInfo, &error); - if (error) { - g_dbus_method_invocation_return_gerror (invocation, error); - return; - } - g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE); - _g_free0 (cQuickInfo); - _reply = g_variant_builder_end (&_reply_builder); - g_dbus_method_invocation_return_value (invocation, _reply); -} - - -static void _dbus_cairo_dock_applet_iapplet_SetLabel (CairoDockAppletIApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation) { - GError* error; - char* cLabel = NULL; - GVariant* _tmp43_; - GVariantIter _arguments_iter; - GVariant* _reply; - GVariantBuilder _reply_builder; - error = NULL; - g_variant_iter_init (&_arguments_iter, parameters); - _tmp43_ = g_variant_iter_next_value (&_arguments_iter); - cLabel = g_variant_dup_string (_tmp43_, NULL); - g_variant_unref (_tmp43_); - cairo_dock_applet_iapplet_SetLabel (self, cLabel, &error); - if (error) { - g_dbus_method_invocation_return_gerror (invocation, error); - return; - } - g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE); - _g_free0 (cLabel); - _reply = g_variant_builder_end (&_reply_builder); - g_dbus_method_invocation_return_value (invocation, _reply); -} - - -static void _dbus_cairo_dock_applet_iapplet_SetIcon (CairoDockAppletIApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation) { - GError* error; - char* cImage = NULL; - GVariant* _tmp44_; - GVariantIter _arguments_iter; - GVariant* _reply; - GVariantBuilder _reply_builder; - error = NULL; - g_variant_iter_init (&_arguments_iter, parameters); - _tmp44_ = g_variant_iter_next_value (&_arguments_iter); - cImage = g_variant_dup_string (_tmp44_, NULL); - g_variant_unref (_tmp44_); - cairo_dock_applet_iapplet_SetIcon (self, cImage, &error); - if (error) { - g_dbus_method_invocation_return_gerror (invocation, error); - return; - } - g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE); - _g_free0 (cImage); - _reply = g_variant_builder_end (&_reply_builder); - g_dbus_method_invocation_return_value (invocation, _reply); -} - - -static void _dbus_cairo_dock_applet_iapplet_SetEmblem (CairoDockAppletIApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation) { - GError* error; - char* cImage = NULL; - GVariant* _tmp45_; - gint iPosition = 0; - GVariant* _tmp46_; - GVariantIter _arguments_iter; - GVariant* _reply; - GVariantBuilder _reply_builder; - error = NULL; - g_variant_iter_init (&_arguments_iter, parameters); - _tmp45_ = g_variant_iter_next_value (&_arguments_iter); - cImage = g_variant_dup_string (_tmp45_, NULL); - g_variant_unref (_tmp45_); - _tmp46_ = g_variant_iter_next_value (&_arguments_iter); - iPosition = g_variant_get_int32 (_tmp46_); - g_variant_unref (_tmp46_); - cairo_dock_applet_iapplet_SetEmblem (self, cImage, iPosition, &error); - if (error) { - g_dbus_method_invocation_return_gerror (invocation, error); - return; - } - g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE); - _g_free0 (cImage); - _reply = g_variant_builder_end (&_reply_builder); - g_dbus_method_invocation_return_value (invocation, _reply); -} - - -static void _dbus_cairo_dock_applet_iapplet_Animate (CairoDockAppletIApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation) { - GError* error; - char* cAnimation = NULL; - GVariant* _tmp47_; - gint iRounds = 0; - GVariant* _tmp48_; - GVariantIter _arguments_iter; - GVariant* _reply; - GVariantBuilder _reply_builder; - error = NULL; - g_variant_iter_init (&_arguments_iter, parameters); - _tmp47_ = g_variant_iter_next_value (&_arguments_iter); - cAnimation = g_variant_dup_string (_tmp47_, NULL); - g_variant_unref (_tmp47_); - _tmp48_ = g_variant_iter_next_value (&_arguments_iter); - iRounds = g_variant_get_int32 (_tmp48_); - g_variant_unref (_tmp48_); - cairo_dock_applet_iapplet_Animate (self, cAnimation, iRounds, &error); - if (error) { - g_dbus_method_invocation_return_gerror (invocation, error); - return; - } - g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE); - _g_free0 (cAnimation); - _reply = g_variant_builder_end (&_reply_builder); - g_dbus_method_invocation_return_value (invocation, _reply); -} - - -static void _dbus_cairo_dock_applet_iapplet_DemandsAttention (CairoDockAppletIApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation) { - GError* error; - gboolean bStart = FALSE; - GVariant* _tmp49_; - char* cAnimation = NULL; - GVariant* _tmp50_; - GVariantIter _arguments_iter; - GVariant* _reply; - GVariantBuilder _reply_builder; - error = NULL; - g_variant_iter_init (&_arguments_iter, parameters); - _tmp49_ = g_variant_iter_next_value (&_arguments_iter); - bStart = g_variant_get_boolean (_tmp49_); - g_variant_unref (_tmp49_); - _tmp50_ = g_variant_iter_next_value (&_arguments_iter); - cAnimation = g_variant_dup_string (_tmp50_, NULL); - g_variant_unref (_tmp50_); - cairo_dock_applet_iapplet_DemandsAttention (self, bStart, cAnimation, &error); - if (error) { - g_dbus_method_invocation_return_gerror (invocation, error); - return; - } - g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE); - _g_free0 (cAnimation); - _reply = g_variant_builder_end (&_reply_builder); - g_dbus_method_invocation_return_value (invocation, _reply); -} - - -static void _dbus_cairo_dock_applet_iapplet_ShowDialog (CairoDockAppletIApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation) { - GError* error; - char* cMessage = NULL; - GVariant* _tmp51_; - gint iDuration = 0; - GVariant* _tmp52_; - GVariantIter _arguments_iter; - GVariant* _reply; - GVariantBuilder _reply_builder; - error = NULL; - g_variant_iter_init (&_arguments_iter, parameters); - _tmp51_ = g_variant_iter_next_value (&_arguments_iter); - cMessage = g_variant_dup_string (_tmp51_, NULL); - g_variant_unref (_tmp51_); - _tmp52_ = g_variant_iter_next_value (&_arguments_iter); - iDuration = g_variant_get_int32 (_tmp52_); - g_variant_unref (_tmp52_); - cairo_dock_applet_iapplet_ShowDialog (self, cMessage, iDuration, &error); - if (error) { - g_dbus_method_invocation_return_gerror (invocation, error); - return; - } - g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE); - _g_free0 (cMessage); - _reply = g_variant_builder_end (&_reply_builder); - g_dbus_method_invocation_return_value (invocation, _reply); -} - - -static void _dbus_cairo_dock_applet_iapplet_PopupDialog (CairoDockAppletIApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation) { - GError* error; - GHashTable* hDialogAttributes = NULL; - GVariant* _tmp53_; - GHashTable* _tmp54_; - GVariantIter _tmp55_; - GVariant* _tmp56_; - GVariant* _tmp57_; - GHashTable* hWidgetAttributes = NULL; - GVariant* _tmp58_; - GHashTable* _tmp59_; - GVariantIter _tmp60_; - GVariant* _tmp61_; - GVariant* _tmp62_; - GVariantIter _arguments_iter; - GVariant* _reply; - GVariantBuilder _reply_builder; - error = NULL; - g_variant_iter_init (&_arguments_iter, parameters); - _tmp53_ = g_variant_iter_next_value (&_arguments_iter); - _tmp54_ = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); - g_variant_iter_init (&_tmp55_, _tmp53_); - while (g_variant_iter_loop (&_tmp55_, "{?*}", &_tmp56_, &_tmp57_)) { - g_hash_table_insert (_tmp54_, g_variant_dup_string (_tmp56_, NULL), g_variant_get_variant (_tmp57_)); - } - hDialogAttributes = _tmp54_; - g_variant_unref (_tmp53_); - _tmp58_ = g_variant_iter_next_value (&_arguments_iter); - _tmp59_ = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); - g_variant_iter_init (&_tmp60_, _tmp58_); - while (g_variant_iter_loop (&_tmp60_, "{?*}", &_tmp61_, &_tmp62_)) { - g_hash_table_insert (_tmp59_, g_variant_dup_string (_tmp61_, NULL), g_variant_get_variant (_tmp62_)); - } - hWidgetAttributes = _tmp59_; - g_variant_unref (_tmp58_); - cairo_dock_applet_iapplet_PopupDialog (self, hDialogAttributes, hWidgetAttributes, &error); - if (error) { - g_dbus_method_invocation_return_gerror (invocation, error); - return; - } - g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE); - _g_hash_table_unref0 (hDialogAttributes); - _g_hash_table_unref0 (hWidgetAttributes); - _reply = g_variant_builder_end (&_reply_builder); - g_dbus_method_invocation_return_value (invocation, _reply); -} - - -static void _dbus_cairo_dock_applet_iapplet_AddDataRenderer (CairoDockAppletIApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation) { - GError* error; - char* cType = NULL; - GVariant* _tmp63_; - gint iNbValues = 0; - GVariant* _tmp64_; - char* cTheme = NULL; - GVariant* _tmp65_; - GVariantIter _arguments_iter; - GVariant* _reply; - GVariantBuilder _reply_builder; - error = NULL; - g_variant_iter_init (&_arguments_iter, parameters); - _tmp63_ = g_variant_iter_next_value (&_arguments_iter); - cType = g_variant_dup_string (_tmp63_, NULL); - g_variant_unref (_tmp63_); - _tmp64_ = g_variant_iter_next_value (&_arguments_iter); - iNbValues = g_variant_get_int32 (_tmp64_); - g_variant_unref (_tmp64_); - _tmp65_ = g_variant_iter_next_value (&_arguments_iter); - cTheme = g_variant_dup_string (_tmp65_, NULL); - g_variant_unref (_tmp65_); - cairo_dock_applet_iapplet_AddDataRenderer (self, cType, iNbValues, cTheme, &error); - if (error) { - g_dbus_method_invocation_return_gerror (invocation, error); - return; - } - g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE); - _g_free0 (cType); - _g_free0 (cTheme); - _reply = g_variant_builder_end (&_reply_builder); - g_dbus_method_invocation_return_value (invocation, _reply); -} - - -static void _dbus_cairo_dock_applet_iapplet_RenderValues (CairoDockAppletIApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation) { - GError* error; - double* pValues = NULL; - int pValues_length1; - GVariant* _tmp66_; - double* _tmp67_; - int _tmp67__length; - int _tmp67__size; - int _tmp67__length1; - GVariantIter _tmp68_; - GVariant* _tmp69_; - GVariantIter _arguments_iter; - GVariant* _reply; - GVariantBuilder _reply_builder; - error = NULL; - g_variant_iter_init (&_arguments_iter, parameters); - pValues_length1 = 0; - _tmp66_ = g_variant_iter_next_value (&_arguments_iter); - _tmp67_ = g_new (double, 5); - _tmp67__length = 0; - _tmp67__size = 4; - _tmp67__length1 = 0; - g_variant_iter_init (&_tmp68_, _tmp66_); - for (; _tmp69_ = g_variant_iter_next_value (&_tmp68_); _tmp67__length1++) { - if (_tmp67__size == _tmp67__length) { - _tmp67__size = 2 * _tmp67__size; - _tmp67_ = g_renew (double, _tmp67_, _tmp67__size + 1); - } - _tmp67_[_tmp67__length++] = g_variant_get_double (_tmp69_); - g_variant_unref (_tmp69_); - } - pValues_length1 = _tmp67__length1; - pValues = _tmp67_; - g_variant_unref (_tmp66_); - cairo_dock_applet_iapplet_RenderValues (self, pValues, pValues_length1, &error); - if (error) { - g_dbus_method_invocation_return_gerror (invocation, error); - return; - } - g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE); - pValues = (g_free (pValues), NULL); - _reply = g_variant_builder_end (&_reply_builder); - g_dbus_method_invocation_return_value (invocation, _reply); -} - - -static void _dbus_cairo_dock_applet_iapplet_ControlAppli (CairoDockAppletIApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation) { - GError* error; - char* cApplicationClass = NULL; - GVariant* _tmp70_; - GVariantIter _arguments_iter; - GVariant* _reply; - GVariantBuilder _reply_builder; - error = NULL; - g_variant_iter_init (&_arguments_iter, parameters); - _tmp70_ = g_variant_iter_next_value (&_arguments_iter); - cApplicationClass = g_variant_dup_string (_tmp70_, NULL); - g_variant_unref (_tmp70_); - cairo_dock_applet_iapplet_ControlAppli (self, cApplicationClass, &error); - if (error) { - g_dbus_method_invocation_return_gerror (invocation, error); - return; - } - g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE); - _g_free0 (cApplicationClass); - _reply = g_variant_builder_end (&_reply_builder); - g_dbus_method_invocation_return_value (invocation, _reply); -} - - -static void _dbus_cairo_dock_applet_iapplet_ShowAppli (CairoDockAppletIApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation) { - GError* error; - gboolean bShow = FALSE; - GVariant* _tmp71_; - GVariantIter _arguments_iter; - GVariant* _reply; - GVariantBuilder _reply_builder; - error = NULL; - g_variant_iter_init (&_arguments_iter, parameters); - _tmp71_ = g_variant_iter_next_value (&_arguments_iter); - bShow = g_variant_get_boolean (_tmp71_); - g_variant_unref (_tmp71_); - cairo_dock_applet_iapplet_ShowAppli (self, bShow, &error); - if (error) { - g_dbus_method_invocation_return_gerror (invocation, error); - return; - } - g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE); - _reply = g_variant_builder_end (&_reply_builder); - g_dbus_method_invocation_return_value (invocation, _reply); -} - - -static void _dbus_cairo_dock_applet_iapplet_AddMenuItems (CairoDockAppletIApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation) { - GError* error; - GHashTable** pItems = NULL; - int pItems_length1; - GVariant* _tmp72_; - GHashTable** _tmp73_; - int _tmp73__length; - int _tmp73__size; - int _tmp73__length1; - GVariantIter _tmp74_; - GVariant* _tmp75_; - GVariantIter _arguments_iter; - GVariant* _reply; - GVariantBuilder _reply_builder; - error = NULL; - g_variant_iter_init (&_arguments_iter, parameters); - pItems_length1 = 0; - _tmp72_ = g_variant_iter_next_value (&_arguments_iter); - _tmp73_ = g_new (GHashTable*, 5); - _tmp73__length = 0; - _tmp73__size = 4; - _tmp73__length1 = 0; - g_variant_iter_init (&_tmp74_, _tmp72_); - for (; _tmp75_ = g_variant_iter_next_value (&_tmp74_); _tmp73__length1++) { - GHashTable* _tmp76_; - GVariantIter _tmp77_; - GVariant* _tmp78_; - GVariant* _tmp79_; - if (_tmp73__size == _tmp73__length) { - _tmp73__size = 2 * _tmp73__size; - _tmp73_ = g_renew (GHashTable*, _tmp73_, _tmp73__size + 1); - } - _tmp76_ = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); - g_variant_iter_init (&_tmp77_, _tmp75_); - while (g_variant_iter_loop (&_tmp77_, "{?*}", &_tmp78_, &_tmp79_)) { - g_hash_table_insert (_tmp76_, g_variant_dup_string (_tmp78_, NULL), g_variant_get_variant (_tmp79_)); - } - _tmp73_[_tmp73__length++] = _tmp76_; - g_variant_unref (_tmp75_); - } - pItems_length1 = _tmp73__length1; - _tmp73_[_tmp73__length] = NULL; - pItems = _tmp73_; - g_variant_unref (_tmp72_); - cairo_dock_applet_iapplet_AddMenuItems (self, pItems, pItems_length1, &error); - if (error) { - g_dbus_method_invocation_return_gerror (invocation, error); - return; - } - g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE); - pItems = (_vala_array_free (pItems, pItems_length1, (GDestroyNotify) g_hash_table_unref), NULL); - _reply = g_variant_builder_end (&_reply_builder); - g_dbus_method_invocation_return_value (invocation, _reply); -} - - -static void _dbus_cairo_dock_applet_iapplet_BindShortkey (CairoDockAppletIApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation) { - GError* error; - char** cShortkeys = NULL; - int cShortkeys_length1; - GVariant* _tmp80_; - char** _tmp81_; - int _tmp81__length; - int _tmp81__size; - int _tmp81__length1; - GVariantIter _tmp82_; - GVariant* _tmp83_; - GVariantIter _arguments_iter; - GVariant* _reply; - GVariantBuilder _reply_builder; - error = NULL; - g_variant_iter_init (&_arguments_iter, parameters); - cShortkeys_length1 = 0; - _tmp80_ = g_variant_iter_next_value (&_arguments_iter); - _tmp81_ = g_new (char*, 5); - _tmp81__length = 0; - _tmp81__size = 4; - _tmp81__length1 = 0; - g_variant_iter_init (&_tmp82_, _tmp80_); - for (; _tmp83_ = g_variant_iter_next_value (&_tmp82_); _tmp81__length1++) { - if (_tmp81__size == _tmp81__length) { - _tmp81__size = 2 * _tmp81__size; - _tmp81_ = g_renew (char*, _tmp81_, _tmp81__size + 1); - } - _tmp81_[_tmp81__length++] = g_variant_dup_string (_tmp83_, NULL); - g_variant_unref (_tmp83_); - } - cShortkeys_length1 = _tmp81__length1; - _tmp81_[_tmp81__length] = NULL; - cShortkeys = _tmp81_; - g_variant_unref (_tmp80_); - cairo_dock_applet_iapplet_BindShortkey (self, cShortkeys, cShortkeys_length1, &error); - if (error) { - g_dbus_method_invocation_return_gerror (invocation, error); - return; - } - g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE); - cShortkeys = (_vala_array_free (cShortkeys, cShortkeys_length1, (GDestroyNotify) g_free), NULL); - _reply = g_variant_builder_end (&_reply_builder); - g_dbus_method_invocation_return_value (invocation, _reply); -} - - -static void cairo_dock_applet_iapplet_dbus_interface_method_call (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* method_name, GVariant* parameters, GDBusMethodInvocation* invocation, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; - if (strcmp (method_name, "Get") == 0) { - _dbus_cairo_dock_applet_iapplet_Get (object, parameters, invocation); - } else if (strcmp (method_name, "GetAll") == 0) { - _dbus_cairo_dock_applet_iapplet_GetAll (object, parameters, invocation); - } else if (strcmp (method_name, "SetQuickInfo") == 0) { - _dbus_cairo_dock_applet_iapplet_SetQuickInfo (object, parameters, invocation); - } else if (strcmp (method_name, "SetLabel") == 0) { - _dbus_cairo_dock_applet_iapplet_SetLabel (object, parameters, invocation); - } else if (strcmp (method_name, "SetIcon") == 0) { - _dbus_cairo_dock_applet_iapplet_SetIcon (object, parameters, invocation); - } else if (strcmp (method_name, "SetEmblem") == 0) { - _dbus_cairo_dock_applet_iapplet_SetEmblem (object, parameters, invocation); - } else if (strcmp (method_name, "Animate") == 0) { - _dbus_cairo_dock_applet_iapplet_Animate (object, parameters, invocation); - } else if (strcmp (method_name, "DemandsAttention") == 0) { - _dbus_cairo_dock_applet_iapplet_DemandsAttention (object, parameters, invocation); - } else if (strcmp (method_name, "ShowDialog") == 0) { - _dbus_cairo_dock_applet_iapplet_ShowDialog (object, parameters, invocation); - } else if (strcmp (method_name, "PopupDialog") == 0) { - _dbus_cairo_dock_applet_iapplet_PopupDialog (object, parameters, invocation); - } else if (strcmp (method_name, "AddDataRenderer") == 0) { - _dbus_cairo_dock_applet_iapplet_AddDataRenderer (object, parameters, invocation); - } else if (strcmp (method_name, "RenderValues") == 0) { - _dbus_cairo_dock_applet_iapplet_RenderValues (object, parameters, invocation); - } else if (strcmp (method_name, "ControlAppli") == 0) { - _dbus_cairo_dock_applet_iapplet_ControlAppli (object, parameters, invocation); - } else if (strcmp (method_name, "ShowAppli") == 0) { - _dbus_cairo_dock_applet_iapplet_ShowAppli (object, parameters, invocation); - } else if (strcmp (method_name, "AddMenuItems") == 0) { - _dbus_cairo_dock_applet_iapplet_AddMenuItems (object, parameters, invocation); - } else if (strcmp (method_name, "BindShortkey") == 0) { - _dbus_cairo_dock_applet_iapplet_BindShortkey (object, parameters, invocation); - } -} - - -static GVariant* cairo_dock_applet_iapplet_dbus_interface_get_property (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* property_name, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; - return NULL; -} - - -static gboolean cairo_dock_applet_iapplet_dbus_interface_set_property (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* property_name, GVariant* value, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; - return FALSE; -} - - -static void _dbus_cairo_dock_applet_iapplet_on_click (GObject* _sender, gint iState, gpointer* _data) { - GDBusConnection * _connection; - const gchar * _path; - GVariant *_arguments; - GVariantBuilder _arguments_builder; - _connection = _data[1]; - _path = _data[2]; - g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_int32 (iState)); - _arguments = g_variant_builder_end (&_arguments_builder); - g_dbus_connection_emit_signal (_connection, NULL, _path, "org.cairodock.CairoDock.applet", "on_click", _arguments, NULL); -} - - -static void _dbus_cairo_dock_applet_iapplet_on_middle_click (GObject* _sender, gpointer* _data) { - GDBusConnection * _connection; - const gchar * _path; - GVariant *_arguments; - GVariantBuilder _arguments_builder; - _connection = _data[1]; - _path = _data[2]; - g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); - _arguments = g_variant_builder_end (&_arguments_builder); - g_dbus_connection_emit_signal (_connection, NULL, _path, "org.cairodock.CairoDock.applet", "on_middle_click", _arguments, NULL); -} - - -static void _dbus_cairo_dock_applet_iapplet_on_build_menu (GObject* _sender, gpointer* _data) { - GDBusConnection * _connection; - const gchar * _path; - GVariant *_arguments; - GVariantBuilder _arguments_builder; - _connection = _data[1]; - _path = _data[2]; - g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); - _arguments = g_variant_builder_end (&_arguments_builder); - g_dbus_connection_emit_signal (_connection, NULL, _path, "org.cairodock.CairoDock.applet", "on_build_menu", _arguments, NULL); -} - - -static void _dbus_cairo_dock_applet_iapplet_on_menu_select (GObject* _sender, gint iNumEntry, gpointer* _data) { - GDBusConnection * _connection; - const gchar * _path; - GVariant *_arguments; - GVariantBuilder _arguments_builder; - _connection = _data[1]; - _path = _data[2]; - g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_int32 (iNumEntry)); - _arguments = g_variant_builder_end (&_arguments_builder); - g_dbus_connection_emit_signal (_connection, NULL, _path, "org.cairodock.CairoDock.applet", "on_menu_select", _arguments, NULL); -} - - -static void _dbus_cairo_dock_applet_iapplet_on_scroll (GObject* _sender, gboolean bScrollUp, gpointer* _data) { - GDBusConnection * _connection; - const gchar * _path; - GVariant *_arguments; - GVariantBuilder _arguments_builder; - _connection = _data[1]; - _path = _data[2]; - g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_boolean (bScrollUp)); - _arguments = g_variant_builder_end (&_arguments_builder); - g_dbus_connection_emit_signal (_connection, NULL, _path, "org.cairodock.CairoDock.applet", "on_scroll", _arguments, NULL); -} - - -static void _dbus_cairo_dock_applet_iapplet_on_drop_data (GObject* _sender, const char* cReceivedData, gpointer* _data) { - GDBusConnection * _connection; - const gchar * _path; - GVariant *_arguments; - GVariantBuilder _arguments_builder; - _connection = _data[1]; - _path = _data[2]; - g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (cReceivedData)); - _arguments = g_variant_builder_end (&_arguments_builder); - g_dbus_connection_emit_signal (_connection, NULL, _path, "org.cairodock.CairoDock.applet", "on_drop_data", _arguments, NULL); -} - - -static void _dbus_cairo_dock_applet_iapplet_on_answer (GObject* _sender, GVariant* answer, gpointer* _data) { - GDBusConnection * _connection; - const gchar * _path; - GVariant *_arguments; - GVariantBuilder _arguments_builder; - _connection = _data[1]; - _path = _data[2]; - g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_variant (answer)); - _arguments = g_variant_builder_end (&_arguments_builder); - g_dbus_connection_emit_signal (_connection, NULL, _path, "org.cairodock.CairoDock.applet", "on_answer", _arguments, NULL); -} - - -static void _dbus_cairo_dock_applet_iapplet_on_answer_dialog (GObject* _sender, gint iButton, GVariant* answer, gpointer* _data) { - GDBusConnection * _connection; - const gchar * _path; - GVariant *_arguments; - GVariantBuilder _arguments_builder; - _connection = _data[1]; - _path = _data[2]; - g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_int32 (iButton)); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_variant (answer)); - _arguments = g_variant_builder_end (&_arguments_builder); - g_dbus_connection_emit_signal (_connection, NULL, _path, "org.cairodock.CairoDock.applet", "on_answer_dialog", _arguments, NULL); -} - - -static void _dbus_cairo_dock_applet_iapplet_on_shortkey (GObject* _sender, const char* cKey, gpointer* _data) { - GDBusConnection * _connection; - const gchar * _path; - GVariant *_arguments; - GVariantBuilder _arguments_builder; - _connection = _data[1]; - _path = _data[2]; - g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (cKey)); - _arguments = g_variant_builder_end (&_arguments_builder); - g_dbus_connection_emit_signal (_connection, NULL, _path, "org.cairodock.CairoDock.applet", "on_shortkey", _arguments, NULL); -} - - -static void _dbus_cairo_dock_applet_iapplet_on_change_focus (GObject* _sender, gboolean bIsActive, gpointer* _data) { - GDBusConnection * _connection; - const gchar * _path; - GVariant *_arguments; - GVariantBuilder _arguments_builder; - _connection = _data[1]; - _path = _data[2]; - g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_boolean (bIsActive)); - _arguments = g_variant_builder_end (&_arguments_builder); - g_dbus_connection_emit_signal (_connection, NULL, _path, "org.cairodock.CairoDock.applet", "on_change_focus", _arguments, NULL); -} - - -static void _dbus_cairo_dock_applet_iapplet_on_stop_module (GObject* _sender, gpointer* _data) { - GDBusConnection * _connection; - const gchar * _path; - GVariant *_arguments; - GVariantBuilder _arguments_builder; - _connection = _data[1]; - _path = _data[2]; - g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); - _arguments = g_variant_builder_end (&_arguments_builder); - g_dbus_connection_emit_signal (_connection, NULL, _path, "org.cairodock.CairoDock.applet", "on_stop_module", _arguments, NULL); -} - - -static void _dbus_cairo_dock_applet_iapplet_on_reload_module (GObject* _sender, gboolean bConfigHasChanged, gpointer* _data) { - GDBusConnection * _connection; - const gchar * _path; - GVariant *_arguments; - GVariantBuilder _arguments_builder; - _connection = _data[1]; - _path = _data[2]; - g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_boolean (bConfigHasChanged)); - _arguments = g_variant_builder_end (&_arguments_builder); - g_dbus_connection_emit_signal (_connection, NULL, _path, "org.cairodock.CairoDock.applet", "on_reload_module", _arguments, NULL); -} - - -guint cairo_dock_applet_iapplet_register_object (gpointer object, GDBusConnection* connection, const gchar* path, GError** error) { - guint result; - gpointer *data; - data = g_new (gpointer, 3); - data[0] = g_object_ref (object); - data[1] = g_object_ref (connection); - data[2] = g_strdup (path); - result = g_dbus_connection_register_object (connection, path, &_cairo_dock_applet_iapplet_dbus_interface_info, &_cairo_dock_applet_iapplet_dbus_interface_vtable, data, _cairo_dock_applet_iapplet_unregister_object, error); - if (!result) { - return 0; - } - g_signal_connect (object, "on-click", (GCallback) _dbus_cairo_dock_applet_iapplet_on_click, data); - g_signal_connect (object, "on-middle-click", (GCallback) _dbus_cairo_dock_applet_iapplet_on_middle_click, data); - g_signal_connect (object, "on-build-menu", (GCallback) _dbus_cairo_dock_applet_iapplet_on_build_menu, data); - g_signal_connect (object, "on-menu-select", (GCallback) _dbus_cairo_dock_applet_iapplet_on_menu_select, data); - g_signal_connect (object, "on-scroll", (GCallback) _dbus_cairo_dock_applet_iapplet_on_scroll, data); - g_signal_connect (object, "on-drop-data", (GCallback) _dbus_cairo_dock_applet_iapplet_on_drop_data, data); - g_signal_connect (object, "on-answer", (GCallback) _dbus_cairo_dock_applet_iapplet_on_answer, data); - g_signal_connect (object, "on-answer-dialog", (GCallback) _dbus_cairo_dock_applet_iapplet_on_answer_dialog, data); - g_signal_connect (object, "on-shortkey", (GCallback) _dbus_cairo_dock_applet_iapplet_on_shortkey, data); - g_signal_connect (object, "on-change-focus", (GCallback) _dbus_cairo_dock_applet_iapplet_on_change_focus, data); - g_signal_connect (object, "on-stop-module", (GCallback) _dbus_cairo_dock_applet_iapplet_on_stop_module, data); - g_signal_connect (object, "on-reload-module", (GCallback) _dbus_cairo_dock_applet_iapplet_on_reload_module, data); - return result; -} - - -static void _cairo_dock_applet_iapplet_unregister_object (gpointer user_data) { - gpointer* data; - data = user_data; - g_object_unref (data[0]); - g_object_unref (data[1]); - g_free (data[2]); - g_free (data); -} - - -void cairo_dock_applet_isub_applet_SetQuickInfo (CairoDockAppletISubApplet* self, const char* cQuickInfo, const char* cIconID, GError** error) { - CAIRO_DOCK_APPLET_ISUB_APPLET_GET_INTERFACE (self)->SetQuickInfo (self, cQuickInfo, cIconID, error); -} - - -void cairo_dock_applet_isub_applet_SetLabel (CairoDockAppletISubApplet* self, const char* cLabel, const char* cIconID, GError** error) { - CAIRO_DOCK_APPLET_ISUB_APPLET_GET_INTERFACE (self)->SetLabel (self, cLabel, cIconID, error); -} - - -void cairo_dock_applet_isub_applet_SetIcon (CairoDockAppletISubApplet* self, const char* cImage, const char* cIconID, GError** error) { - CAIRO_DOCK_APPLET_ISUB_APPLET_GET_INTERFACE (self)->SetIcon (self, cImage, cIconID, error); -} - - -void cairo_dock_applet_isub_applet_SetEmblem (CairoDockAppletISubApplet* self, const char* cImage, gint iPosition, const char* cIconID, GError** error) { - CAIRO_DOCK_APPLET_ISUB_APPLET_GET_INTERFACE (self)->SetEmblem (self, cImage, iPosition, cIconID, error); -} - - -void cairo_dock_applet_isub_applet_Animate (CairoDockAppletISubApplet* self, const char* cAnimation, gint iNbRounds, const char* cIconID, GError** error) { - CAIRO_DOCK_APPLET_ISUB_APPLET_GET_INTERFACE (self)->Animate (self, cAnimation, iNbRounds, cIconID, error); -} - - -void cairo_dock_applet_isub_applet_ShowDialog (CairoDockAppletISubApplet* self, const char* message, gint iDuration, const char* cIconID, GError** error) { - CAIRO_DOCK_APPLET_ISUB_APPLET_GET_INTERFACE (self)->ShowDialog (self, message, iDuration, cIconID, error); -} - - -void cairo_dock_applet_isub_applet_AddSubIcons (CairoDockAppletISubApplet* self, char** pIconFields, int pIconFields_length1, GError** error) { - CAIRO_DOCK_APPLET_ISUB_APPLET_GET_INTERFACE (self)->AddSubIcons (self, pIconFields, pIconFields_length1, error); -} - - -void cairo_dock_applet_isub_applet_RemoveSubIcon (CairoDockAppletISubApplet* self, const char* cIconID, GError** error) { - CAIRO_DOCK_APPLET_ISUB_APPLET_GET_INTERFACE (self)->RemoveSubIcon (self, cIconID, error); -} - - -static void cairo_dock_applet_isub_applet_base_init (CairoDockAppletISubAppletIface * iface) { - static gboolean initialized = FALSE; - if (!initialized) { - initialized = TRUE; - g_signal_new ("on_click_sub_icon", CAIRO_DOCK_APPLET_TYPE_ISUB_APPLET, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__INT_STRING, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_STRING); - g_signal_new ("on_middle_click_sub_icon", CAIRO_DOCK_APPLET_TYPE_ISUB_APPLET, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); - g_signal_new ("on_scroll_sub_icon", CAIRO_DOCK_APPLET_TYPE_ISUB_APPLET, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__BOOLEAN_STRING, G_TYPE_NONE, 2, G_TYPE_BOOLEAN, G_TYPE_STRING); - g_signal_new ("on_drop_data_sub_icon", CAIRO_DOCK_APPLET_TYPE_ISUB_APPLET, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); - g_signal_new ("on_build_menu_sub_icon", CAIRO_DOCK_APPLET_TYPE_ISUB_APPLET, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); - } -} - - -GType cairo_dock_applet_isub_applet_get_type (void) { - static volatile gsize cairo_dock_applet_isub_applet_type_id__volatile = 0; - if (g_once_init_enter (&cairo_dock_applet_isub_applet_type_id__volatile)) { - static const GTypeInfo g_define_type_info = { sizeof (CairoDockAppletISubAppletIface), (GBaseInitFunc) cairo_dock_applet_isub_applet_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; - GType cairo_dock_applet_isub_applet_type_id; - cairo_dock_applet_isub_applet_type_id = g_type_register_static (G_TYPE_INTERFACE, "CairoDockAppletISubApplet", &g_define_type_info, 0); - g_type_interface_add_prerequisite (cairo_dock_applet_isub_applet_type_id, G_TYPE_OBJECT); - g_once_init_leave (&cairo_dock_applet_isub_applet_type_id__volatile, cairo_dock_applet_isub_applet_type_id); - } - return cairo_dock_applet_isub_applet_type_id__volatile; -} - - -G_DEFINE_TYPE_EXTENDED (CairoDockAppletISubAppletProxy, cairo_dock_applet_isub_applet_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (CAIRO_DOCK_APPLET_TYPE_ISUB_APPLET, cairo_dock_applet_isub_applet_proxy_cairo_dock_applet_isub_applet_interface_init) ); -static void cairo_dock_applet_isub_applet_proxy_class_init (CairoDockAppletISubAppletProxyClass* klass) { - G_DBUS_PROXY_CLASS (klass)->g_signal = cairo_dock_applet_isub_applet_proxy_g_signal; -} - - -static void _dbus_handle_cairo_dock_applet_isub_applet_on_click_sub_icon (CairoDockAppletISubApplet* self, GVariant* parameters) { - gint iState = 0; - GVariant* _tmp84_; - char* cIconID = NULL; - GVariant* _tmp85_; - GVariantIter _arguments_iter; - g_variant_iter_init (&_arguments_iter, parameters); - _tmp84_ = g_variant_iter_next_value (&_arguments_iter); - iState = g_variant_get_int32 (_tmp84_); - g_variant_unref (_tmp84_); - _tmp85_ = g_variant_iter_next_value (&_arguments_iter); - cIconID = g_variant_dup_string (_tmp85_, NULL); - g_variant_unref (_tmp85_); - g_signal_emit_by_name (self, "on-click-sub-icon", iState, cIconID); - _g_free0 (cIconID); -} - - -static void _dbus_handle_cairo_dock_applet_isub_applet_on_middle_click_sub_icon (CairoDockAppletISubApplet* self, GVariant* parameters) { - char* cIconID = NULL; - GVariant* _tmp86_; - GVariantIter _arguments_iter; - g_variant_iter_init (&_arguments_iter, parameters); - _tmp86_ = g_variant_iter_next_value (&_arguments_iter); - cIconID = g_variant_dup_string (_tmp86_, NULL); - g_variant_unref (_tmp86_); - g_signal_emit_by_name (self, "on-middle-click-sub-icon", cIconID); - _g_free0 (cIconID); -} - - -static void _dbus_handle_cairo_dock_applet_isub_applet_on_scroll_sub_icon (CairoDockAppletISubApplet* self, GVariant* parameters) { - gboolean bScrollUp = FALSE; - GVariant* _tmp87_; - char* cIconID = NULL; - GVariant* _tmp88_; - GVariantIter _arguments_iter; - g_variant_iter_init (&_arguments_iter, parameters); - _tmp87_ = g_variant_iter_next_value (&_arguments_iter); - bScrollUp = g_variant_get_boolean (_tmp87_); - g_variant_unref (_tmp87_); - _tmp88_ = g_variant_iter_next_value (&_arguments_iter); - cIconID = g_variant_dup_string (_tmp88_, NULL); - g_variant_unref (_tmp88_); - g_signal_emit_by_name (self, "on-scroll-sub-icon", bScrollUp, cIconID); - _g_free0 (cIconID); -} - - -static void _dbus_handle_cairo_dock_applet_isub_applet_on_drop_data_sub_icon (CairoDockAppletISubApplet* self, GVariant* parameters) { - char* cReceivedData = NULL; - GVariant* _tmp89_; - char* cIconID = NULL; - GVariant* _tmp90_; - GVariantIter _arguments_iter; - g_variant_iter_init (&_arguments_iter, parameters); - _tmp89_ = g_variant_iter_next_value (&_arguments_iter); - cReceivedData = g_variant_dup_string (_tmp89_, NULL); - g_variant_unref (_tmp89_); - _tmp90_ = g_variant_iter_next_value (&_arguments_iter); - cIconID = g_variant_dup_string (_tmp90_, NULL); - g_variant_unref (_tmp90_); - g_signal_emit_by_name (self, "on-drop-data-sub-icon", cReceivedData, cIconID); - _g_free0 (cReceivedData); - _g_free0 (cIconID); -} - - -static void _dbus_handle_cairo_dock_applet_isub_applet_on_build_menu_sub_icon (CairoDockAppletISubApplet* self, GVariant* parameters) { - char* cIconID = NULL; - GVariant* _tmp91_; - GVariantIter _arguments_iter; - g_variant_iter_init (&_arguments_iter, parameters); - _tmp91_ = g_variant_iter_next_value (&_arguments_iter); - cIconID = g_variant_dup_string (_tmp91_, NULL); - g_variant_unref (_tmp91_); - g_signal_emit_by_name (self, "on-build-menu-sub-icon", cIconID); - _g_free0 (cIconID); -} - - -static void cairo_dock_applet_isub_applet_proxy_g_signal (GDBusProxy* proxy, const gchar* sender_name, const gchar* signal_name, GVariant* parameters) { - if (strcmp (signal_name, "on_clickSubIcon") == 0) { - _dbus_handle_cairo_dock_applet_isub_applet_on_click_sub_icon (proxy, parameters); - } else if (strcmp (signal_name, "on_middle_clickSubIcon") == 0) { - _dbus_handle_cairo_dock_applet_isub_applet_on_middle_click_sub_icon (proxy, parameters); - } else if (strcmp (signal_name, "on_scrollSubIcon") == 0) { - _dbus_handle_cairo_dock_applet_isub_applet_on_scroll_sub_icon (proxy, parameters); - } else if (strcmp (signal_name, "on_drop_dataSubIcon") == 0) { - _dbus_handle_cairo_dock_applet_isub_applet_on_drop_data_sub_icon (proxy, parameters); - } else if (strcmp (signal_name, "on_build_menuSubIcon") == 0) { - _dbus_handle_cairo_dock_applet_isub_applet_on_build_menu_sub_icon (proxy, parameters); - } -} - - -static void cairo_dock_applet_isub_applet_proxy_init (CairoDockAppletISubAppletProxy* self) { -} - - -static void cairo_dock_applet_isub_applet_proxy_SetQuickInfo (CairoDockAppletISubApplet* self, const char* cQuickInfo, const char* cIconID, GError** error) { - GVariant *_arguments, *_reply; - GVariantBuilder _arguments_builder; - GVariantIter _reply_iter; - g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (cQuickInfo)); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (cIconID)); - _arguments = g_variant_builder_end (&_arguments_builder); - _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.cairodock.CairoDock.subapplet.SetQuickInfo", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, error); - if (!_reply) { - return; - } - g_variant_iter_init (&_reply_iter, _reply); - g_variant_unref (_reply); -} - - -static void cairo_dock_applet_isub_applet_proxy_SetLabel (CairoDockAppletISubApplet* self, const char* cLabel, const char* cIconID, GError** error) { - GVariant *_arguments, *_reply; - GVariantBuilder _arguments_builder; - GVariantIter _reply_iter; - g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (cLabel)); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (cIconID)); - _arguments = g_variant_builder_end (&_arguments_builder); - _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.cairodock.CairoDock.subapplet.SetLabel", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, error); - if (!_reply) { - return; - } - g_variant_iter_init (&_reply_iter, _reply); - g_variant_unref (_reply); -} - - -static void cairo_dock_applet_isub_applet_proxy_SetIcon (CairoDockAppletISubApplet* self, const char* cImage, const char* cIconID, GError** error) { - GVariant *_arguments, *_reply; - GVariantBuilder _arguments_builder; - GVariantIter _reply_iter; - g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (cImage)); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (cIconID)); - _arguments = g_variant_builder_end (&_arguments_builder); - _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.cairodock.CairoDock.subapplet.SetIcon", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, error); - if (!_reply) { - return; - } - g_variant_iter_init (&_reply_iter, _reply); - g_variant_unref (_reply); -} - - -static void cairo_dock_applet_isub_applet_proxy_SetEmblem (CairoDockAppletISubApplet* self, const char* cImage, gint iPosition, const char* cIconID, GError** error) { - GVariant *_arguments, *_reply; - GVariantBuilder _arguments_builder; - GVariantIter _reply_iter; - g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (cImage)); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_int32 (iPosition)); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (cIconID)); - _arguments = g_variant_builder_end (&_arguments_builder); - _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.cairodock.CairoDock.subapplet.SetEmblem", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, error); - if (!_reply) { - return; - } - g_variant_iter_init (&_reply_iter, _reply); - g_variant_unref (_reply); -} - - -static void cairo_dock_applet_isub_applet_proxy_Animate (CairoDockAppletISubApplet* self, const char* cAnimation, gint iNbRounds, const char* cIconID, GError** error) { - GVariant *_arguments, *_reply; - GVariantBuilder _arguments_builder; - GVariantIter _reply_iter; - g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (cAnimation)); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_int32 (iNbRounds)); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (cIconID)); - _arguments = g_variant_builder_end (&_arguments_builder); - _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.cairodock.CairoDock.subapplet.Animate", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, error); - if (!_reply) { - return; - } - g_variant_iter_init (&_reply_iter, _reply); - g_variant_unref (_reply); -} - - -static void cairo_dock_applet_isub_applet_proxy_ShowDialog (CairoDockAppletISubApplet* self, const char* message, gint iDuration, const char* cIconID, GError** error) { - GVariant *_arguments, *_reply; - GVariantBuilder _arguments_builder; - GVariantIter _reply_iter; - g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (message)); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_int32 (iDuration)); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (cIconID)); - _arguments = g_variant_builder_end (&_arguments_builder); - _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.cairodock.CairoDock.subapplet.ShowDialog", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, error); - if (!_reply) { - return; - } - g_variant_iter_init (&_reply_iter, _reply); - g_variant_unref (_reply); -} - - -static void cairo_dock_applet_isub_applet_proxy_AddSubIcons (CairoDockAppletISubApplet* self, char** pIconFields, int pIconFields_length1, GError** error) { - GVariant *_arguments, *_reply; - GVariantBuilder _arguments_builder; - char** _tmp92_; - GVariantBuilder _tmp93_; - int _tmp94_; - GVariantIter _reply_iter; - g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); - _tmp92_ = pIconFields; - g_variant_builder_init (&_tmp93_, G_VARIANT_TYPE_ARRAY); - for (_tmp94_ = 0; _tmp94_ < pIconFields_length1; _tmp94_++) { - g_variant_builder_add_value (&_tmp93_, g_variant_new_string (*_tmp92_)); - _tmp92_++; - } - g_variant_builder_add_value (&_arguments_builder, g_variant_builder_end (&_tmp93_)); - _arguments = g_variant_builder_end (&_arguments_builder); - _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.cairodock.CairoDock.subapplet.AddSubIcons", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, error); - if (!_reply) { - return; - } - g_variant_iter_init (&_reply_iter, _reply); - g_variant_unref (_reply); -} - - -static void cairo_dock_applet_isub_applet_proxy_RemoveSubIcon (CairoDockAppletISubApplet* self, const char* cIconID, GError** error) { - GVariant *_arguments, *_reply; - GVariantBuilder _arguments_builder; - GVariantIter _reply_iter; - g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (cIconID)); - _arguments = g_variant_builder_end (&_arguments_builder); - _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.cairodock.CairoDock.subapplet.RemoveSubIcon", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, error); - if (!_reply) { - return; - } - g_variant_iter_init (&_reply_iter, _reply); - g_variant_unref (_reply); -} - - -static void cairo_dock_applet_isub_applet_proxy_cairo_dock_applet_isub_applet_interface_init (CairoDockAppletISubAppletIface* iface) { - iface->SetQuickInfo = cairo_dock_applet_isub_applet_proxy_SetQuickInfo; - iface->SetLabel = cairo_dock_applet_isub_applet_proxy_SetLabel; - iface->SetIcon = cairo_dock_applet_isub_applet_proxy_SetIcon; - iface->SetEmblem = cairo_dock_applet_isub_applet_proxy_SetEmblem; - iface->Animate = cairo_dock_applet_isub_applet_proxy_Animate; - iface->ShowDialog = cairo_dock_applet_isub_applet_proxy_ShowDialog; - iface->AddSubIcons = cairo_dock_applet_isub_applet_proxy_AddSubIcons; - iface->RemoveSubIcon = cairo_dock_applet_isub_applet_proxy_RemoveSubIcon; -} - - -static void _dbus_cairo_dock_applet_isub_applet_SetQuickInfo (CairoDockAppletISubApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation) { - GError* error; - char* cQuickInfo = NULL; - GVariant* _tmp95_; - char* cIconID = NULL; - GVariant* _tmp96_; - GVariantIter _arguments_iter; - GVariant* _reply; - GVariantBuilder _reply_builder; - error = NULL; - g_variant_iter_init (&_arguments_iter, parameters); - _tmp95_ = g_variant_iter_next_value (&_arguments_iter); - cQuickInfo = g_variant_dup_string (_tmp95_, NULL); - g_variant_unref (_tmp95_); - _tmp96_ = g_variant_iter_next_value (&_arguments_iter); - cIconID = g_variant_dup_string (_tmp96_, NULL); - g_variant_unref (_tmp96_); - cairo_dock_applet_isub_applet_SetQuickInfo (self, cQuickInfo, cIconID, &error); - if (error) { - g_dbus_method_invocation_return_gerror (invocation, error); - return; - } - g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE); - _g_free0 (cQuickInfo); - _g_free0 (cIconID); - _reply = g_variant_builder_end (&_reply_builder); - g_dbus_method_invocation_return_value (invocation, _reply); -} - - -static void _dbus_cairo_dock_applet_isub_applet_SetLabel (CairoDockAppletISubApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation) { - GError* error; - char* cLabel = NULL; - GVariant* _tmp97_; - char* cIconID = NULL; - GVariant* _tmp98_; - GVariantIter _arguments_iter; - GVariant* _reply; - GVariantBuilder _reply_builder; - error = NULL; - g_variant_iter_init (&_arguments_iter, parameters); - _tmp97_ = g_variant_iter_next_value (&_arguments_iter); - cLabel = g_variant_dup_string (_tmp97_, NULL); - g_variant_unref (_tmp97_); - _tmp98_ = g_variant_iter_next_value (&_arguments_iter); - cIconID = g_variant_dup_string (_tmp98_, NULL); - g_variant_unref (_tmp98_); - cairo_dock_applet_isub_applet_SetLabel (self, cLabel, cIconID, &error); - if (error) { - g_dbus_method_invocation_return_gerror (invocation, error); - return; - } - g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE); - _g_free0 (cLabel); - _g_free0 (cIconID); - _reply = g_variant_builder_end (&_reply_builder); - g_dbus_method_invocation_return_value (invocation, _reply); -} - - -static void _dbus_cairo_dock_applet_isub_applet_SetIcon (CairoDockAppletISubApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation) { - GError* error; - char* cImage = NULL; - GVariant* _tmp99_; - char* cIconID = NULL; - GVariant* _tmp100_; - GVariantIter _arguments_iter; - GVariant* _reply; - GVariantBuilder _reply_builder; - error = NULL; - g_variant_iter_init (&_arguments_iter, parameters); - _tmp99_ = g_variant_iter_next_value (&_arguments_iter); - cImage = g_variant_dup_string (_tmp99_, NULL); - g_variant_unref (_tmp99_); - _tmp100_ = g_variant_iter_next_value (&_arguments_iter); - cIconID = g_variant_dup_string (_tmp100_, NULL); - g_variant_unref (_tmp100_); - cairo_dock_applet_isub_applet_SetIcon (self, cImage, cIconID, &error); - if (error) { - g_dbus_method_invocation_return_gerror (invocation, error); - return; - } - g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE); - _g_free0 (cImage); - _g_free0 (cIconID); - _reply = g_variant_builder_end (&_reply_builder); - g_dbus_method_invocation_return_value (invocation, _reply); -} - - -static void _dbus_cairo_dock_applet_isub_applet_SetEmblem (CairoDockAppletISubApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation) { - GError* error; - char* cImage = NULL; - GVariant* _tmp101_; - gint iPosition = 0; - GVariant* _tmp102_; - char* cIconID = NULL; - GVariant* _tmp103_; - GVariantIter _arguments_iter; - GVariant* _reply; - GVariantBuilder _reply_builder; - error = NULL; - g_variant_iter_init (&_arguments_iter, parameters); - _tmp101_ = g_variant_iter_next_value (&_arguments_iter); - cImage = g_variant_dup_string (_tmp101_, NULL); - g_variant_unref (_tmp101_); - _tmp102_ = g_variant_iter_next_value (&_arguments_iter); - iPosition = g_variant_get_int32 (_tmp102_); - g_variant_unref (_tmp102_); - _tmp103_ = g_variant_iter_next_value (&_arguments_iter); - cIconID = g_variant_dup_string (_tmp103_, NULL); - g_variant_unref (_tmp103_); - cairo_dock_applet_isub_applet_SetEmblem (self, cImage, iPosition, cIconID, &error); - if (error) { - g_dbus_method_invocation_return_gerror (invocation, error); - return; - } - g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE); - _g_free0 (cImage); - _g_free0 (cIconID); - _reply = g_variant_builder_end (&_reply_builder); - g_dbus_method_invocation_return_value (invocation, _reply); -} - - -static void _dbus_cairo_dock_applet_isub_applet_Animate (CairoDockAppletISubApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation) { - GError* error; - char* cAnimation = NULL; - GVariant* _tmp104_; - gint iNbRounds = 0; - GVariant* _tmp105_; - char* cIconID = NULL; - GVariant* _tmp106_; - GVariantIter _arguments_iter; - GVariant* _reply; - GVariantBuilder _reply_builder; - error = NULL; - g_variant_iter_init (&_arguments_iter, parameters); - _tmp104_ = g_variant_iter_next_value (&_arguments_iter); - cAnimation = g_variant_dup_string (_tmp104_, NULL); - g_variant_unref (_tmp104_); - _tmp105_ = g_variant_iter_next_value (&_arguments_iter); - iNbRounds = g_variant_get_int32 (_tmp105_); - g_variant_unref (_tmp105_); - _tmp106_ = g_variant_iter_next_value (&_arguments_iter); - cIconID = g_variant_dup_string (_tmp106_, NULL); - g_variant_unref (_tmp106_); - cairo_dock_applet_isub_applet_Animate (self, cAnimation, iNbRounds, cIconID, &error); - if (error) { - g_dbus_method_invocation_return_gerror (invocation, error); - return; - } - g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE); - _g_free0 (cAnimation); - _g_free0 (cIconID); - _reply = g_variant_builder_end (&_reply_builder); - g_dbus_method_invocation_return_value (invocation, _reply); -} - - -static void _dbus_cairo_dock_applet_isub_applet_ShowDialog (CairoDockAppletISubApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation) { - GError* error; - char* message = NULL; - GVariant* _tmp107_; - gint iDuration = 0; - GVariant* _tmp108_; - char* cIconID = NULL; - GVariant* _tmp109_; - GVariantIter _arguments_iter; - GVariant* _reply; - GVariantBuilder _reply_builder; - error = NULL; - g_variant_iter_init (&_arguments_iter, parameters); - _tmp107_ = g_variant_iter_next_value (&_arguments_iter); - message = g_variant_dup_string (_tmp107_, NULL); - g_variant_unref (_tmp107_); - _tmp108_ = g_variant_iter_next_value (&_arguments_iter); - iDuration = g_variant_get_int32 (_tmp108_); - g_variant_unref (_tmp108_); - _tmp109_ = g_variant_iter_next_value (&_arguments_iter); - cIconID = g_variant_dup_string (_tmp109_, NULL); - g_variant_unref (_tmp109_); - cairo_dock_applet_isub_applet_ShowDialog (self, message, iDuration, cIconID, &error); - if (error) { - g_dbus_method_invocation_return_gerror (invocation, error); - return; - } - g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE); - _g_free0 (message); - _g_free0 (cIconID); - _reply = g_variant_builder_end (&_reply_builder); - g_dbus_method_invocation_return_value (invocation, _reply); -} - - -static void _dbus_cairo_dock_applet_isub_applet_AddSubIcons (CairoDockAppletISubApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation) { - GError* error; - char** pIconFields = NULL; - int pIconFields_length1; - GVariant* _tmp110_; - char** _tmp111_; - int _tmp111__length; - int _tmp111__size; - int _tmp111__length1; - GVariantIter _tmp112_; - GVariant* _tmp113_; - GVariantIter _arguments_iter; - GVariant* _reply; - GVariantBuilder _reply_builder; - error = NULL; - g_variant_iter_init (&_arguments_iter, parameters); - pIconFields_length1 = 0; - _tmp110_ = g_variant_iter_next_value (&_arguments_iter); - _tmp111_ = g_new (char*, 5); - _tmp111__length = 0; - _tmp111__size = 4; - _tmp111__length1 = 0; - g_variant_iter_init (&_tmp112_, _tmp110_); - for (; _tmp113_ = g_variant_iter_next_value (&_tmp112_); _tmp111__length1++) { - if (_tmp111__size == _tmp111__length) { - _tmp111__size = 2 * _tmp111__size; - _tmp111_ = g_renew (char*, _tmp111_, _tmp111__size + 1); - } - _tmp111_[_tmp111__length++] = g_variant_dup_string (_tmp113_, NULL); - g_variant_unref (_tmp113_); - } - pIconFields_length1 = _tmp111__length1; - _tmp111_[_tmp111__length] = NULL; - pIconFields = _tmp111_; - g_variant_unref (_tmp110_); - cairo_dock_applet_isub_applet_AddSubIcons (self, pIconFields, pIconFields_length1, &error); - if (error) { - g_dbus_method_invocation_return_gerror (invocation, error); - return; - } - g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE); - pIconFields = (_vala_array_free (pIconFields, pIconFields_length1, (GDestroyNotify) g_free), NULL); - _reply = g_variant_builder_end (&_reply_builder); - g_dbus_method_invocation_return_value (invocation, _reply); -} - - -static void _dbus_cairo_dock_applet_isub_applet_RemoveSubIcon (CairoDockAppletISubApplet* self, GVariant* parameters, GDBusMethodInvocation* invocation) { - GError* error; - char* cIconID = NULL; - GVariant* _tmp114_; - GVariantIter _arguments_iter; - GVariant* _reply; - GVariantBuilder _reply_builder; - error = NULL; - g_variant_iter_init (&_arguments_iter, parameters); - _tmp114_ = g_variant_iter_next_value (&_arguments_iter); - cIconID = g_variant_dup_string (_tmp114_, NULL); - g_variant_unref (_tmp114_); - cairo_dock_applet_isub_applet_RemoveSubIcon (self, cIconID, &error); - if (error) { - g_dbus_method_invocation_return_gerror (invocation, error); - return; - } - g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE); - _g_free0 (cIconID); - _reply = g_variant_builder_end (&_reply_builder); - g_dbus_method_invocation_return_value (invocation, _reply); -} - - -static void cairo_dock_applet_isub_applet_dbus_interface_method_call (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* method_name, GVariant* parameters, GDBusMethodInvocation* invocation, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; - if (strcmp (method_name, "SetQuickInfo") == 0) { - _dbus_cairo_dock_applet_isub_applet_SetQuickInfo (object, parameters, invocation); - } else if (strcmp (method_name, "SetLabel") == 0) { - _dbus_cairo_dock_applet_isub_applet_SetLabel (object, parameters, invocation); - } else if (strcmp (method_name, "SetIcon") == 0) { - _dbus_cairo_dock_applet_isub_applet_SetIcon (object, parameters, invocation); - } else if (strcmp (method_name, "SetEmblem") == 0) { - _dbus_cairo_dock_applet_isub_applet_SetEmblem (object, parameters, invocation); - } else if (strcmp (method_name, "Animate") == 0) { - _dbus_cairo_dock_applet_isub_applet_Animate (object, parameters, invocation); - } else if (strcmp (method_name, "ShowDialog") == 0) { - _dbus_cairo_dock_applet_isub_applet_ShowDialog (object, parameters, invocation); - } else if (strcmp (method_name, "AddSubIcons") == 0) { - _dbus_cairo_dock_applet_isub_applet_AddSubIcons (object, parameters, invocation); - } else if (strcmp (method_name, "RemoveSubIcon") == 0) { - _dbus_cairo_dock_applet_isub_applet_RemoveSubIcon (object, parameters, invocation); - } -} - - -static GVariant* cairo_dock_applet_isub_applet_dbus_interface_get_property (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* property_name, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; - return NULL; -} - - -static gboolean cairo_dock_applet_isub_applet_dbus_interface_set_property (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* property_name, GVariant* value, GError** error, gpointer user_data) { - gpointer* data; - gpointer object; - data = user_data; - object = data[0]; - return FALSE; -} - - -static void _dbus_cairo_dock_applet_isub_applet_on_click_sub_icon (GObject* _sender, gint iState, const char* cIconID, gpointer* _data) { - GDBusConnection * _connection; - const gchar * _path; - GVariant *_arguments; - GVariantBuilder _arguments_builder; - _connection = _data[1]; - _path = _data[2]; - g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_int32 (iState)); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (cIconID)); - _arguments = g_variant_builder_end (&_arguments_builder); - g_dbus_connection_emit_signal (_connection, NULL, _path, "org.cairodock.CairoDock.subapplet", "on_clickSubIcon", _arguments, NULL); -} - - -static void _dbus_cairo_dock_applet_isub_applet_on_middle_click_sub_icon (GObject* _sender, const char* cIconID, gpointer* _data) { - GDBusConnection * _connection; - const gchar * _path; - GVariant *_arguments; - GVariantBuilder _arguments_builder; - _connection = _data[1]; - _path = _data[2]; - g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (cIconID)); - _arguments = g_variant_builder_end (&_arguments_builder); - g_dbus_connection_emit_signal (_connection, NULL, _path, "org.cairodock.CairoDock.subapplet", "on_middle_clickSubIcon", _arguments, NULL); -} - - -static void _dbus_cairo_dock_applet_isub_applet_on_scroll_sub_icon (GObject* _sender, gboolean bScrollUp, const char* cIconID, gpointer* _data) { - GDBusConnection * _connection; - const gchar * _path; - GVariant *_arguments; - GVariantBuilder _arguments_builder; - _connection = _data[1]; - _path = _data[2]; - g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_boolean (bScrollUp)); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (cIconID)); - _arguments = g_variant_builder_end (&_arguments_builder); - g_dbus_connection_emit_signal (_connection, NULL, _path, "org.cairodock.CairoDock.subapplet", "on_scrollSubIcon", _arguments, NULL); -} - - -static void _dbus_cairo_dock_applet_isub_applet_on_drop_data_sub_icon (GObject* _sender, const char* cReceivedData, const char* cIconID, gpointer* _data) { - GDBusConnection * _connection; - const gchar * _path; - GVariant *_arguments; - GVariantBuilder _arguments_builder; - _connection = _data[1]; - _path = _data[2]; - g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (cReceivedData)); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (cIconID)); - _arguments = g_variant_builder_end (&_arguments_builder); - g_dbus_connection_emit_signal (_connection, NULL, _path, "org.cairodock.CairoDock.subapplet", "on_drop_dataSubIcon", _arguments, NULL); -} - - -static void _dbus_cairo_dock_applet_isub_applet_on_build_menu_sub_icon (GObject* _sender, const char* cIconID, gpointer* _data) { - GDBusConnection * _connection; - const gchar * _path; - GVariant *_arguments; - GVariantBuilder _arguments_builder; - _connection = _data[1]; - _path = _data[2]; - g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); - g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (cIconID)); - _arguments = g_variant_builder_end (&_arguments_builder); - g_dbus_connection_emit_signal (_connection, NULL, _path, "org.cairodock.CairoDock.subapplet", "on_build_menuSubIcon", _arguments, NULL); -} - - -guint cairo_dock_applet_isub_applet_register_object (gpointer object, GDBusConnection* connection, const gchar* path, GError** error) { - guint result; - gpointer *data; - data = g_new (gpointer, 3); - data[0] = g_object_ref (object); - data[1] = g_object_ref (connection); - data[2] = g_strdup (path); - result = g_dbus_connection_register_object (connection, path, &_cairo_dock_applet_isub_applet_dbus_interface_info, &_cairo_dock_applet_isub_applet_dbus_interface_vtable, data, _cairo_dock_applet_isub_applet_unregister_object, error); - if (!result) { - return 0; - } - g_signal_connect (object, "on-click-sub-icon", (GCallback) _dbus_cairo_dock_applet_isub_applet_on_click_sub_icon, data); - g_signal_connect (object, "on-middle-click-sub-icon", (GCallback) _dbus_cairo_dock_applet_isub_applet_on_middle_click_sub_icon, data); - g_signal_connect (object, "on-scroll-sub-icon", (GCallback) _dbus_cairo_dock_applet_isub_applet_on_scroll_sub_icon, data); - g_signal_connect (object, "on-drop-data-sub-icon", (GCallback) _dbus_cairo_dock_applet_isub_applet_on_drop_data_sub_icon, data); - g_signal_connect (object, "on-build-menu-sub-icon", (GCallback) _dbus_cairo_dock_applet_isub_applet_on_build_menu_sub_icon, data); - return result; -} - - -static void _cairo_dock_applet_isub_applet_unregister_object (gpointer user_data) { - gpointer* data; - data = user_data; - g_object_unref (data[0]); - g_object_unref (data[1]); - g_free (data[2]); - g_free (data); -} - - -GType cairo_dock_applet_cd_applet_screen_position_get_type (void) { - static volatile gsize cairo_dock_applet_cd_applet_screen_position_type_id__volatile = 0; - if (g_once_init_enter (&cairo_dock_applet_cd_applet_screen_position_type_id__volatile)) { - static const GEnumValue values[] = {{CAIRO_DOCK_APPLET_CD_APPLET_SCREEN_POSITION_BOTTOM, "CAIRO_DOCK_APPLET_CD_APPLET_SCREEN_POSITION_BOTTOM", "bottom"}, {CAIRO_DOCK_APPLET_CD_APPLET_SCREEN_POSITION_TOP, "CAIRO_DOCK_APPLET_CD_APPLET_SCREEN_POSITION_TOP", "top"}, {CAIRO_DOCK_APPLET_CD_APPLET_SCREEN_POSITION_RIGHT, "CAIRO_DOCK_APPLET_CD_APPLET_SCREEN_POSITION_RIGHT", "right"}, {CAIRO_DOCK_APPLET_CD_APPLET_SCREEN_POSITION_LEFT, "CAIRO_DOCK_APPLET_CD_APPLET_SCREEN_POSITION_LEFT", "left"}, {0, NULL, NULL}}; - GType cairo_dock_applet_cd_applet_screen_position_type_id; - cairo_dock_applet_cd_applet_screen_position_type_id = g_enum_register_static ("CairoDockAppletCDAppletScreenPosition", values); - g_once_init_leave (&cairo_dock_applet_cd_applet_screen_position_type_id__volatile, cairo_dock_applet_cd_applet_screen_position_type_id); - } - return cairo_dock_applet_cd_applet_screen_position_type_id__volatile; -} - - -GType cairo_dock_applet_cd_applet_container_type_get_type (void) { - static volatile gsize cairo_dock_applet_cd_applet_container_type_type_id__volatile = 0; - if (g_once_init_enter (&cairo_dock_applet_cd_applet_container_type_type_id__volatile)) { - static const GEnumValue values[] = {{CAIRO_DOCK_APPLET_CD_APPLET_CONTAINER_TYPE_DOCK, "CAIRO_DOCK_APPLET_CD_APPLET_CONTAINER_TYPE_DOCK", "dock"}, {CAIRO_DOCK_APPLET_CD_APPLET_CONTAINER_TYPE_DESKLET, "CAIRO_DOCK_APPLET_CD_APPLET_CONTAINER_TYPE_DESKLET", "desklet"}, {0, NULL, NULL}}; - GType cairo_dock_applet_cd_applet_container_type_type_id; - cairo_dock_applet_cd_applet_container_type_type_id = g_enum_register_static ("CairoDockAppletCDAppletContainerType", values); - g_once_init_leave (&cairo_dock_applet_cd_applet_container_type_type_id__volatile, cairo_dock_applet_cd_applet_container_type_type_id); - } - return cairo_dock_applet_cd_applet_container_type_type_id__volatile; -} - - -GType cairo_dock_applet_cd_applet_emblem_position_get_type (void) { - static volatile gsize cairo_dock_applet_cd_applet_emblem_position_type_id__volatile = 0; - if (g_once_init_enter (&cairo_dock_applet_cd_applet_emblem_position_type_id__volatile)) { - static const GEnumValue values[] = {{CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_UPPER_LEFT, "CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_UPPER_LEFT", "upper-left"}, {CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_LOWER_RIGHT, "CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_LOWER_RIGHT", "lower-right"}, {CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_LOWER_LEFT, "CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_LOWER_LEFT", "lower-left"}, {CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_UPPER_RIGHT, "CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_UPPER_RIGHT", "upper-right"}, {CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_MIDDLE, "CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_MIDDLE", "middle"}, {0, NULL, NULL}}; - GType cairo_dock_applet_cd_applet_emblem_position_type_id; - cairo_dock_applet_cd_applet_emblem_position_type_id = g_enum_register_static ("CairoDockAppletCDAppletEmblemPosition", values); - g_once_init_leave (&cairo_dock_applet_cd_applet_emblem_position_type_id__volatile, cairo_dock_applet_cd_applet_emblem_position_type_id); - } - return cairo_dock_applet_cd_applet_emblem_position_type_id__volatile; -} - - -GType cairo_dock_applet_cd_applet_menu_item_type_get_type (void) { - static volatile gsize cairo_dock_applet_cd_applet_menu_item_type_type_id__volatile = 0; - if (g_once_init_enter (&cairo_dock_applet_cd_applet_menu_item_type_type_id__volatile)) { - static const GEnumValue values[] = {{CAIRO_DOCK_APPLET_CD_APPLET_MENU_ITEM_TYPE_MENU_ENTRY, "CAIRO_DOCK_APPLET_CD_APPLET_MENU_ITEM_TYPE_MENU_ENTRY", "menu-entry"}, {CAIRO_DOCK_APPLET_CD_APPLET_MENU_ITEM_TYPE_MENU_SUB_MENU, "CAIRO_DOCK_APPLET_CD_APPLET_MENU_ITEM_TYPE_MENU_SUB_MENU", "menu-sub-menu"}, {CAIRO_DOCK_APPLET_CD_APPLET_MENU_ITEM_TYPE_MENU_SEPARATOR, "CAIRO_DOCK_APPLET_CD_APPLET_MENU_ITEM_TYPE_MENU_SEPARATOR", "menu-separator"}, {CAIRO_DOCK_APPLET_CD_APPLET_MENU_ITEM_TYPE_MENU_CHECKBOX, "CAIRO_DOCK_APPLET_CD_APPLET_MENU_ITEM_TYPE_MENU_CHECKBOX", "menu-checkbox"}, {CAIRO_DOCK_APPLET_CD_APPLET_MENU_ITEM_TYPE_MENU_RADIO_BUTTON, "CAIRO_DOCK_APPLET_CD_APPLET_MENU_ITEM_TYPE_MENU_RADIO_BUTTON", "menu-radio-button"}, {0, NULL, NULL}}; - GType cairo_dock_applet_cd_applet_menu_item_type_type_id; - cairo_dock_applet_cd_applet_menu_item_type_type_id = g_enum_register_static ("CairoDockAppletCDAppletMenuItemType", values); - g_once_init_leave (&cairo_dock_applet_cd_applet_menu_item_type_type_id__volatile, cairo_dock_applet_cd_applet_menu_item_type_type_id); - } - return cairo_dock_applet_cd_applet_menu_item_type_type_id__volatile; -} - - -static glong string_get_length (const char* self) { - glong result; - g_return_val_if_fail (self != NULL, 0L); - result = g_utf8_strlen (self, (gssize) (-1)); - return result; -} - - -static char* string_substring (const char* self, glong offset, glong len) { - char* result = NULL; - glong string_length; - const char* start; - g_return_val_if_fail (self != NULL, NULL); - string_length = string_get_length (self); - if (offset < 0) { - offset = string_length + offset; - g_return_val_if_fail (offset >= 0, NULL); - } else { - g_return_val_if_fail (offset <= string_length, NULL); - } - if (len < 0) { - len = string_length - offset; - } - g_return_val_if_fail ((offset + len) <= string_length, NULL); - start = g_utf8_offset_to_pointer (self, offset); - result = g_strndup (start, ((gchar*) g_utf8_offset_to_pointer (start, len)) - ((gchar*) start)); - return result; -} - - -CairoDockAppletCDApplet* cairo_dock_applet_cd_applet_construct (GType object_type, char** argv, int argv_length1) { - CairoDockAppletCDApplet * self; - char* _tmp0_; - char* _tmp1_; - char* _tmp2_; - char* _tmp3_; - char* _tmp4_; - self = (CairoDockAppletCDApplet*) g_object_new (object_type, NULL); - self->cAppletName = (_tmp0_ = string_substring (argv[0], (glong) 2, (glong) 999), _g_free0 (self->cAppletName), _tmp0_); - self->cBusPath = (_tmp1_ = g_strdup (argv[2]), _g_free0 (self->cBusPath), _tmp1_); - self->cConfFile = (_tmp2_ = g_strdup (argv[3]), _g_free0 (self->cConfFile), _tmp2_); - self->cParentAppName = (_tmp3_ = g_strdup (argv[4]), _g_free0 (self->cParentAppName), _tmp3_); - _cairo_dock_applet_cd_applet_get_config (self); - _cairo_dock_applet_cd_applet_connect_to_bus (self); - self->priv->_cMenuIconId = (_tmp4_ = NULL, _g_free0 (self->priv->_cMenuIconId), _tmp4_); - return self; -} - - -CairoDockAppletCDApplet* cairo_dock_applet_cd_applet_new (char** argv, int argv_length1) { - return cairo_dock_applet_cd_applet_construct (CAIRO_DOCK_APPLET_TYPE_CD_APPLET, argv, argv_length1); -} - - -void cairo_dock_applet_cd_applet_run (CairoDockAppletCDApplet* self) { - GMainLoop* _tmp0_; - g_return_if_fail (self != NULL); - cairo_dock_applet_cd_applet_begin (self); - self->priv->loop = (_tmp0_ = g_main_loop_new (NULL, FALSE), _g_main_loop_unref0 (self->priv->loop), _tmp0_); - g_main_loop_run (self->priv->loop); -} - - -static void cairo_dock_applet_cd_applet_real_on_click (CairoDockAppletCDApplet* self, gint iState) { - g_return_if_fail (self != NULL); - g_print (">>> clic !\n"); -} - - -void cairo_dock_applet_cd_applet_on_click (CairoDockAppletCDApplet* self, gint iState) { - CAIRO_DOCK_APPLET_CD_APPLET_GET_CLASS (self)->on_click (self, iState); -} - - -static void cairo_dock_applet_cd_applet_real_on_middle_click (CairoDockAppletCDApplet* self) { - g_return_if_fail (self != NULL); - g_print (">>> middle clic !\n"); -} - - -void cairo_dock_applet_cd_applet_on_middle_click (CairoDockAppletCDApplet* self) { - CAIRO_DOCK_APPLET_CD_APPLET_GET_CLASS (self)->on_middle_click (self); -} - - -static void _cairo_dock_applet_cd_applet_on_build_menu (CairoDockAppletCDApplet* self) { - char* _tmp0_; - g_return_if_fail (self != NULL); - self->priv->_cMenuIconId = (_tmp0_ = NULL, _g_free0 (self->priv->_cMenuIconId), _tmp0_); - cairo_dock_applet_cd_applet_on_build_menu (self); -} - - -static void cairo_dock_applet_cd_applet_real_on_build_menu (CairoDockAppletCDApplet* self) { - g_return_if_fail (self != NULL); - g_print (">>> build menu !\n"); -} - - -void cairo_dock_applet_cd_applet_on_build_menu (CairoDockAppletCDApplet* self) { - CAIRO_DOCK_APPLET_CD_APPLET_GET_CLASS (self)->on_build_menu (self); -} - - -static void _cairo_dock_applet_cd_applet_on_menu_select (CairoDockAppletCDApplet* self, gint iNumEntry) { - g_return_if_fail (self != NULL); - if (self->priv->_cMenuIconId == NULL) { - cairo_dock_applet_cd_applet_on_menu_select (self, iNumEntry); - } else { - cairo_dock_applet_cd_applet_on_menu_select_sub_icon (self, iNumEntry, self->priv->_cMenuIconId); - } -} - - -static void cairo_dock_applet_cd_applet_real_on_menu_select (CairoDockAppletCDApplet* self, gint iNumEntry) { - g_return_if_fail (self != NULL); - g_print (">>> choice %d has been selected !\n", iNumEntry); -} - - -void cairo_dock_applet_cd_applet_on_menu_select (CairoDockAppletCDApplet* self, gint iNumEntry) { - CAIRO_DOCK_APPLET_CD_APPLET_GET_CLASS (self)->on_menu_select (self, iNumEntry); -} - - -static void cairo_dock_applet_cd_applet_real_on_scroll (CairoDockAppletCDApplet* self, gboolean bScrollUp) { - g_return_if_fail (self != NULL); - g_print (">>> scroll (up:%d)\n", (gint) bScrollUp); -} - - -void cairo_dock_applet_cd_applet_on_scroll (CairoDockAppletCDApplet* self, gboolean bScrollUp) { - CAIRO_DOCK_APPLET_CD_APPLET_GET_CLASS (self)->on_scroll (self, bScrollUp); -} - - -static void cairo_dock_applet_cd_applet_real_on_drop_data (CairoDockAppletCDApplet* self, const char* cReceivedData) { - g_return_if_fail (self != NULL); - g_return_if_fail (cReceivedData != NULL); - g_print (">>> received : %s\n", cReceivedData); -} - - -void cairo_dock_applet_cd_applet_on_drop_data (CairoDockAppletCDApplet* self, const char* cReceivedData) { - CAIRO_DOCK_APPLET_CD_APPLET_GET_CLASS (self)->on_drop_data (self, cReceivedData); -} - - -static void cairo_dock_applet_cd_applet_real_on_answer (CairoDockAppletCDApplet* self, GVariant* answer) { - g_return_if_fail (self != NULL); - g_return_if_fail (answer != NULL); - g_print (">>> answer\n"); -} - - -void cairo_dock_applet_cd_applet_on_answer (CairoDockAppletCDApplet* self, GVariant* answer) { - CAIRO_DOCK_APPLET_CD_APPLET_GET_CLASS (self)->on_answer (self, answer); -} - - -static void cairo_dock_applet_cd_applet_real_on_answer_dialog (CairoDockAppletCDApplet* self, gint iButton, GVariant* answer) { - g_return_if_fail (self != NULL); - g_return_if_fail (answer != NULL); - g_print (">>> answer dialog\n"); -} - - -void cairo_dock_applet_cd_applet_on_answer_dialog (CairoDockAppletCDApplet* self, gint iButton, GVariant* answer) { - CAIRO_DOCK_APPLET_CD_APPLET_GET_CLASS (self)->on_answer_dialog (self, iButton, answer); -} - - -static void cairo_dock_applet_cd_applet_real_on_shortkey (CairoDockAppletCDApplet* self, const char* cKey) { - g_return_if_fail (self != NULL); - g_return_if_fail (cKey != NULL); - g_print (">>> shortkey : %s\n", cKey); -} - - -void cairo_dock_applet_cd_applet_on_shortkey (CairoDockAppletCDApplet* self, const char* cKey) { - CAIRO_DOCK_APPLET_CD_APPLET_GET_CLASS (self)->on_shortkey (self, cKey); -} - - -static void cairo_dock_applet_cd_applet_real_on_change_focus (CairoDockAppletCDApplet* self, gboolean bIsActive) { - g_return_if_fail (self != NULL); - g_print (">>> changed focus -> %d\n", (gint) bIsActive); -} - - -void cairo_dock_applet_cd_applet_on_change_focus (CairoDockAppletCDApplet* self, gboolean bIsActive) { - CAIRO_DOCK_APPLET_CD_APPLET_GET_CLASS (self)->on_change_focus (self, bIsActive); -} - - -static void cairo_dock_applet_cd_applet_real_on_click_sub_icon (CairoDockAppletCDApplet* self, gint iState, const char* cIconID) { - g_return_if_fail (self != NULL); - g_return_if_fail (cIconID != NULL); - g_print ("clic on the sub-icon '%s' !\n", cIconID); -} - - -void cairo_dock_applet_cd_applet_on_click_sub_icon (CairoDockAppletCDApplet* self, gint iState, const char* cIconID) { - CAIRO_DOCK_APPLET_CD_APPLET_GET_CLASS (self)->on_click_sub_icon (self, iState, cIconID); -} - - -static void cairo_dock_applet_cd_applet_real_on_middle_click_sub_icon (CairoDockAppletCDApplet* self, const char* cIconID) { - g_return_if_fail (self != NULL); - g_return_if_fail (cIconID != NULL); - g_print ("middle-clic on the sub-icon '%s' !\n", cIconID); -} - - -void cairo_dock_applet_cd_applet_on_middle_click_sub_icon (CairoDockAppletCDApplet* self, const char* cIconID) { - CAIRO_DOCK_APPLET_CD_APPLET_GET_CLASS (self)->on_middle_click_sub_icon (self, cIconID); -} - - -static void cairo_dock_applet_cd_applet_real_on_scroll_sub_icon (CairoDockAppletCDApplet* self, gboolean bScrollUp, const char* cIconID) { - g_return_if_fail (self != NULL); - g_return_if_fail (cIconID != NULL); - g_print ("scroll on the sub-icon '%s' !\n", cIconID); -} - - -void cairo_dock_applet_cd_applet_on_scroll_sub_icon (CairoDockAppletCDApplet* self, gboolean bScrollUp, const char* cIconID) { - CAIRO_DOCK_APPLET_CD_APPLET_GET_CLASS (self)->on_scroll_sub_icon (self, bScrollUp, cIconID); -} - - -static void cairo_dock_applet_cd_applet_real_on_drop_data_sub_icon (CairoDockAppletCDApplet* self, const char* cReceivedData, const char* cIconID) { - g_return_if_fail (self != NULL); - g_return_if_fail (cReceivedData != NULL); - g_return_if_fail (cIconID != NULL); - g_print ("drop on the sub-icon '%s' !\n", cIconID); -} - - -void cairo_dock_applet_cd_applet_on_drop_data_sub_icon (CairoDockAppletCDApplet* self, const char* cReceivedData, const char* cIconID) { - CAIRO_DOCK_APPLET_CD_APPLET_GET_CLASS (self)->on_drop_data_sub_icon (self, cReceivedData, cIconID); -} - - -static void _cairo_dock_applet_cd_applet_on_build_menu_sub_icon (CairoDockAppletCDApplet* self, const char* cIconID) { - char* _tmp0_; - g_return_if_fail (self != NULL); - g_return_if_fail (cIconID != NULL); - self->priv->_cMenuIconId = (_tmp0_ = g_strdup (cIconID), _g_free0 (self->priv->_cMenuIconId), _tmp0_); - cairo_dock_applet_cd_applet_on_build_menu_sub_icon (self, cIconID); -} - - -static void cairo_dock_applet_cd_applet_real_on_build_menu_sub_icon (CairoDockAppletCDApplet* self, const char* cIconID) { - g_return_if_fail (self != NULL); - g_return_if_fail (cIconID != NULL); - g_print ("build menu on the sub-icon '%s' !\n", cIconID); -} - - -void cairo_dock_applet_cd_applet_on_build_menu_sub_icon (CairoDockAppletCDApplet* self, const char* cIconID) { - CAIRO_DOCK_APPLET_CD_APPLET_GET_CLASS (self)->on_build_menu_sub_icon (self, cIconID); -} - - -static void cairo_dock_applet_cd_applet_real_on_menu_select_sub_icon (CairoDockAppletCDApplet* self, gint iNumEntry, const char* cIconID) { - g_return_if_fail (self != NULL); - g_return_if_fail (cIconID != NULL); - g_print (">>> choice %d has been selected on icon %s !\n", iNumEntry, cIconID); -} - - -void cairo_dock_applet_cd_applet_on_menu_select_sub_icon (CairoDockAppletCDApplet* self, gint iNumEntry, const char* cIconID) { - CAIRO_DOCK_APPLET_CD_APPLET_GET_CLASS (self)->on_menu_select_sub_icon (self, iNumEntry, cIconID); -} - - -static void cairo_dock_applet_cd_applet_real_begin (CairoDockAppletCDApplet* self) { - g_return_if_fail (self != NULL); -} - - -void cairo_dock_applet_cd_applet_begin (CairoDockAppletCDApplet* self) { - CAIRO_DOCK_APPLET_CD_APPLET_GET_CLASS (self)->begin (self); -} - - -static void cairo_dock_applet_cd_applet_real_end (CairoDockAppletCDApplet* self) { - g_return_if_fail (self != NULL); -} - - -void cairo_dock_applet_cd_applet_end (CairoDockAppletCDApplet* self) { - CAIRO_DOCK_APPLET_CD_APPLET_GET_CLASS (self)->end (self); -} - - -static void _cairo_dock_applet_cd_applet_on_stop (CairoDockAppletCDApplet* self) { - g_return_if_fail (self != NULL); - g_print (">>> applet '%s' is stopped\n", self->cAppletName); - cairo_dock_applet_cd_applet_end (self); - g_main_loop_quit (self->priv->loop); -} - - -static void cairo_dock_applet_cd_applet_real_reload (CairoDockAppletCDApplet* self) { - g_return_if_fail (self != NULL); -} - - -void cairo_dock_applet_cd_applet_reload (CairoDockAppletCDApplet* self) { - CAIRO_DOCK_APPLET_CD_APPLET_GET_CLASS (self)->reload (self); -} - - -static void _cairo_dock_applet_cd_applet_on_reload (CairoDockAppletCDApplet* self, gboolean bConfigHasChanged) { - g_return_if_fail (self != NULL); - g_print (">>> our module is reloaded"); - if (bConfigHasChanged) { - g_print (">>> and our config has changed"); - _cairo_dock_applet_cd_applet_get_config (self); - cairo_dock_applet_cd_applet_reload (self); - } -} - - -static void cairo_dock_applet_cd_applet_real_get_config (CairoDockAppletCDApplet* self, GKeyFile* keyfile) { - g_return_if_fail (self != NULL); - g_return_if_fail (keyfile != NULL); -} - - -void cairo_dock_applet_cd_applet_get_config (CairoDockAppletCDApplet* self, GKeyFile* keyfile) { - CAIRO_DOCK_APPLET_CD_APPLET_GET_CLASS (self)->get_config (self, keyfile); -} - - -static void _cairo_dock_applet_cd_applet_get_config (CairoDockAppletCDApplet* self) { - GKeyFile* keyfile; - GError * _inner_error_ = NULL; - g_return_if_fail (self != NULL); - keyfile = g_key_file_new (); - { - g_key_file_load_from_file (keyfile, self->cConfFile, G_KEY_FILE_NONE, &_inner_error_); - if (_inner_error_ != NULL) { - goto __catch0_g_error; - } - } - goto __finally0; - __catch0_g_error: - { - GError * e; - e = _inner_error_; - _inner_error_ = NULL; - { - g_warning ("CDApplet.vala:269: %s", e->message); - _g_error_free0 (e); - } - } - __finally0: - { - cairo_dock_applet_cd_applet_get_config (self, keyfile); - } - if (_inner_error_ != NULL) { - _g_key_file_free0 (keyfile); - g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); - g_clear_error (&_inner_error_); - return; - } - _g_key_file_free0 (keyfile); -} - - -static void _cairo_dock_applet_cd_applet_on_click_cairo_dock_applet_iapplet_on_click (CairoDockAppletIApplet* _sender, gint iState, gpointer self) { - cairo_dock_applet_cd_applet_on_click (self, iState); -} - - -static void _cairo_dock_applet_cd_applet_on_middle_click_cairo_dock_applet_iapplet_on_middle_click (CairoDockAppletIApplet* _sender, gpointer self) { - cairo_dock_applet_cd_applet_on_middle_click (self); -} - - -static void __cairo_dock_applet_cd_applet_on_build_menu_cairo_dock_applet_iapplet_on_build_menu (CairoDockAppletIApplet* _sender, gpointer self) { - _cairo_dock_applet_cd_applet_on_build_menu (self); -} - - -static void __cairo_dock_applet_cd_applet_on_menu_select_cairo_dock_applet_iapplet_on_menu_select (CairoDockAppletIApplet* _sender, gint iNumEntry, gpointer self) { - _cairo_dock_applet_cd_applet_on_menu_select (self, iNumEntry); -} - - -static void _cairo_dock_applet_cd_applet_on_scroll_cairo_dock_applet_iapplet_on_scroll (CairoDockAppletIApplet* _sender, gboolean bScrollUp, gpointer self) { - cairo_dock_applet_cd_applet_on_scroll (self, bScrollUp); -} - - -static void _cairo_dock_applet_cd_applet_on_drop_data_cairo_dock_applet_iapplet_on_drop_data (CairoDockAppletIApplet* _sender, const char* cReceivedData, gpointer self) { - cairo_dock_applet_cd_applet_on_drop_data (self, cReceivedData); -} - - -static void _cairo_dock_applet_cd_applet_on_answer_cairo_dock_applet_iapplet_on_answer (CairoDockAppletIApplet* _sender, GVariant* answer, gpointer self) { - cairo_dock_applet_cd_applet_on_answer (self, answer); -} - - -static void _cairo_dock_applet_cd_applet_on_answer_dialog_cairo_dock_applet_iapplet_on_answer_dialog (CairoDockAppletIApplet* _sender, gint iButton, GVariant* answer, gpointer self) { - cairo_dock_applet_cd_applet_on_answer_dialog (self, iButton, answer); -} - - -static void _cairo_dock_applet_cd_applet_on_shortkey_cairo_dock_applet_iapplet_on_shortkey (CairoDockAppletIApplet* _sender, const char* cKey, gpointer self) { - cairo_dock_applet_cd_applet_on_shortkey (self, cKey); -} - - -static void _cairo_dock_applet_cd_applet_on_change_focus_cairo_dock_applet_iapplet_on_change_focus (CairoDockAppletIApplet* _sender, gboolean bIsActive, gpointer self) { - cairo_dock_applet_cd_applet_on_change_focus (self, bIsActive); -} - - -static void __cairo_dock_applet_cd_applet_on_stop_cairo_dock_applet_iapplet_on_stop_module (CairoDockAppletIApplet* _sender, gpointer self) { - _cairo_dock_applet_cd_applet_on_stop (self); -} - - -static void __cairo_dock_applet_cd_applet_on_reload_cairo_dock_applet_iapplet_on_reload_module (CairoDockAppletIApplet* _sender, gboolean bConfigHasChanged, gpointer self) { - _cairo_dock_applet_cd_applet_on_reload (self, bConfigHasChanged); -} - - -static void _cairo_dock_applet_cd_applet_on_click_sub_icon_cairo_dock_applet_isub_applet_on_click_sub_icon (CairoDockAppletISubApplet* _sender, gint iState, const char* cIconID, gpointer self) { - cairo_dock_applet_cd_applet_on_click_sub_icon (self, iState, cIconID); -} - - -static void _cairo_dock_applet_cd_applet_on_middle_click_sub_icon_cairo_dock_applet_isub_applet_on_middle_click_sub_icon (CairoDockAppletISubApplet* _sender, const char* cIconID, gpointer self) { - cairo_dock_applet_cd_applet_on_middle_click_sub_icon (self, cIconID); -} - - -static void _cairo_dock_applet_cd_applet_on_scroll_sub_icon_cairo_dock_applet_isub_applet_on_scroll_sub_icon (CairoDockAppletISubApplet* _sender, gboolean bScrollUp, const char* cIconID, gpointer self) { - cairo_dock_applet_cd_applet_on_scroll_sub_icon (self, bScrollUp, cIconID); -} - - -static void _cairo_dock_applet_cd_applet_on_drop_data_sub_icon_cairo_dock_applet_isub_applet_on_drop_data_sub_icon (CairoDockAppletISubApplet* _sender, const char* cReceivedData, const char* cIconID, gpointer self) { - cairo_dock_applet_cd_applet_on_drop_data_sub_icon (self, cReceivedData, cIconID); -} - - -static void __cairo_dock_applet_cd_applet_on_build_menu_sub_icon_cairo_dock_applet_isub_applet_on_build_menu_sub_icon (CairoDockAppletISubApplet* _sender, const char* cIconID, gpointer self) { - _cairo_dock_applet_cd_applet_on_build_menu_sub_icon (self, cIconID); -} - - -static void _cairo_dock_applet_cd_applet_connect_to_bus (CairoDockAppletCDApplet* self) { - GError * _inner_error_ = NULL; - g_return_if_fail (self != NULL); - { - CairoDockAppletIApplet* _tmp0_; - CairoDockAppletIApplet* _tmp1_; - _tmp0_ = (CairoDockAppletIApplet*) g_initable_new (CAIRO_DOCK_APPLET_TYPE_IAPPLET_PROXY, NULL, &_inner_error_, "g-flags", G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, "g-name", "org.cairodock.CairoDock", "g-bus-type", G_BUS_TYPE_SESSION, "g-object-path", self->cBusPath, "g-interface-name", "org.cairodock.CairoDock.applet", NULL); - if (_inner_error_ != NULL) { - if (_inner_error_->domain == G_IO_ERROR) { - goto __catch1_g_io_error; - } - g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); - g_clear_error (&_inner_error_); - return; - } - self->icon = (_tmp1_ = _tmp0_, _g_object_unref0 (self->icon), _tmp1_); - } - goto __finally1; - __catch1_g_io_error: - { - GError * e; - e = _inner_error_; - _inner_error_ = NULL; - { - g_error ("CDApplet.vala:288: >>> module '%s' can't be found on the bus, exit.\n" \ -"Error was: %s", self->cAppletName, e->message); - _g_error_free0 (e); - } - } - __finally1: - if (_inner_error_ != NULL) { - g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); - g_clear_error (&_inner_error_); - return; - } - { - char* _tmp2_; - char* _tmp3_; - CairoDockAppletISubApplet* _tmp4_; - CairoDockAppletISubApplet* _tmp5_; - CairoDockAppletISubApplet* _tmp6_; - _tmp5_ = (_tmp4_ = (CairoDockAppletISubApplet*) g_initable_new (CAIRO_DOCK_APPLET_TYPE_ISUB_APPLET_PROXY, NULL, &_inner_error_, "g-flags", G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, "g-name", "org.cairodock.CairoDock", "g-bus-type", G_BUS_TYPE_SESSION, "g-object-path", _tmp3_ = g_strconcat (self->cBusPath, "/sub_icons", NULL), "g-interface-name", "org.cairodock.CairoDock.subapplet", NULL), _g_free0 (_tmp3_), _g_free0 (_tmp2_), _tmp4_); - if (_inner_error_ != NULL) { - if (_inner_error_->domain == G_IO_ERROR) { - goto __catch2_g_io_error; - } - g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); - g_clear_error (&_inner_error_); - return; - } - self->sub_icons = (_tmp6_ = _tmp5_, _g_object_unref0 (self->sub_icons), _tmp6_); - } - goto __finally2; - __catch2_g_io_error: - { - GError * e; - e = _inner_error_; - _inner_error_ = NULL; - { - g_error ("CDApplet.vala:298: >>> module '%s' can't be found on the bus, exit.\n" \ -"Error was: %s", self->cAppletName, e->message); - _g_error_free0 (e); - } - } - __finally2: - if (_inner_error_ != NULL) { - g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); - g_clear_error (&_inner_error_); - return; - } - g_signal_connect_object (self->icon, "on-click", (GCallback) _cairo_dock_applet_cd_applet_on_click_cairo_dock_applet_iapplet_on_click, self, 0); - g_signal_connect_object (self->icon, "on-middle-click", (GCallback) _cairo_dock_applet_cd_applet_on_middle_click_cairo_dock_applet_iapplet_on_middle_click, self, 0); - g_signal_connect_object (self->icon, "on-build-menu", (GCallback) __cairo_dock_applet_cd_applet_on_build_menu_cairo_dock_applet_iapplet_on_build_menu, self, 0); - g_signal_connect_object (self->icon, "on-menu-select", (GCallback) __cairo_dock_applet_cd_applet_on_menu_select_cairo_dock_applet_iapplet_on_menu_select, self, 0); - g_signal_connect_object (self->icon, "on-scroll", (GCallback) _cairo_dock_applet_cd_applet_on_scroll_cairo_dock_applet_iapplet_on_scroll, self, 0); - g_signal_connect_object (self->icon, "on-drop-data", (GCallback) _cairo_dock_applet_cd_applet_on_drop_data_cairo_dock_applet_iapplet_on_drop_data, self, 0); - g_signal_connect_object (self->icon, "on-answer", (GCallback) _cairo_dock_applet_cd_applet_on_answer_cairo_dock_applet_iapplet_on_answer, self, 0); - g_signal_connect_object (self->icon, "on-answer-dialog", (GCallback) _cairo_dock_applet_cd_applet_on_answer_dialog_cairo_dock_applet_iapplet_on_answer_dialog, self, 0); - g_signal_connect_object (self->icon, "on-shortkey", (GCallback) _cairo_dock_applet_cd_applet_on_shortkey_cairo_dock_applet_iapplet_on_shortkey, self, 0); - g_signal_connect_object (self->icon, "on-change-focus", (GCallback) _cairo_dock_applet_cd_applet_on_change_focus_cairo_dock_applet_iapplet_on_change_focus, self, 0); - g_signal_connect_object (self->icon, "on-stop-module", (GCallback) __cairo_dock_applet_cd_applet_on_stop_cairo_dock_applet_iapplet_on_stop_module, self, 0); - g_signal_connect_object (self->icon, "on-reload-module", (GCallback) __cairo_dock_applet_cd_applet_on_reload_cairo_dock_applet_iapplet_on_reload_module, self, 0); - g_signal_connect_object (self->sub_icons, "on-click-sub-icon", (GCallback) _cairo_dock_applet_cd_applet_on_click_sub_icon_cairo_dock_applet_isub_applet_on_click_sub_icon, self, 0); - g_signal_connect_object (self->sub_icons, "on-middle-click-sub-icon", (GCallback) _cairo_dock_applet_cd_applet_on_middle_click_sub_icon_cairo_dock_applet_isub_applet_on_middle_click_sub_icon, self, 0); - g_signal_connect_object (self->sub_icons, "on-scroll-sub-icon", (GCallback) _cairo_dock_applet_cd_applet_on_scroll_sub_icon_cairo_dock_applet_isub_applet_on_scroll_sub_icon, self, 0); - g_signal_connect_object (self->sub_icons, "on-drop-data-sub-icon", (GCallback) _cairo_dock_applet_cd_applet_on_drop_data_sub_icon_cairo_dock_applet_isub_applet_on_drop_data_sub_icon, self, 0); - g_signal_connect_object (self->sub_icons, "on-build-menu-sub-icon", (GCallback) __cairo_dock_applet_cd_applet_on_build_menu_sub_icon_cairo_dock_applet_isub_applet_on_build_menu_sub_icon, self, 0); -} - - -static void cairo_dock_applet_cd_applet_class_init (CairoDockAppletCDAppletClass * klass) { - cairo_dock_applet_cd_applet_parent_class = g_type_class_peek_parent (klass); - g_type_class_add_private (klass, sizeof (CairoDockAppletCDAppletPrivate)); - CAIRO_DOCK_APPLET_CD_APPLET_CLASS (klass)->on_click = cairo_dock_applet_cd_applet_real_on_click; - CAIRO_DOCK_APPLET_CD_APPLET_CLASS (klass)->on_middle_click = cairo_dock_applet_cd_applet_real_on_middle_click; - CAIRO_DOCK_APPLET_CD_APPLET_CLASS (klass)->on_build_menu = cairo_dock_applet_cd_applet_real_on_build_menu; - CAIRO_DOCK_APPLET_CD_APPLET_CLASS (klass)->on_menu_select = cairo_dock_applet_cd_applet_real_on_menu_select; - CAIRO_DOCK_APPLET_CD_APPLET_CLASS (klass)->on_scroll = cairo_dock_applet_cd_applet_real_on_scroll; - CAIRO_DOCK_APPLET_CD_APPLET_CLASS (klass)->on_drop_data = cairo_dock_applet_cd_applet_real_on_drop_data; - CAIRO_DOCK_APPLET_CD_APPLET_CLASS (klass)->on_answer = cairo_dock_applet_cd_applet_real_on_answer; - CAIRO_DOCK_APPLET_CD_APPLET_CLASS (klass)->on_answer_dialog = cairo_dock_applet_cd_applet_real_on_answer_dialog; - CAIRO_DOCK_APPLET_CD_APPLET_CLASS (klass)->on_shortkey = cairo_dock_applet_cd_applet_real_on_shortkey; - CAIRO_DOCK_APPLET_CD_APPLET_CLASS (klass)->on_change_focus = cairo_dock_applet_cd_applet_real_on_change_focus; - CAIRO_DOCK_APPLET_CD_APPLET_CLASS (klass)->on_click_sub_icon = cairo_dock_applet_cd_applet_real_on_click_sub_icon; - CAIRO_DOCK_APPLET_CD_APPLET_CLASS (klass)->on_middle_click_sub_icon = cairo_dock_applet_cd_applet_real_on_middle_click_sub_icon; - CAIRO_DOCK_APPLET_CD_APPLET_CLASS (klass)->on_scroll_sub_icon = cairo_dock_applet_cd_applet_real_on_scroll_sub_icon; - CAIRO_DOCK_APPLET_CD_APPLET_CLASS (klass)->on_drop_data_sub_icon = cairo_dock_applet_cd_applet_real_on_drop_data_sub_icon; - CAIRO_DOCK_APPLET_CD_APPLET_CLASS (klass)->on_build_menu_sub_icon = cairo_dock_applet_cd_applet_real_on_build_menu_sub_icon; - CAIRO_DOCK_APPLET_CD_APPLET_CLASS (klass)->on_menu_select_sub_icon = cairo_dock_applet_cd_applet_real_on_menu_select_sub_icon; - CAIRO_DOCK_APPLET_CD_APPLET_CLASS (klass)->begin = cairo_dock_applet_cd_applet_real_begin; - CAIRO_DOCK_APPLET_CD_APPLET_CLASS (klass)->end = cairo_dock_applet_cd_applet_real_end; - CAIRO_DOCK_APPLET_CD_APPLET_CLASS (klass)->reload = cairo_dock_applet_cd_applet_real_reload; - CAIRO_DOCK_APPLET_CD_APPLET_CLASS (klass)->get_config = cairo_dock_applet_cd_applet_real_get_config; - G_OBJECT_CLASS (klass)->finalize = cairo_dock_applet_cd_applet_finalize; -} - - -static void cairo_dock_applet_cd_applet_instance_init (CairoDockAppletCDApplet * self) { - self->priv = CAIRO_DOCK_APPLET_CD_APPLET_GET_PRIVATE (self); -} - - -static void cairo_dock_applet_cd_applet_finalize (GObject* obj) { - CairoDockAppletCDApplet * self; - self = CAIRO_DOCK_APPLET_CD_APPLET (obj); - _g_object_unref0 (self->icon); - _g_object_unref0 (self->sub_icons); - _g_free0 (self->cAppletName); - _g_free0 (self->cConfFile); - _g_free0 (self->cParentAppName); - _g_free0 (self->cBusPath); - _g_main_loop_unref0 (self->priv->loop); - _g_free0 (self->priv->_cMenuIconId); - G_OBJECT_CLASS (cairo_dock_applet_cd_applet_parent_class)->finalize (obj); -} - - -GType cairo_dock_applet_cd_applet_get_type (void) { - static volatile gsize cairo_dock_applet_cd_applet_type_id__volatile = 0; - if (g_once_init_enter (&cairo_dock_applet_cd_applet_type_id__volatile)) { - static const GTypeInfo g_define_type_info = { sizeof (CairoDockAppletCDAppletClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) cairo_dock_applet_cd_applet_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CairoDockAppletCDApplet), 0, (GInstanceInitFunc) cairo_dock_applet_cd_applet_instance_init, NULL }; - GType cairo_dock_applet_cd_applet_type_id; - cairo_dock_applet_cd_applet_type_id = g_type_register_static (G_TYPE_OBJECT, "CairoDockAppletCDApplet", &g_define_type_info, 0); - g_once_init_leave (&cairo_dock_applet_cd_applet_type_id__volatile, cairo_dock_applet_cd_applet_type_id); - } - return cairo_dock_applet_cd_applet_type_id__volatile; -} - - -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { - if ((array != NULL) && (destroy_func != NULL)) { - int i; - for (i = 0; i < array_length; i = i + 1) { - if (((gpointer*) array)[i] != NULL) { - destroy_func (((gpointer*) array)[i]); - } - } - } -} - - -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { - _vala_array_destroy (array, array_length, destroy_func); - g_free (array); -} - - - -static void g_cclosure_user_marshal_VOID__VARIANT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { - typedef void (*GMarshalFunc_VOID__VARIANT) (gpointer data1, gpointer arg_1, gpointer data2); - register GMarshalFunc_VOID__VARIANT callback; - register GCClosure * cc; - register gpointer data1, data2; - cc = (GCClosure *) closure; - g_return_if_fail (n_param_values == 2); - if (G_CCLOSURE_SWAP_DATA (closure)) { - data1 = closure->data; - data2 = param_values->data[0].v_pointer; - } else { - data1 = param_values->data[0].v_pointer; - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__VARIANT) (marshal_data ? marshal_data : cc->callback); - callback (data1, g_value_get_variant (param_values + 1), data2); -} - - -static void g_cclosure_user_marshal_VOID__INT_VARIANT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { - typedef void (*GMarshalFunc_VOID__INT_VARIANT) (gpointer data1, gint arg_1, gpointer arg_2, gpointer data2); - register GMarshalFunc_VOID__INT_VARIANT callback; - register GCClosure * cc; - register gpointer data1, data2; - cc = (GCClosure *) closure; - g_return_if_fail (n_param_values == 3); - if (G_CCLOSURE_SWAP_DATA (closure)) { - data1 = closure->data; - data2 = param_values->data[0].v_pointer; - } else { - data1 = param_values->data[0].v_pointer; - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__INT_VARIANT) (marshal_data ? marshal_data : cc->callback); - callback (data1, g_value_get_int (param_values + 1), g_value_get_variant (param_values + 2), data2); -} - - -static void g_cclosure_user_marshal_VOID__INT_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { - typedef void (*GMarshalFunc_VOID__INT_STRING) (gpointer data1, gint arg_1, const char* arg_2, gpointer data2); - register GMarshalFunc_VOID__INT_STRING callback; - register GCClosure * cc; - register gpointer data1, data2; - cc = (GCClosure *) closure; - g_return_if_fail (n_param_values == 3); - if (G_CCLOSURE_SWAP_DATA (closure)) { - data1 = closure->data; - data2 = param_values->data[0].v_pointer; - } else { - data1 = param_values->data[0].v_pointer; - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__INT_STRING) (marshal_data ? marshal_data : cc->callback); - callback (data1, g_value_get_int (param_values + 1), g_value_get_string (param_values + 2), data2); -} - - -static void g_cclosure_user_marshal_VOID__BOOLEAN_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { - typedef void (*GMarshalFunc_VOID__BOOLEAN_STRING) (gpointer data1, gboolean arg_1, const char* arg_2, gpointer data2); - register GMarshalFunc_VOID__BOOLEAN_STRING callback; - register GCClosure * cc; - register gpointer data1, data2; - cc = (GCClosure *) closure; - g_return_if_fail (n_param_values == 3); - if (G_CCLOSURE_SWAP_DATA (closure)) { - data1 = closure->data; - data2 = param_values->data[0].v_pointer; - } else { - data1 = param_values->data[0].v_pointer; - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__BOOLEAN_STRING) (marshal_data ? marshal_data : cc->callback); - callback (data1, g_value_get_boolean (param_values + 1), g_value_get_string (param_values + 2), data2); -} - - -static void g_cclosure_user_marshal_VOID__STRING_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) { - typedef void (*GMarshalFunc_VOID__STRING_STRING) (gpointer data1, const char* arg_1, const char* arg_2, gpointer data2); - register GMarshalFunc_VOID__STRING_STRING callback; - register GCClosure * cc; - register gpointer data1, data2; - cc = (GCClosure *) closure; - g_return_if_fail (n_param_values == 3); - if (G_CCLOSURE_SWAP_DATA (closure)) { - data1 = closure->data; - data2 = param_values->data[0].v_pointer; - } else { - data1 = param_values->data[0].v_pointer; - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__STRING_STRING) (marshal_data ? marshal_data : cc->callback); - callback (data1, g_value_get_string (param_values + 1), g_value_get_string (param_values + 2), data2); -} - - - diff --git a/Dbus/interfaces/vala/src/CDApplet.h b/Dbus/interfaces/vala/src/CDApplet.h deleted file mode 100644 index e156b40b7..000000000 --- a/Dbus/interfaces/vala/src/CDApplet.h +++ /dev/null @@ -1,244 +0,0 @@ -/* CDApplet.h generated by valac 0.18.1, the Vala compiler, do not modify */ - - -#ifndef ___HOME_FAB_CD2_CAIRO_DOCK_PLUG_INS_DBUS_INTERFACES_VALA_SRC_CDAPPLET_H__ -#define ___HOME_FAB_CD2_CAIRO_DOCK_PLUG_INS_DBUS_INTERFACES_VALA_SRC_CDAPPLET_H__ - -#include -#include -#include -#include -#include -#include -#include - -G_BEGIN_DECLS - - -#define CAIRO_DOCK_APPLET_TYPE_IAPPLET (cairo_dock_applet_iapplet_get_type ()) -#define CAIRO_DOCK_APPLET_IAPPLET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CAIRO_DOCK_APPLET_TYPE_IAPPLET, CairoDockAppletIApplet)) -#define CAIRO_DOCK_APPLET_IS_IAPPLET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CAIRO_DOCK_APPLET_TYPE_IAPPLET)) -#define CAIRO_DOCK_APPLET_IAPPLET_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), CAIRO_DOCK_APPLET_TYPE_IAPPLET, CairoDockAppletIAppletIface)) - -typedef struct _CairoDockAppletIApplet CairoDockAppletIApplet; -typedef struct _CairoDockAppletIAppletIface CairoDockAppletIAppletIface; - -#define CAIRO_DOCK_APPLET_TYPE_IAPPLET_PROXY (cairo_dock_applet_iapplet_proxy_get_type ()) - -#define CAIRO_DOCK_APPLET_TYPE_ISUB_APPLET (cairo_dock_applet_isub_applet_get_type ()) -#define CAIRO_DOCK_APPLET_ISUB_APPLET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CAIRO_DOCK_APPLET_TYPE_ISUB_APPLET, CairoDockAppletISubApplet)) -#define CAIRO_DOCK_APPLET_IS_ISUB_APPLET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CAIRO_DOCK_APPLET_TYPE_ISUB_APPLET)) -#define CAIRO_DOCK_APPLET_ISUB_APPLET_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), CAIRO_DOCK_APPLET_TYPE_ISUB_APPLET, CairoDockAppletISubAppletIface)) - -typedef struct _CairoDockAppletISubApplet CairoDockAppletISubApplet; -typedef struct _CairoDockAppletISubAppletIface CairoDockAppletISubAppletIface; - -#define CAIRO_DOCK_APPLET_TYPE_ISUB_APPLET_PROXY (cairo_dock_applet_isub_applet_proxy_get_type ()) - -#define CAIRO_DOCK_APPLET_TYPE_CD_APPLET (cairo_dock_applet_cd_applet_get_type ()) -#define CAIRO_DOCK_APPLET_CD_APPLET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CAIRO_DOCK_APPLET_TYPE_CD_APPLET, CairoDockAppletCDApplet)) -#define CAIRO_DOCK_APPLET_CD_APPLET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CAIRO_DOCK_APPLET_TYPE_CD_APPLET, CairoDockAppletCDAppletClass)) -#define CAIRO_DOCK_APPLET_IS_CD_APPLET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CAIRO_DOCK_APPLET_TYPE_CD_APPLET)) -#define CAIRO_DOCK_APPLET_IS_CD_APPLET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CAIRO_DOCK_APPLET_TYPE_CD_APPLET)) -#define CAIRO_DOCK_APPLET_CD_APPLET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CAIRO_DOCK_APPLET_TYPE_CD_APPLET, CairoDockAppletCDAppletClass)) - -typedef struct _CairoDockAppletCDApplet CairoDockAppletCDApplet; -typedef struct _CairoDockAppletCDAppletClass CairoDockAppletCDAppletClass; -typedef struct _CairoDockAppletCDAppletPrivate CairoDockAppletCDAppletPrivate; - -#define CAIRO_DOCK_APPLET_CD_APPLET_TYPE_SCREEN_POSITION (cairo_dock_applet_cd_applet_screen_position_get_type ()) - -#define CAIRO_DOCK_APPLET_CD_APPLET_TYPE_CONTAINER_TYPE (cairo_dock_applet_cd_applet_container_type_get_type ()) - -#define CAIRO_DOCK_APPLET_CD_APPLET_TYPE_EMBLEM_POSITION (cairo_dock_applet_cd_applet_emblem_position_get_type ()) - -#define CAIRO_DOCK_APPLET_CD_APPLET_TYPE_EMBLEM_MODIFIER (cairo_dock_applet_cd_applet_emblem_modifier_get_type ()) - -#define CAIRO_DOCK_APPLET_CD_APPLET_TYPE_MENU_ITEM_TYPE (cairo_dock_applet_cd_applet_menu_item_type_get_type ()) - -#define CAIRO_DOCK_APPLET_CD_APPLET_TYPE_MENU_ITEM_ID (cairo_dock_applet_cd_applet_menu_item_id_get_type ()) - -#define CAIRO_DOCK_APPLET_CD_APPLET_TYPE_DIALOG_KEY (cairo_dock_applet_cd_applet_dialog_key_get_type ()) - -struct _CairoDockAppletIAppletIface { - GTypeInterface parent_iface; - GVariant* (*Get) (CairoDockAppletIApplet* self, const gchar* cProperty, GError** error); - GHashTable* (*GetAll) (CairoDockAppletIApplet* self, GError** error); - void (*SetQuickInfo) (CairoDockAppletIApplet* self, const gchar* cQuickInfo, GError** error); - void (*SetLabel) (CairoDockAppletIApplet* self, const gchar* cLabel, GError** error); - void (*SetIcon) (CairoDockAppletIApplet* self, const gchar* cImage, GError** error); - void (*SetEmblem) (CairoDockAppletIApplet* self, const gchar* cImage, gint iPosition, GError** error); - void (*Animate) (CairoDockAppletIApplet* self, const gchar* cAnimation, gint iRounds, GError** error); - void (*DemandsAttention) (CairoDockAppletIApplet* self, gboolean bStart, const gchar* cAnimation, GError** error); - void (*ShowDialog) (CairoDockAppletIApplet* self, const gchar* cMessage, gint iDuration, GError** error); - void (*PopupDialog) (CairoDockAppletIApplet* self, GHashTable* hDialogAttributes, GHashTable* hWidgetAttributes, GError** error); - void (*AddDataRenderer) (CairoDockAppletIApplet* self, const gchar* cType, gint iNbValues, const gchar* cTheme, GError** error); - void (*RenderValues) (CairoDockAppletIApplet* self, gdouble* pValues, int pValues_length1, GError** error); - void (*ControlAppli) (CairoDockAppletIApplet* self, const gchar* cApplicationClass, GError** error); - void (*ShowAppli) (CairoDockAppletIApplet* self, gboolean bShow, GError** error); - void (*AddMenuItems) (CairoDockAppletIApplet* self, GHashTable** pItems, int pItems_length1, GError** error); - void (*BindShortkey) (CairoDockAppletIApplet* self, gchar** cShortkeys, int cShortkeys_length1, GError** error); -}; - -struct _CairoDockAppletISubAppletIface { - GTypeInterface parent_iface; - void (*SetQuickInfo) (CairoDockAppletISubApplet* self, const gchar* cQuickInfo, const gchar* cIconID, GError** error); - void (*SetLabel) (CairoDockAppletISubApplet* self, const gchar* cLabel, const gchar* cIconID, GError** error); - void (*SetIcon) (CairoDockAppletISubApplet* self, const gchar* cImage, const gchar* cIconID, GError** error); - void (*SetEmblem) (CairoDockAppletISubApplet* self, const gchar* cImage, gint iPosition, const gchar* cIconID, GError** error); - void (*Animate) (CairoDockAppletISubApplet* self, const gchar* cAnimation, gint iNbRounds, const gchar* cIconID, GError** error); - void (*ShowDialog) (CairoDockAppletISubApplet* self, const gchar* message, gint iDuration, const gchar* cIconID, GError** error); - void (*AddSubIcons) (CairoDockAppletISubApplet* self, gchar** pIconFields, int pIconFields_length1, GError** error); - void (*RemoveSubIcon) (CairoDockAppletISubApplet* self, const gchar* cIconID, GError** error); -}; - -struct _CairoDockAppletCDApplet { - GObject parent_instance; - CairoDockAppletCDAppletPrivate * priv; - CairoDockAppletIApplet* icon; - CairoDockAppletISubApplet* sub_icons; - gchar* cAppletName; - gchar* cConfFile; - gchar* cParentAppName; - gchar* cBusPath; - gchar* cShareDataDir; - gchar* cRootDataDir; -}; - -struct _CairoDockAppletCDAppletClass { - GObjectClass parent_class; - void (*on_click) (CairoDockAppletCDApplet* self, gint iState); - void (*on_middle_click) (CairoDockAppletCDApplet* self); - void (*on_build_menu) (CairoDockAppletCDApplet* self); - void (*on_menu_select) (CairoDockAppletCDApplet* self, gint iNumEntry); - void (*on_scroll) (CairoDockAppletCDApplet* self, gboolean bScrollUp); - void (*on_drop_data) (CairoDockAppletCDApplet* self, const gchar* cReceivedData); - void (*on_answer) (CairoDockAppletCDApplet* self, GVariant* answer); - void (*on_answer_dialog) (CairoDockAppletCDApplet* self, gint iButton, GVariant* answer); - void (*on_shortkey) (CairoDockAppletCDApplet* self, const gchar* cKey); - void (*on_change_focus) (CairoDockAppletCDApplet* self, gboolean bIsActive); - void (*on_click_sub_icon) (CairoDockAppletCDApplet* self, gint iState, const gchar* cIconID); - void (*on_middle_click_sub_icon) (CairoDockAppletCDApplet* self, const gchar* cIconID); - void (*on_scroll_sub_icon) (CairoDockAppletCDApplet* self, gboolean bScrollUp, const gchar* cIconID); - void (*on_drop_data_sub_icon) (CairoDockAppletCDApplet* self, const gchar* cReceivedData, const gchar* cIconID); - void (*on_build_menu_sub_icon) (CairoDockAppletCDApplet* self, const gchar* cIconID); - void (*on_menu_select_sub_icon) (CairoDockAppletCDApplet* self, gint iNumEntry, const gchar* cIconID); - void (*begin) (CairoDockAppletCDApplet* self); - void (*end) (CairoDockAppletCDApplet* self); - void (*reload) (CairoDockAppletCDApplet* self); - void (*get_config) (CairoDockAppletCDApplet* self, GKeyFile* keyfile); -}; - -typedef enum { - CAIRO_DOCK_APPLET_CD_APPLET_SCREEN_POSITION_BOTTOM = 0, - CAIRO_DOCK_APPLET_CD_APPLET_SCREEN_POSITION_TOP, - CAIRO_DOCK_APPLET_CD_APPLET_SCREEN_POSITION_RIGHT, - CAIRO_DOCK_APPLET_CD_APPLET_SCREEN_POSITION_LEFT -} CairoDockAppletCDAppletScreenPosition; - -typedef enum { - CAIRO_DOCK_APPLET_CD_APPLET_CONTAINER_TYPE_DOCK = 0, - CAIRO_DOCK_APPLET_CD_APPLET_CONTAINER_TYPE_DESKLET -} CairoDockAppletCDAppletContainerType; - -typedef enum { - CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_EMBLEM_TOP_LEFT = 0, - CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_EMBLEM_BOTTOM_RIGHT, - CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_EMBLEM_BOTTOM_LEFT, - CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_EMBLEM_TOP_RIGHT, - CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_EMBLEM_MIDDLE, - CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_EMBLEM_BOTTOM, - CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_EMBLEM_TOP, - CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_EMBLEM_RIGHT, - CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_POSITION_EMBLEM_LEFT -} CairoDockAppletCDAppletEmblemPosition; - -typedef enum { - CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_MODIFIER_EMBLEM_PERSISTENT = 0, - CAIRO_DOCK_APPLET_CD_APPLET_EMBLEM_MODIFIER_EMBLEM_PRINT = 9 -} CairoDockAppletCDAppletEmblemModifier; - -typedef enum { - CAIRO_DOCK_APPLET_CD_APPLET_MENU_ITEM_TYPE_MENU_ENTRY = 0, - CAIRO_DOCK_APPLET_CD_APPLET_MENU_ITEM_TYPE_MENU_SUB_MENU, - CAIRO_DOCK_APPLET_CD_APPLET_MENU_ITEM_TYPE_MENU_SEPARATOR, - CAIRO_DOCK_APPLET_CD_APPLET_MENU_ITEM_TYPE_MENU_CHECKBOX, - CAIRO_DOCK_APPLET_CD_APPLET_MENU_ITEM_TYPE_MENU_RADIO_BUTTON -} CairoDockAppletCDAppletMenuItemType; - -typedef enum { - CAIRO_DOCK_APPLET_CD_APPLET_MENU_ITEM_ID_MAIN_MENU_ID = 0 -} CairoDockAppletCDAppletMenuItemId; - -typedef enum { - CAIRO_DOCK_APPLET_CD_APPLET_DIALOG_KEY_DIALOG_KEY_ENTER = -1, - CAIRO_DOCK_APPLET_CD_APPLET_DIALOG_KEY_DIALOG_KEY_ESCAPE = -2 -} CairoDockAppletCDAppletDialogKey; - - -GType cairo_dock_applet_iapplet_proxy_get_type (void) G_GNUC_CONST; -guint cairo_dock_applet_iapplet_register_object (void* object, GDBusConnection* connection, const gchar* path, GError** error); -GType cairo_dock_applet_iapplet_get_type (void) G_GNUC_CONST; -GVariant* cairo_dock_applet_iapplet_Get (CairoDockAppletIApplet* self, const gchar* cProperty, GError** error); -GHashTable* cairo_dock_applet_iapplet_GetAll (CairoDockAppletIApplet* self, GError** error); -void cairo_dock_applet_iapplet_SetQuickInfo (CairoDockAppletIApplet* self, const gchar* cQuickInfo, GError** error); -void cairo_dock_applet_iapplet_SetLabel (CairoDockAppletIApplet* self, const gchar* cLabel, GError** error); -void cairo_dock_applet_iapplet_SetIcon (CairoDockAppletIApplet* self, const gchar* cImage, GError** error); -void cairo_dock_applet_iapplet_SetEmblem (CairoDockAppletIApplet* self, const gchar* cImage, gint iPosition, GError** error); -void cairo_dock_applet_iapplet_Animate (CairoDockAppletIApplet* self, const gchar* cAnimation, gint iRounds, GError** error); -void cairo_dock_applet_iapplet_DemandsAttention (CairoDockAppletIApplet* self, gboolean bStart, const gchar* cAnimation, GError** error); -void cairo_dock_applet_iapplet_ShowDialog (CairoDockAppletIApplet* self, const gchar* cMessage, gint iDuration, GError** error); -void cairo_dock_applet_iapplet_PopupDialog (CairoDockAppletIApplet* self, GHashTable* hDialogAttributes, GHashTable* hWidgetAttributes, GError** error); -void cairo_dock_applet_iapplet_AddDataRenderer (CairoDockAppletIApplet* self, const gchar* cType, gint iNbValues, const gchar* cTheme, GError** error); -void cairo_dock_applet_iapplet_RenderValues (CairoDockAppletIApplet* self, gdouble* pValues, int pValues_length1, GError** error); -void cairo_dock_applet_iapplet_ControlAppli (CairoDockAppletIApplet* self, const gchar* cApplicationClass, GError** error); -void cairo_dock_applet_iapplet_ShowAppli (CairoDockAppletIApplet* self, gboolean bShow, GError** error); -void cairo_dock_applet_iapplet_AddMenuItems (CairoDockAppletIApplet* self, GHashTable** pItems, int pItems_length1, GError** error); -void cairo_dock_applet_iapplet_BindShortkey (CairoDockAppletIApplet* self, gchar** cShortkeys, int cShortkeys_length1, GError** error); -GType cairo_dock_applet_isub_applet_proxy_get_type (void) G_GNUC_CONST; -guint cairo_dock_applet_isub_applet_register_object (void* object, GDBusConnection* connection, const gchar* path, GError** error); -GType cairo_dock_applet_isub_applet_get_type (void) G_GNUC_CONST; -void cairo_dock_applet_isub_applet_SetQuickInfo (CairoDockAppletISubApplet* self, const gchar* cQuickInfo, const gchar* cIconID, GError** error); -void cairo_dock_applet_isub_applet_SetLabel (CairoDockAppletISubApplet* self, const gchar* cLabel, const gchar* cIconID, GError** error); -void cairo_dock_applet_isub_applet_SetIcon (CairoDockAppletISubApplet* self, const gchar* cImage, const gchar* cIconID, GError** error); -void cairo_dock_applet_isub_applet_SetEmblem (CairoDockAppletISubApplet* self, const gchar* cImage, gint iPosition, const gchar* cIconID, GError** error); -void cairo_dock_applet_isub_applet_Animate (CairoDockAppletISubApplet* self, const gchar* cAnimation, gint iNbRounds, const gchar* cIconID, GError** error); -void cairo_dock_applet_isub_applet_ShowDialog (CairoDockAppletISubApplet* self, const gchar* message, gint iDuration, const gchar* cIconID, GError** error); -void cairo_dock_applet_isub_applet_AddSubIcons (CairoDockAppletISubApplet* self, gchar** pIconFields, int pIconFields_length1, GError** error); -void cairo_dock_applet_isub_applet_RemoveSubIcon (CairoDockAppletISubApplet* self, const gchar* cIconID, GError** error); -GType cairo_dock_applet_cd_applet_get_type (void) G_GNUC_CONST; -GType cairo_dock_applet_cd_applet_screen_position_get_type (void) G_GNUC_CONST; -GType cairo_dock_applet_cd_applet_container_type_get_type (void) G_GNUC_CONST; -GType cairo_dock_applet_cd_applet_emblem_position_get_type (void) G_GNUC_CONST; -GType cairo_dock_applet_cd_applet_emblem_modifier_get_type (void) G_GNUC_CONST; -GType cairo_dock_applet_cd_applet_menu_item_type_get_type (void) G_GNUC_CONST; -GType cairo_dock_applet_cd_applet_menu_item_id_get_type (void) G_GNUC_CONST; -GType cairo_dock_applet_cd_applet_dialog_key_get_type (void) G_GNUC_CONST; -CairoDockAppletCDApplet* cairo_dock_applet_cd_applet_new (gchar** argv, int argv_length1); -CairoDockAppletCDApplet* cairo_dock_applet_cd_applet_construct (GType object_type, gchar** argv, int argv_length1); -void cairo_dock_applet_cd_applet_run (CairoDockAppletCDApplet* self); -void cairo_dock_applet_cd_applet_on_click (CairoDockAppletCDApplet* self, gint iState); -void cairo_dock_applet_cd_applet_on_middle_click (CairoDockAppletCDApplet* self); -void cairo_dock_applet_cd_applet_on_build_menu (CairoDockAppletCDApplet* self); -void cairo_dock_applet_cd_applet_on_menu_select (CairoDockAppletCDApplet* self, gint iNumEntry); -void cairo_dock_applet_cd_applet_on_scroll (CairoDockAppletCDApplet* self, gboolean bScrollUp); -void cairo_dock_applet_cd_applet_on_drop_data (CairoDockAppletCDApplet* self, const gchar* cReceivedData); -void cairo_dock_applet_cd_applet_on_answer (CairoDockAppletCDApplet* self, GVariant* answer); -void cairo_dock_applet_cd_applet_on_answer_dialog (CairoDockAppletCDApplet* self, gint iButton, GVariant* answer); -void cairo_dock_applet_cd_applet_on_shortkey (CairoDockAppletCDApplet* self, const gchar* cKey); -void cairo_dock_applet_cd_applet_on_change_focus (CairoDockAppletCDApplet* self, gboolean bIsActive); -void cairo_dock_applet_cd_applet_on_click_sub_icon (CairoDockAppletCDApplet* self, gint iState, const gchar* cIconID); -void cairo_dock_applet_cd_applet_on_middle_click_sub_icon (CairoDockAppletCDApplet* self, const gchar* cIconID); -void cairo_dock_applet_cd_applet_on_scroll_sub_icon (CairoDockAppletCDApplet* self, gboolean bScrollUp, const gchar* cIconID); -void cairo_dock_applet_cd_applet_on_drop_data_sub_icon (CairoDockAppletCDApplet* self, const gchar* cReceivedData, const gchar* cIconID); -void cairo_dock_applet_cd_applet_on_build_menu_sub_icon (CairoDockAppletCDApplet* self, const gchar* cIconID); -void cairo_dock_applet_cd_applet_on_menu_select_sub_icon (CairoDockAppletCDApplet* self, gint iNumEntry, const gchar* cIconID); -void cairo_dock_applet_cd_applet_begin (CairoDockAppletCDApplet* self); -void cairo_dock_applet_cd_applet_end (CairoDockAppletCDApplet* self); -void cairo_dock_applet_cd_applet_reload (CairoDockAppletCDApplet* self); -void cairo_dock_applet_cd_applet_get_config (CairoDockAppletCDApplet* self, GKeyFile* keyfile); - - -G_END_DECLS - -#endif diff --git a/Dbus/interfaces/vala/src/CDApplet.vapi b/Dbus/interfaces/vala/src/CDApplet.vapi deleted file mode 100644 index ca16a50c9..000000000 --- a/Dbus/interfaces/vala/src/CDApplet.vapi +++ /dev/null @@ -1,127 +0,0 @@ -/* CDApplet.vapi generated by valac 0.18.1, do not modify. */ - -namespace CairoDock { - namespace Applet { - [CCode (cheader_filename = "CDApplet.h")] - public class CDApplet : GLib.Object { - public enum ContainerType { - DOCK, - DESKLET - } - public enum DialogKey { - DIALOG_KEY_ENTER, - DIALOG_KEY_ESCAPE - } - public enum EmblemModifier { - EMBLEM_PERSISTENT, - EMBLEM_PRINT - } - public enum EmblemPosition { - EMBLEM_TOP_LEFT, - EMBLEM_BOTTOM_RIGHT, - EMBLEM_BOTTOM_LEFT, - EMBLEM_TOP_RIGHT, - EMBLEM_MIDDLE, - EMBLEM_BOTTOM, - EMBLEM_TOP, - EMBLEM_RIGHT, - EMBLEM_LEFT - } - public enum MenuItemId { - MAIN_MENU_ID - } - public enum MenuItemType { - MENU_ENTRY, - MENU_SUB_MENU, - MENU_SEPARATOR, - MENU_CHECKBOX, - MENU_RADIO_BUTTON - } - public enum ScreenPosition { - BOTTOM, - TOP, - RIGHT, - LEFT - } - public string cAppletName; - public string cBusPath; - public string cConfFile; - public string cParentAppName; - public string cRootDataDir; - public string cShareDataDir; - public CairoDock.Applet.IApplet icon; - public CairoDock.Applet.ISubApplet sub_icons; - public CDApplet (string[] argv); - public virtual void begin (); - public virtual void end (); - public virtual void get_config (GLib.KeyFile keyfile); - public virtual void on_answer (GLib.Variant answer); - public virtual void on_answer_dialog (int iButton, GLib.Variant answer); - public virtual void on_build_menu (); - public virtual void on_build_menu_sub_icon (string cIconID); - public virtual void on_change_focus (bool bIsActive); - public virtual void on_click (int iState); - public virtual void on_click_sub_icon (int iState, string cIconID); - public virtual void on_drop_data (string cReceivedData); - public virtual void on_drop_data_sub_icon (string cReceivedData, string cIconID); - public virtual void on_menu_select (int iNumEntry); - public virtual void on_menu_select_sub_icon (int iNumEntry, string cIconID); - public virtual void on_middle_click (); - public virtual void on_middle_click_sub_icon (string cIconID); - public virtual void on_scroll (bool bScrollUp); - public virtual void on_scroll_sub_icon (bool bScrollUp, string cIconID); - public virtual void on_shortkey (string cKey); - public virtual void reload (); - public void run (); - } - [CCode (cheader_filename = "CDApplet.h")] - [DBus (name = "org.cairodock.CairoDock.applet")] - public interface IApplet : GLib.Object { - public abstract void AddDataRenderer (string cType, int iNbValues, string cTheme) throws GLib.IOError; - public abstract void AddMenuItems (GLib.HashTable[] pItems) throws GLib.IOError; - public abstract void Animate (string cAnimation, int iRounds) throws GLib.IOError; - public abstract void BindShortkey (string[] cShortkeys) throws GLib.IOError; - public abstract void ControlAppli (string cApplicationClass) throws GLib.IOError; - public abstract void DemandsAttention (bool bStart, string cAnimation) throws GLib.IOError; - public abstract GLib.Variant Get (string cProperty) throws GLib.IOError; - public abstract GLib.HashTable GetAll () throws GLib.IOError; - public abstract void PopupDialog (GLib.HashTable hDialogAttributes, GLib.HashTable hWidgetAttributes) throws GLib.IOError; - public abstract void RenderValues (double[] pValues) throws GLib.IOError; - public abstract void SetEmblem (string cImage, int iPosition) throws GLib.IOError; - public abstract void SetIcon (string cImage) throws GLib.IOError; - public abstract void SetLabel (string cLabel) throws GLib.IOError; - public abstract void SetQuickInfo (string cQuickInfo) throws GLib.IOError; - public abstract void ShowAppli (bool bShow) throws GLib.IOError; - public abstract void ShowDialog (string cMessage, int iDuration) throws GLib.IOError; - public signal void on_answer (GLib.Variant answer); - public signal void on_answer_dialog (int iButton, GLib.Variant answer); - public signal void on_build_menu (); - public signal void on_change_focus (bool bIsActive); - public signal void on_click (int iState); - public signal void on_drop_data (string cReceivedData); - public signal void on_menu_select (int iNumEntry); - public signal void on_middle_click (); - public signal void on_reload_module (bool bConfigHasChanged); - public signal void on_scroll (bool bScrollUp); - public signal void on_shortkey (string cKey); - public signal void on_stop_module (); - } - [CCode (cheader_filename = "CDApplet.h")] - [DBus (name = "org.cairodock.CairoDock.subapplet")] - public interface ISubApplet : GLib.Object { - public abstract void AddSubIcons (string[] pIconFields) throws GLib.IOError; - public abstract void Animate (string cAnimation, int iNbRounds, string cIconID) throws GLib.IOError; - public abstract void RemoveSubIcon (string cIconID) throws GLib.IOError; - public abstract void SetEmblem (string cImage, int iPosition, string cIconID) throws GLib.IOError; - public abstract void SetIcon (string cImage, string cIconID) throws GLib.IOError; - public abstract void SetLabel (string cLabel, string cIconID) throws GLib.IOError; - public abstract void SetQuickInfo (string cQuickInfo, string cIconID) throws GLib.IOError; - public abstract void ShowDialog (string message, int iDuration, string cIconID) throws GLib.IOError; - public signal void on_build_menu_sub_icon (string cIconID); - public signal void on_click_sub_icon (int iState, string cIconID); - public signal void on_drop_data_sub_icon (string cReceivedData, string cIconID); - public signal void on_middle_click_sub_icon (string cIconID); - public signal void on_scroll_sub_icon (bool bScrollUp, string cIconID); - } - } -} diff --git a/Dbus/interfaces/vala/src/ValaVapiPath.txt b/Dbus/interfaces/vala/src/ValaVapiPath.txt deleted file mode 100644 index db2cbc933..000000000 --- a/Dbus/interfaces/vala/src/ValaVapiPath.txt +++ /dev/null @@ -1 +0,0 @@ -vala/vapi From 9676a762eaba986e326fd99524ed4870d5b68431 Mon Sep 17 00:00:00 2001 From: Daniel Kondor Date: Sat, 9 Mar 2024 13:23:21 +0100 Subject: [PATCH 05/24] Dbus: explicitly use Python 3 in the demos --- Dbus/demos/demo_bash/demo_bash | 2 +- Dbus/demos/demo_python/demo_python | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dbus/demos/demo_bash/demo_bash b/Dbus/demos/demo_bash/demo_bash index b5d977751..385168e52 100755 --- a/Dbus/demos/demo_bash/demo_bash +++ b/Dbus/demos/demo_bash/demo_bash @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # This is a part of the external demo applet for Cairo-Dock # Copyright : (C) 2010-2011 by Nochka85, Fabounet and atttbe diff --git a/Dbus/demos/demo_python/demo_python b/Dbus/demos/demo_python/demo_python index cc3e3e3f4..721ae7ee9 100755 --- a/Dbus/demos/demo_python/demo_python +++ b/Dbus/demos/demo_python/demo_python @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # This is a part of the external demo applet for Cairo-Dock # Copyright : (C) 2010-2011 by Fabounet From c616e2a8d89e1b9ac9ad817a3d5ab2ed88044efa Mon Sep 17 00:00:00 2001 From: Youhei SASAKI Date: Mon, 15 Oct 2012 00:17:36 +0900 Subject: [PATCH 06/24] Fix typo about SystemMonitor, Mail, dnd2share, Stack, GVFS-integration Signed-off-by: Youhei SASAKI --- System-Monitor/src/applet-init.c | 2 +- gvfs-integration/cairo-dock-gio-vfs.c | 4 ++-- mail/src/cd-mail-applet-init.c | 2 +- netspeed/src/applet-init.c | 2 +- stack/src/applet-stack.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/System-Monitor/src/applet-init.c b/System-Monitor/src/applet-init.c index 28ec04db9..ec02dfe67 100755 --- a/System-Monitor/src/applet-init.c +++ b/System-Monitor/src/applet-init.c @@ -37,7 +37,7 @@ CD_APPLET_DEFINITION (N_("System Monitor"), CAIRO_DOCK_CATEGORY_APPLET_SYSTEM, N_("This applet shows you the CPU load, RAM usage, graphic card temperature, etc.\n" "Middle click on the icon to get some valuable info.\n" - "Left click on the icon to get a list of the most ressources using programs.\n" + "Left click on the icon to get a list of the most resources using programs.\n" "You can instanciate this applet several times to show different values each time."), "parAdOxxx_ZeRo and Fabounet") diff --git a/gvfs-integration/cairo-dock-gio-vfs.c b/gvfs-integration/cairo-dock-gio-vfs.c index 6256c70bf..07711ca8b 100644 --- a/gvfs-integration/cairo-dock-gio-vfs.c +++ b/gvfs-integration/cairo-dock-gio-vfs.c @@ -52,10 +52,10 @@ gboolean cairo_dock_gio_vfs_init (void) if( !cairo_dock_dbus_is_enabled() || !cairo_dock_dbus_detect_application (G_VFS_DBUS_DAEMON_NAME) ) { - cd_warning("VFS Deamon NOT found on DBus !"); + cd_warning("VFS Daemon NOT found on DBus !"); return FALSE; } - cd_message("VFS Deamon found on DBus."); + cd_message("VFS Daemon found on DBus."); if (s_hMonitorHandleTable != NULL) diff --git a/mail/src/cd-mail-applet-init.c b/mail/src/cd-mail-applet-init.c index 79a9af719..77384028b 100755 --- a/mail/src/cd-mail-applet-init.c +++ b/mail/src/cd-mail-applet-init.c @@ -35,7 +35,7 @@ CD_APPLET_DEFINE_BEGIN (N_("mail"), CAIRO_DOCK_CATEGORY_APPLET_INTERNET, N_("This applet is very useful to warn you when you get new e-mails\n" "It can check in any kind of mailbox (yahoo, gmail, etc)\n" - "Left-click to launch the prefered mail application,\n" + "Left-click to launch the preferred mail application,\n" "Middle-click to refresh all the mailboxes."), "Tofe (Christophe Chapuis) & Fabounet (Fabrice Rey)") CD_APPLET_DEFINE_COMMON_APPLET_INTERFACE diff --git a/netspeed/src/applet-init.c b/netspeed/src/applet-init.c index 45221e83c..ba3aa6c95 100755 --- a/netspeed/src/applet-init.c +++ b/netspeed/src/applet-init.c @@ -30,7 +30,7 @@ CD_APPLET_DEFINITION (N_("netspeed"), 2, 0, 5, CAIRO_DOCK_CATEGORY_APPLET_INTERNET, N_("This applet shows you the bit rate of your internet connection and some stats about it.\n" - "Left-click on the icon to have the total amount of data transfered\n" + "Left-click on the icon to have the total amount of data transferred\n" "Middle-click to (de)activate the network (needs NetworManager)"), "parAdOxxx_ZeRo"); diff --git a/stack/src/applet-stack.c b/stack/src/applet-stack.c index c7582aff1..a45a81837 100755 --- a/stack/src/applet-stack.c +++ b/stack/src/applet-stack.c @@ -385,7 +385,7 @@ static Icon *_cd_stack_create_new_item (GldiModuleInstance *myApplet, const gcha { g_key_file_free (pKeyFile); g_free (cURI); - cd_warning ("stack : '%s' is not a valid adress", cContent); + cd_warning ("stack : '%s' is not a valid address", cContent); return NULL; } g_key_file_set_string (pKeyFile, "Desktop Entry", "Content", cURI); From 68b8356c17efbd7e2d865d32d6e822b920f6618c Mon Sep 17 00:00:00 2001 From: Daniel Kondor Date: Sat, 9 Mar 2024 14:38:26 +0100 Subject: [PATCH 07/24] po: update translation strings to match the previous commit --- po/ar.po | 6 +++--- po/ca.po | 6 +++--- po/cs.po | 6 +++--- po/da.po | 6 +++--- po/de.po | 6 +++--- po/el.po | 6 +++--- po/en_GB.po | 10 +++++----- po/es.po | 6 +++--- po/et.po | 6 +++--- po/eu.po | 6 +++--- po/fr.po | 6 +++--- po/he.po | 6 +++--- po/hr.po | 6 +++--- po/hu.po | 6 +++--- po/id.po | 6 +++--- po/it.po | 6 +++--- po/ja.po | 6 +++--- po/ko.po | 6 +++--- po/lt.po | 6 +++--- po/nl.po | 6 +++--- po/pl.po | 6 +++--- po/pt.po | 6 +++--- po/pt_BR.po | 6 +++--- po/ru.po | 6 +++--- po/sk.po | 6 +++--- po/sr.po | 6 +++--- po/sr@latin.po | 6 +++--- po/sv.po | 6 +++--- po/tr.po | 6 +++--- po/uk.po | 6 +++--- po/uz.po | 6 +++--- po/zh_CN.po | 6 +++--- po/zh_TW.po | 6 +++--- 33 files changed, 101 insertions(+), 101 deletions(-) diff --git a/po/ar.po b/po/ar.po index 0a1ad1eab..25bf20fa7 100644 --- a/po/ar.po +++ b/po/ar.po @@ -1459,7 +1459,7 @@ msgid "" "This applet shows you the CPU load, RAM usage, graphic card temperature, " "etc.\n" "Middle click on the icon to get some valuable info.\n" -"Left click on the icon to get a list of the most ressources using programs.\n" +"Left click on the icon to get a list of the most resources using programs.\n" "You can instanciate this applet several times to show different values each " "time." msgstr "" @@ -2654,7 +2654,7 @@ msgstr "" msgid "" "This applet is very useful to warn you when you get new e-mails\n" "It can check in any kind of mailbox (yahoo, gmail, etc)\n" -"Left-click to launch the prefered mail application,\n" +"Left-click to launch the preferred mail application,\n" "Middle-click to refresh all the mailboxes." msgstr "" @@ -2846,7 +2846,7 @@ msgstr "" msgid "" "This applet shows you the bit rate of your internet connection and some " "stats about it.\n" -"Left-click on the icon to have the total amount of data transfered\n" +"Left-click on the icon to have the total amount of data transferred\n" "Middle-click to (de)activate the network (needs NetworManager)" msgstr "" diff --git a/po/ca.po b/po/ca.po index 7b199b8fd..ce736788e 100644 --- a/po/ca.po +++ b/po/ca.po @@ -1585,7 +1585,7 @@ msgid "" "This applet shows you the CPU load, RAM usage, graphic card temperature, " "etc.\n" "Middle click on the icon to get some valuable info.\n" -"Left click on the icon to get a list of the most ressources using programs.\n" +"Left click on the icon to get a list of the most resources using programs.\n" "You can instanciate this applet several times to show different values each " "time." msgstr "" @@ -2780,7 +2780,7 @@ msgstr "" msgid "" "This applet is very useful to warn you when you get new e-mails\n" "It can check in any kind of mailbox (yahoo, gmail, etc)\n" -"Left-click to launch the prefered mail application,\n" +"Left-click to launch the preferred mail application,\n" "Middle-click to refresh all the mailboxes." msgstr "" @@ -2972,7 +2972,7 @@ msgstr "" msgid "" "This applet shows you the bit rate of your internet connection and some " "stats about it.\n" -"Left-click on the icon to have the total amount of data transfered\n" +"Left-click on the icon to have the total amount of data transferred\n" "Middle-click to (de)activate the network (needs NetworManager)" msgstr "" diff --git a/po/cs.po b/po/cs.po index 19b71a267..01c572063 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1477,7 +1477,7 @@ msgid "" "This applet shows you the CPU load, RAM usage, graphic card temperature, " "etc.\n" "Middle click on the icon to get some valuable info.\n" -"Left click on the icon to get a list of the most ressources using programs.\n" +"Left click on the icon to get a list of the most resources using programs.\n" "You can instanciate this applet several times to show different values each " "time." msgstr "" @@ -2732,7 +2732,7 @@ msgstr "email" msgid "" "This applet is very useful to warn you when you get new e-mails\n" "It can check in any kind of mailbox (yahoo, gmail, etc)\n" -"Left-click to launch the prefered mail application,\n" +"Left-click to launch the preferred mail application,\n" "Middle-click to refresh all the mailboxes." msgstr "" "Tento applet vás bude upozorňovat na nové emaily.\n" @@ -2935,7 +2935,7 @@ msgstr "" msgid "" "This applet shows you the bit rate of your internet connection and some " "stats about it.\n" -"Left-click on the icon to have the total amount of data transfered\n" +"Left-click on the icon to have the total amount of data transferred\n" "Middle-click to (de)activate the network (needs NetworManager)" msgstr "" "Tento applet vám ukažuje rychlost přenosu dat vašeho internetu a nějaké " diff --git a/po/da.po b/po/da.po index cdb566f6c..372fcbe12 100644 --- a/po/da.po +++ b/po/da.po @@ -1422,7 +1422,7 @@ msgid "" "This applet shows you the CPU load, RAM usage, graphic card temperature, " "etc.\n" "Middle click on the icon to get some valuable info.\n" -"Left click on the icon to get a list of the most ressources using programs.\n" +"Left click on the icon to get a list of the most resources using programs.\n" "You can instanciate this applet several times to show different values each " "time." msgstr "" @@ -2623,7 +2623,7 @@ msgstr "mail" msgid "" "This applet is very useful to warn you when you get new e-mails\n" "It can check in any kind of mailbox (yahoo, gmail, etc)\n" -"Left-click to launch the prefered mail application,\n" +"Left-click to launch the preferred mail application,\n" "Middle-click to refresh all the mailboxes." msgstr "" @@ -2815,7 +2815,7 @@ msgstr "net hastighed" msgid "" "This applet shows you the bit rate of your internet connection and some " "stats about it.\n" -"Left-click on the icon to have the total amount of data transfered\n" +"Left-click on the icon to have the total amount of data transferred\n" "Middle-click to (de)activate the network (needs NetworManager)" msgstr "" diff --git a/po/de.po b/po/de.po index 088bfeb3d..41710a88a 100644 --- a/po/de.po +++ b/po/de.po @@ -1609,7 +1609,7 @@ msgid "" "This applet shows you the CPU load, RAM usage, graphic card temperature, " "etc.\n" "Middle click on the icon to get some valuable info.\n" -"Left click on the icon to get a list of the most ressources using programs.\n" +"Left click on the icon to get a list of the most resources using programs.\n" "You can instanciate this applet several times to show different values each " "time." msgstr "" @@ -2937,7 +2937,7 @@ msgstr "E-Mail" msgid "" "This applet is very useful to warn you when you get new e-mails\n" "It can check in any kind of mailbox (yahoo, gmail, etc)\n" -"Left-click to launch the prefered mail application,\n" +"Left-click to launch the preferred mail application,\n" "Middle-click to refresh all the mailboxes." msgstr "" "Dieses Applet ist sehr nützlich, um bei neuen E-Mails einen Hinweis " @@ -3154,7 +3154,7 @@ msgstr "Netzgeschwindigkeit" msgid "" "This applet shows you the bit rate of your internet connection and some " "stats about it.\n" -"Left-click on the icon to have the total amount of data transfered\n" +"Left-click on the icon to have the total amount of data transferred\n" "Middle-click to (de)activate the network (needs NetworManager)" msgstr "" "Dieses Applet zeigt Ihnen die Geschwindigkeit Ihrer Internetverbindung sowie " diff --git a/po/el.po b/po/el.po index 9ac100357..ce81ecd4a 100644 --- a/po/el.po +++ b/po/el.po @@ -1506,7 +1506,7 @@ msgid "" "This applet shows you the CPU load, RAM usage, graphic card temperature, " "etc.\n" "Middle click on the icon to get some valuable info.\n" -"Left click on the icon to get a list of the most ressources using programs.\n" +"Left click on the icon to get a list of the most resources using programs.\n" "You can instanciate this applet several times to show different values each " "time." msgstr "" @@ -2800,7 +2800,7 @@ msgstr "ηλεκτρονική αλληλογραφία" msgid "" "This applet is very useful to warn you when you get new e-mails\n" "It can check in any kind of mailbox (yahoo, gmail, etc)\n" -"Left-click to launch the prefered mail application,\n" +"Left-click to launch the preferred mail application,\n" "Middle-click to refresh all the mailboxes." msgstr "" "Αυτή η μικροεφαρμογή είναι πολύ χρήσιμη όταν λαμβάνεται νέα μηνύματα " @@ -3005,7 +3005,7 @@ msgstr "ταχύτητα δικτύου" msgid "" "This applet shows you the bit rate of your internet connection and some " "stats about it.\n" -"Left-click on the icon to have the total amount of data transfered\n" +"Left-click on the icon to have the total amount of data transferred\n" "Middle-click to (de)activate the network (needs NetworManager)" msgstr "" "Αυτή η μικροεφαρμογή σας δείχνει την ταχύτητα της σύνδεσής σας με το " diff --git a/po/en_GB.po b/po/en_GB.po index b0a070100..14c2e96df 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -1575,7 +1575,7 @@ msgid "" "This applet shows you the CPU load, RAM usage, graphic card temperature, " "etc.\n" "Middle click on the icon to get some valuable info.\n" -"Left click on the icon to get a list of the most ressources using programs.\n" +"Left click on the icon to get a list of the most resources using programs.\n" "You can instanciate this applet several times to show different values each " "time." msgstr "" @@ -2873,12 +2873,12 @@ msgstr "Mail" msgid "" "This applet is very useful to warn you when you get new e-mails\n" "It can check in any kind of mailbox (yahoo, gmail, etc)\n" -"Left-click to launch the prefered mail application,\n" +"Left-click to launch the preferred mail application,\n" "Middle-click to refresh all the mailboxes." msgstr "" "This applet is very useful to inform you about new e-mails\n" "It can check any kind of mailbox (Yahoo!, GMail, etc)\n" -"Left-click to launch the prefered mail application,\n" +"Left-click to launch the preferred mail application,\n" "Middle-click to refresh all the mailboxes." #: ../mail/src/cd-mail-applet-notifications.c:62 @@ -3086,12 +3086,12 @@ msgstr "netspeed" msgid "" "This applet shows you the bit rate of your internet connection and some " "stats about it.\n" -"Left-click on the icon to have the total amount of data transfered\n" +"Left-click on the icon to have the total amount of data transferred\n" "Middle-click to (de)activate the network (needs NetworManager)" msgstr "" "This applet shows you the bit rate of your internet connection and some " "stats about it.\n" -"Left-click on the icon to have the total amount of data transfered\n" +"Left-click on the icon to have the total amount of data transferred\n" "Middle-click to (de)activate the network (needs Network Manager)" #: ../netspeed/src/applet-notifications.c:36 diff --git a/po/es.po b/po/es.po index 6d805d6ec..0a65846b8 100644 --- a/po/es.po +++ b/po/es.po @@ -1500,7 +1500,7 @@ msgid "" "This applet shows you the CPU load, RAM usage, graphic card temperature, " "etc.\n" "Middle click on the icon to get some valuable info.\n" -"Left click on the icon to get a list of the most ressources using programs.\n" +"Left click on the icon to get a list of the most resources using programs.\n" "You can instanciate this applet several times to show different values each " "time." msgstr "" @@ -2784,7 +2784,7 @@ msgstr "correo" msgid "" "This applet is very useful to warn you when you get new e-mails\n" "It can check in any kind of mailbox (yahoo, gmail, etc)\n" -"Left-click to launch the prefered mail application,\n" +"Left-click to launch the preferred mail application,\n" "Middle-click to refresh all the mailboxes." msgstr "" "Éste aplique es muy útil para avisarle cuando reciba nuevos correos " @@ -2990,7 +2990,7 @@ msgstr "netspeed" msgid "" "This applet shows you the bit rate of your internet connection and some " "stats about it.\n" -"Left-click on the icon to have the total amount of data transfered\n" +"Left-click on the icon to have the total amount of data transferred\n" "Middle-click to (de)activate the network (needs NetworManager)" msgstr "" "Este aplique le muestra la tasa de bits de su conexión a Internet, y algunas " diff --git a/po/et.po b/po/et.po index a35a56bcd..4ea4218b1 100644 --- a/po/et.po +++ b/po/et.po @@ -1464,7 +1464,7 @@ msgid "" "This applet shows you the CPU load, RAM usage, graphic card temperature, " "etc.\n" "Middle click on the icon to get some valuable info.\n" -"Left click on the icon to get a list of the most ressources using programs.\n" +"Left click on the icon to get a list of the most resources using programs.\n" "You can instanciate this applet several times to show different values each " "time." msgstr "" @@ -2690,7 +2690,7 @@ msgstr "meil" msgid "" "This applet is very useful to warn you when you get new e-mails\n" "It can check in any kind of mailbox (yahoo, gmail, etc)\n" -"Left-click to launch the prefered mail application,\n" +"Left-click to launch the preferred mail application,\n" "Middle-click to refresh all the mailboxes." msgstr "" @@ -2882,7 +2882,7 @@ msgstr "netikiirus" msgid "" "This applet shows you the bit rate of your internet connection and some " "stats about it.\n" -"Left-click on the icon to have the total amount of data transfered\n" +"Left-click on the icon to have the total amount of data transferred\n" "Middle-click to (de)activate the network (needs NetworManager)" msgstr "" diff --git a/po/eu.po b/po/eu.po index 8f6b6031f..5c1572b73 100644 --- a/po/eu.po +++ b/po/eu.po @@ -1416,7 +1416,7 @@ msgid "" "This applet shows you the CPU load, RAM usage, graphic card temperature, " "etc.\n" "Middle click on the icon to get some valuable info.\n" -"Left click on the icon to get a list of the most ressources using programs.\n" +"Left click on the icon to get a list of the most resources using programs.\n" "You can instanciate this applet several times to show different values each " "time." msgstr "" @@ -2613,7 +2613,7 @@ msgstr "Posta" msgid "" "This applet is very useful to warn you when you get new e-mails\n" "It can check in any kind of mailbox (yahoo, gmail, etc)\n" -"Left-click to launch the prefered mail application,\n" +"Left-click to launch the preferred mail application,\n" "Middle-click to refresh all the mailboxes." msgstr "" @@ -2805,7 +2805,7 @@ msgstr "" msgid "" "This applet shows you the bit rate of your internet connection and some " "stats about it.\n" -"Left-click on the icon to have the total amount of data transfered\n" +"Left-click on the icon to have the total amount of data transferred\n" "Middle-click to (de)activate the network (needs NetworManager)" msgstr "" diff --git a/po/fr.po b/po/fr.po index 01502fc6d..3663c36ec 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1609,7 +1609,7 @@ msgid "" "This applet shows you the CPU load, RAM usage, graphic card temperature, " "etc.\n" "Middle click on the icon to get some valuable info.\n" -"Left click on the icon to get a list of the most ressources using programs.\n" +"Left click on the icon to get a list of the most resources using programs.\n" "You can instanciate this applet several times to show different values each " "time." msgstr "" @@ -2927,7 +2927,7 @@ msgstr "Mail" msgid "" "This applet is very useful to warn you when you get new e-mails\n" "It can check in any kind of mailbox (yahoo, gmail, etc)\n" -"Left-click to launch the prefered mail application,\n" +"Left-click to launch the preferred mail application,\n" "Middle-click to refresh all the mailboxes." msgstr "" "Cette applet est très utile pour vous avertir de nouveaux mails reçus.\n" @@ -3143,7 +3143,7 @@ msgstr "Vitesse réseau" msgid "" "This applet shows you the bit rate of your internet connection and some " "stats about it.\n" -"Left-click on the icon to have the total amount of data transfered\n" +"Left-click on the icon to have the total amount of data transferred\n" "Middle-click to (de)activate the network (needs NetworManager)" msgstr "" "Cette applet vous indique le débit de votre connexion Internet et quelques " diff --git a/po/he.po b/po/he.po index b09d8bf40..74208d536 100644 --- a/po/he.po +++ b/po/he.po @@ -1460,7 +1460,7 @@ msgid "" "This applet shows you the CPU load, RAM usage, graphic card temperature, " "etc.\n" "Middle click on the icon to get some valuable info.\n" -"Left click on the icon to get a list of the most ressources using programs.\n" +"Left click on the icon to get a list of the most resources using programs.\n" "You can instanciate this applet several times to show different values each " "time." msgstr "" @@ -2655,7 +2655,7 @@ msgstr "דוא״ל" msgid "" "This applet is very useful to warn you when you get new e-mails\n" "It can check in any kind of mailbox (yahoo, gmail, etc)\n" -"Left-click to launch the prefered mail application,\n" +"Left-click to launch the preferred mail application,\n" "Middle-click to refresh all the mailboxes." msgstr "" @@ -2847,7 +2847,7 @@ msgstr "" msgid "" "This applet shows you the bit rate of your internet connection and some " "stats about it.\n" -"Left-click on the icon to have the total amount of data transfered\n" +"Left-click on the icon to have the total amount of data transferred\n" "Middle-click to (de)activate the network (needs NetworManager)" msgstr "" diff --git a/po/hr.po b/po/hr.po index ef3387598..cb029ab1e 100644 --- a/po/hr.po +++ b/po/hr.po @@ -1528,7 +1528,7 @@ msgid "" "This applet shows you the CPU load, RAM usage, graphic card temperature, " "etc.\n" "Middle click on the icon to get some valuable info.\n" -"Left click on the icon to get a list of the most ressources using programs.\n" +"Left click on the icon to get a list of the most resources using programs.\n" "You can instanciate this applet several times to show different values each " "time." msgstr "" @@ -2723,7 +2723,7 @@ msgstr "" msgid "" "This applet is very useful to warn you when you get new e-mails\n" "It can check in any kind of mailbox (yahoo, gmail, etc)\n" -"Left-click to launch the prefered mail application,\n" +"Left-click to launch the preferred mail application,\n" "Middle-click to refresh all the mailboxes." msgstr "" @@ -2915,7 +2915,7 @@ msgstr "" msgid "" "This applet shows you the bit rate of your internet connection and some " "stats about it.\n" -"Left-click on the icon to have the total amount of data transfered\n" +"Left-click on the icon to have the total amount of data transferred\n" "Middle-click to (de)activate the network (needs NetworManager)" msgstr "" diff --git a/po/hu.po b/po/hu.po index 1d06c0d91..bd26b5d86 100644 --- a/po/hu.po +++ b/po/hu.po @@ -1512,7 +1512,7 @@ msgid "" "This applet shows you the CPU load, RAM usage, graphic card temperature, " "etc.\n" "Middle click on the icon to get some valuable info.\n" -"Left click on the icon to get a list of the most ressources using programs.\n" +"Left click on the icon to get a list of the most resources using programs.\n" "You can instanciate this applet several times to show different values each " "time." msgstr "" @@ -2776,7 +2776,7 @@ msgstr "levél" msgid "" "This applet is very useful to warn you when you get new e-mails\n" "It can check in any kind of mailbox (yahoo, gmail, etc)\n" -"Left-click to launch the prefered mail application,\n" +"Left-click to launch the preferred mail application,\n" "Middle-click to refresh all the mailboxes." msgstr "" "Ez a kisalkalmazás nagyon hasznos arra, hogy figyelmeztesse új emailek " @@ -2981,7 +2981,7 @@ msgstr "Internetsebesség" msgid "" "This applet shows you the bit rate of your internet connection and some " "stats about it.\n" -"Left-click on the icon to have the total amount of data transfered\n" +"Left-click on the icon to have the total amount of data transferred\n" "Middle-click to (de)activate the network (needs NetworManager)" msgstr "" "Ez a kisalkalmazás megjeleníti internetsebességét és néhány szatisztikát " diff --git a/po/id.po b/po/id.po index 85e5423f9..238e69603 100644 --- a/po/id.po +++ b/po/id.po @@ -1416,7 +1416,7 @@ msgid "" "This applet shows you the CPU load, RAM usage, graphic card temperature, " "etc.\n" "Middle click on the icon to get some valuable info.\n" -"Left click on the icon to get a list of the most ressources using programs.\n" +"Left click on the icon to get a list of the most resources using programs.\n" "You can instanciate this applet several times to show different values each " "time." msgstr "" @@ -2611,7 +2611,7 @@ msgstr "" msgid "" "This applet is very useful to warn you when you get new e-mails\n" "It can check in any kind of mailbox (yahoo, gmail, etc)\n" -"Left-click to launch the prefered mail application,\n" +"Left-click to launch the preferred mail application,\n" "Middle-click to refresh all the mailboxes." msgstr "" @@ -2803,7 +2803,7 @@ msgstr "" msgid "" "This applet shows you the bit rate of your internet connection and some " "stats about it.\n" -"Left-click on the icon to have the total amount of data transfered\n" +"Left-click on the icon to have the total amount of data transferred\n" "Middle-click to (de)activate the network (needs NetworManager)" msgstr "" diff --git a/po/it.po b/po/it.po index 199d035de..efcfecd6b 100644 --- a/po/it.po +++ b/po/it.po @@ -1594,7 +1594,7 @@ msgid "" "This applet shows you the CPU load, RAM usage, graphic card temperature, " "etc.\n" "Middle click on the icon to get some valuable info.\n" -"Left click on the icon to get a list of the most ressources using programs.\n" +"Left click on the icon to get a list of the most resources using programs.\n" "You can instanciate this applet several times to show different values each " "time." msgstr "" @@ -2901,7 +2901,7 @@ msgstr "Mail" msgid "" "This applet is very useful to warn you when you get new e-mails\n" "It can check in any kind of mailbox (yahoo, gmail, etc)\n" -"Left-click to launch the prefered mail application,\n" +"Left-click to launch the preferred mail application,\n" "Middle-click to refresh all the mailboxes." msgstr "" "Quest'applet è davvero utile per avvertirti quando ricevi nuove e-mail\n" @@ -3116,7 +3116,7 @@ msgstr "Netspeed" msgid "" "This applet shows you the bit rate of your internet connection and some " "stats about it.\n" -"Left-click on the icon to have the total amount of data transfered\n" +"Left-click on the icon to have the total amount of data transferred\n" "Middle-click to (de)activate the network (needs NetworManager)" msgstr "" "Quest'applet mostra il tasso di connettività della tua connessione internet " diff --git a/po/ja.po b/po/ja.po index 91bc325da..0093d0260 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1503,7 +1503,7 @@ msgid "" "This applet shows you the CPU load, RAM usage, graphic card temperature, " "etc.\n" "Middle click on the icon to get some valuable info.\n" -"Left click on the icon to get a list of the most ressources using programs.\n" +"Left click on the icon to get a list of the most resources using programs.\n" "You can instanciate this applet several times to show different values each " "time." msgstr "" @@ -2767,7 +2767,7 @@ msgstr "メール" msgid "" "This applet is very useful to warn you when you get new e-mails\n" "It can check in any kind of mailbox (yahoo, gmail, etc)\n" -"Left-click to launch the prefered mail application,\n" +"Left-click to launch the preferred mail application,\n" "Middle-click to refresh all the mailboxes." msgstr "" "電子メール新着時の通知に非常に役立つアプレット。\n" @@ -2978,7 +2978,7 @@ msgstr "ネット速度" msgid "" "This applet shows you the bit rate of your internet connection and some " "stats about it.\n" -"Left-click on the icon to have the total amount of data transfered\n" +"Left-click on the icon to have the total amount of data transferred\n" "Middle-click to (de)activate the network (needs NetworManager)" msgstr "" "インターネット接続のビットレートや統計を表示するアプレット。\n" diff --git a/po/ko.po b/po/ko.po index bfcf86304..379865648 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1415,7 +1415,7 @@ msgid "" "This applet shows you the CPU load, RAM usage, graphic card temperature, " "etc.\n" "Middle click on the icon to get some valuable info.\n" -"Left click on the icon to get a list of the most ressources using programs.\n" +"Left click on the icon to get a list of the most resources using programs.\n" "You can instanciate this applet several times to show different values each " "time." msgstr "" @@ -2612,7 +2612,7 @@ msgstr "메일" msgid "" "This applet is very useful to warn you when you get new e-mails\n" "It can check in any kind of mailbox (yahoo, gmail, etc)\n" -"Left-click to launch the prefered mail application,\n" +"Left-click to launch the preferred mail application,\n" "Middle-click to refresh all the mailboxes." msgstr "" @@ -2804,7 +2804,7 @@ msgstr "" msgid "" "This applet shows you the bit rate of your internet connection and some " "stats about it.\n" -"Left-click on the icon to have the total amount of data transfered\n" +"Left-click on the icon to have the total amount of data transferred\n" "Middle-click to (de)activate the network (needs NetworManager)" msgstr "" diff --git a/po/lt.po b/po/lt.po index 6f6d43df9..4713bd8b5 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1409,7 +1409,7 @@ msgid "" "This applet shows you the CPU load, RAM usage, graphic card temperature, " "etc.\n" "Middle click on the icon to get some valuable info.\n" -"Left click on the icon to get a list of the most ressources using programs.\n" +"Left click on the icon to get a list of the most resources using programs.\n" "You can instanciate this applet several times to show different values each " "time." msgstr "" @@ -2604,7 +2604,7 @@ msgstr "" msgid "" "This applet is very useful to warn you when you get new e-mails\n" "It can check in any kind of mailbox (yahoo, gmail, etc)\n" -"Left-click to launch the prefered mail application,\n" +"Left-click to launch the preferred mail application,\n" "Middle-click to refresh all the mailboxes." msgstr "" @@ -2796,7 +2796,7 @@ msgstr "" msgid "" "This applet shows you the bit rate of your internet connection and some " "stats about it.\n" -"Left-click on the icon to have the total amount of data transfered\n" +"Left-click on the icon to have the total amount of data transferred\n" "Middle-click to (de)activate the network (needs NetworManager)" msgstr "" diff --git a/po/nl.po b/po/nl.po index 4e8705467..b2d153054 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1587,7 +1587,7 @@ msgid "" "This applet shows you the CPU load, RAM usage, graphic card temperature, " "etc.\n" "Middle click on the icon to get some valuable info.\n" -"Left click on the icon to get a list of the most ressources using programs.\n" +"Left click on the icon to get a list of the most resources using programs.\n" "You can instanciate this applet several times to show different values each " "time." msgstr "" @@ -2896,7 +2896,7 @@ msgstr "E-mail" msgid "" "This applet is very useful to warn you when you get new e-mails\n" "It can check in any kind of mailbox (yahoo, gmail, etc)\n" -"Left-click to launch the prefered mail application,\n" +"Left-click to launch the preferred mail application,\n" "Middle-click to refresh all the mailboxes." msgstr "" "Dit applet is zeer handig om u te waarschuwen als u nieuwe e-mails heeft " @@ -3111,7 +3111,7 @@ msgstr "Netsnelheid" msgid "" "This applet shows you the bit rate of your internet connection and some " "stats about it.\n" -"Left-click on the icon to have the total amount of data transfered\n" +"Left-click on the icon to have the total amount of data transferred\n" "Middle-click to (de)activate the network (needs NetworManager)" msgstr "" "Dit applet laat u de snelheid van uw internetverbinding zien en enige " diff --git a/po/pl.po b/po/pl.po index 26c6989fb..46ad0c7d6 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1424,7 +1424,7 @@ msgid "" "This applet shows you the CPU load, RAM usage, graphic card temperature, " "etc.\n" "Middle click on the icon to get some valuable info.\n" -"Left click on the icon to get a list of the most ressources using programs.\n" +"Left click on the icon to get a list of the most resources using programs.\n" "You can instanciate this applet several times to show different values each " "time." msgstr "" @@ -2621,7 +2621,7 @@ msgstr "" msgid "" "This applet is very useful to warn you when you get new e-mails\n" "It can check in any kind of mailbox (yahoo, gmail, etc)\n" -"Left-click to launch the prefered mail application,\n" +"Left-click to launch the preferred mail application,\n" "Middle-click to refresh all the mailboxes." msgstr "" @@ -2813,7 +2813,7 @@ msgstr "" msgid "" "This applet shows you the bit rate of your internet connection and some " "stats about it.\n" -"Left-click on the icon to have the total amount of data transfered\n" +"Left-click on the icon to have the total amount of data transferred\n" "Middle-click to (de)activate the network (needs NetworManager)" msgstr "" diff --git a/po/pt.po b/po/pt.po index 4545bf3b1..72904c744 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1454,7 +1454,7 @@ msgid "" "This applet shows you the CPU load, RAM usage, graphic card temperature, " "etc.\n" "Middle click on the icon to get some valuable info.\n" -"Left click on the icon to get a list of the most ressources using programs.\n" +"Left click on the icon to get a list of the most resources using programs.\n" "You can instanciate this applet several times to show different values each " "time." msgstr "" @@ -2704,7 +2704,7 @@ msgstr "e-mail" msgid "" "This applet is very useful to warn you when you get new e-mails\n" "It can check in any kind of mailbox (yahoo, gmail, etc)\n" -"Left-click to launch the prefered mail application,\n" +"Left-click to launch the preferred mail application,\n" "Middle-click to refresh all the mailboxes." msgstr "" "Este applet é muito útil para avisá-lo quando você receber novos e-mails.\n" @@ -2903,7 +2903,7 @@ msgstr "" msgid "" "This applet shows you the bit rate of your internet connection and some " "stats about it.\n" -"Left-click on the icon to have the total amount of data transfered\n" +"Left-click on the icon to have the total amount of data transferred\n" "Middle-click to (de)activate the network (needs NetworManager)" msgstr "" "Este applet mostra a velocidade da sua conexão com a internet e algumas " diff --git a/po/pt_BR.po b/po/pt_BR.po index c8fdfe507..475b3d6b8 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1516,7 +1516,7 @@ msgid "" "This applet shows you the CPU load, RAM usage, graphic card temperature, " "etc.\n" "Middle click on the icon to get some valuable info.\n" -"Left click on the icon to get a list of the most ressources using programs.\n" +"Left click on the icon to get a list of the most resources using programs.\n" "You can instanciate this applet several times to show different values each " "time." msgstr "" @@ -2798,7 +2798,7 @@ msgstr "e-mail" msgid "" "This applet is very useful to warn you when you get new e-mails\n" "It can check in any kind of mailbox (yahoo, gmail, etc)\n" -"Left-click to launch the prefered mail application,\n" +"Left-click to launch the preferred mail application,\n" "Middle-click to refresh all the mailboxes." msgstr "" "Este mini-aplicativo é muito útil para avisá-lo quando você receber novos e-" @@ -3003,7 +3003,7 @@ msgstr "Velocidade da internet" msgid "" "This applet shows you the bit rate of your internet connection and some " "stats about it.\n" -"Left-click on the icon to have the total amount of data transfered\n" +"Left-click on the icon to have the total amount of data transferred\n" "Middle-click to (de)activate the network (needs NetworManager)" msgstr "" "Este mini-aplicativo mostra a velocidade da sua conexão com a internet e " diff --git a/po/ru.po b/po/ru.po index 0211df96a..a4736fa19 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1515,7 +1515,7 @@ msgid "" "This applet shows you the CPU load, RAM usage, graphic card temperature, " "etc.\n" "Middle click on the icon to get some valuable info.\n" -"Left click on the icon to get a list of the most ressources using programs.\n" +"Left click on the icon to get a list of the most resources using programs.\n" "You can instanciate this applet several times to show different values each " "time." msgstr "" @@ -2791,7 +2791,7 @@ msgstr "Почта" msgid "" "This applet is very useful to warn you when you get new e-mails\n" "It can check in any kind of mailbox (yahoo, gmail, etc)\n" -"Left-click to launch the prefered mail application,\n" +"Left-click to launch the preferred mail application,\n" "Middle-click to refresh all the mailboxes." msgstr "" "Этот апплет предупреждает о новых почтовых сообщениях\n" @@ -2995,7 +2995,7 @@ msgstr "netspeed" msgid "" "This applet shows you the bit rate of your internet connection and some " "stats about it.\n" -"Left-click on the icon to have the total amount of data transfered\n" +"Left-click on the icon to have the total amount of data transferred\n" "Middle-click to (de)activate the network (needs NetworManager)" msgstr "" "Этот апплет отображает скорость вашего интернетного соединения и некоторые " diff --git a/po/sk.po b/po/sk.po index 9d6c8e91b..6ae3113a9 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1495,7 +1495,7 @@ msgid "" "This applet shows you the CPU load, RAM usage, graphic card temperature, " "etc.\n" "Middle click on the icon to get some valuable info.\n" -"Left click on the icon to get a list of the most ressources using programs.\n" +"Left click on the icon to get a list of the most resources using programs.\n" "You can instanciate this applet several times to show different values each " "time." msgstr "" @@ -2756,7 +2756,7 @@ msgstr "pošta" msgid "" "This applet is very useful to warn you when you get new e-mails\n" "It can check in any kind of mailbox (yahoo, gmail, etc)\n" -"Left-click to launch the prefered mail application,\n" +"Left-click to launch the preferred mail application,\n" "Middle-click to refresh all the mailboxes." msgstr "" "Tento applet je veľmi užitočný pre upozornenie, ak dostanete nové e-maily\n" @@ -2960,7 +2960,7 @@ msgstr "rýchlosť pripojenia" msgid "" "This applet shows you the bit rate of your internet connection and some " "stats about it.\n" -"Left-click on the icon to have the total amount of data transfered\n" +"Left-click on the icon to have the total amount of data transferred\n" "Middle-click to (de)activate the network (needs NetworManager)" msgstr "" "Tento applet zobrazuje prenosovú rýchlosť vášho pripojenia k internetu a " diff --git a/po/sr.po b/po/sr.po index 90b7facbc..f6d862ba8 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1568,7 +1568,7 @@ msgid "" "This applet shows you the CPU load, RAM usage, graphic card temperature, " "etc.\n" "Middle click on the icon to get some valuable info.\n" -"Left click on the icon to get a list of the most ressources using programs.\n" +"Left click on the icon to get a list of the most resources using programs.\n" "You can instanciate this applet several times to show different values each " "time." msgstr "" @@ -2870,7 +2870,7 @@ msgstr "пошта" msgid "" "This applet is very useful to warn you when you get new e-mails\n" "It can check in any kind of mailbox (yahoo, gmail, etc)\n" -"Left-click to launch the prefered mail application,\n" +"Left-click to launch the preferred mail application,\n" "Middle-click to refresh all the mailboxes." msgstr "" "Ово програмче је врло корисно јер вас обавештава кад одбијете нове поруке\n" @@ -3094,7 +3094,7 @@ msgstr "брзина протока мреже" msgid "" "This applet shows you the bit rate of your internet connection and some " "stats about it.\n" -"Left-click on the icon to have the total amount of data transfered\n" +"Left-click on the icon to have the total amount of data transferred\n" "Middle-click to (de)activate the network (needs NetworManager)" msgstr "" "Ово програмче вам приказује проток података мрежне везе и неке податке " diff --git a/po/sr@latin.po b/po/sr@latin.po index d7cacec9e..49b3c0b96 100644 --- a/po/sr@latin.po +++ b/po/sr@latin.po @@ -1412,7 +1412,7 @@ msgid "" "This applet shows you the CPU load, RAM usage, graphic card temperature, " "etc.\n" "Middle click on the icon to get some valuable info.\n" -"Left click on the icon to get a list of the most ressources using programs.\n" +"Left click on the icon to get a list of the most resources using programs.\n" "You can instanciate this applet several times to show different values each " "time." msgstr "" @@ -2612,7 +2612,7 @@ msgstr "pošta" msgid "" "This applet is very useful to warn you when you get new e-mails\n" "It can check in any kind of mailbox (yahoo, gmail, etc)\n" -"Left-click to launch the prefered mail application,\n" +"Left-click to launch the preferred mail application,\n" "Middle-click to refresh all the mailboxes." msgstr "" @@ -2804,7 +2804,7 @@ msgstr "" msgid "" "This applet shows you the bit rate of your internet connection and some " "stats about it.\n" -"Left-click on the icon to have the total amount of data transfered\n" +"Left-click on the icon to have the total amount of data transferred\n" "Middle-click to (de)activate the network (needs NetworManager)" msgstr "" diff --git a/po/sv.po b/po/sv.po index 057357c9a..fc160f444 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1579,7 +1579,7 @@ msgid "" "This applet shows you the CPU load, RAM usage, graphic card temperature, " "etc.\n" "Middle click on the icon to get some valuable info.\n" -"Left click on the icon to get a list of the most ressources using programs.\n" +"Left click on the icon to get a list of the most resources using programs.\n" "You can instanciate this applet several times to show different values each " "time." msgstr "" @@ -2884,7 +2884,7 @@ msgstr "e-post" msgid "" "This applet is very useful to warn you when you get new e-mails\n" "It can check in any kind of mailbox (yahoo, gmail, etc)\n" -"Left-click to launch the prefered mail application,\n" +"Left-click to launch the preferred mail application,\n" "Middle-click to refresh all the mailboxes." msgstr "" "Denna applet är mycket användbar för att varna dig när du får ny e-post\n" @@ -3099,7 +3099,7 @@ msgstr "näthastighet" msgid "" "This applet shows you the bit rate of your internet connection and some " "stats about it.\n" -"Left-click on the icon to have the total amount of data transfered\n" +"Left-click on the icon to have the total amount of data transferred\n" "Middle-click to (de)activate the network (needs NetworManager)" msgstr "" "Denna applet visar dig bithastigheten på din Internetanslutning och en del " diff --git a/po/tr.po b/po/tr.po index 23ef16d36..69cd5eddb 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1437,7 +1437,7 @@ msgid "" "This applet shows you the CPU load, RAM usage, graphic card temperature, " "etc.\n" "Middle click on the icon to get some valuable info.\n" -"Left click on the icon to get a list of the most ressources using programs.\n" +"Left click on the icon to get a list of the most resources using programs.\n" "You can instanciate this applet several times to show different values each " "time." msgstr "" @@ -2652,7 +2652,7 @@ msgstr "e-posta" msgid "" "This applet is very useful to warn you when you get new e-mails\n" "It can check in any kind of mailbox (yahoo, gmail, etc)\n" -"Left-click to launch the prefered mail application,\n" +"Left-click to launch the preferred mail application,\n" "Middle-click to refresh all the mailboxes." msgstr "" @@ -2844,7 +2844,7 @@ msgstr "" msgid "" "This applet shows you the bit rate of your internet connection and some " "stats about it.\n" -"Left-click on the icon to have the total amount of data transfered\n" +"Left-click on the icon to have the total amount of data transferred\n" "Middle-click to (de)activate the network (needs NetworManager)" msgstr "" diff --git a/po/uk.po b/po/uk.po index 5dc7d4715..95f896e51 100644 --- a/po/uk.po +++ b/po/uk.po @@ -1577,7 +1577,7 @@ msgid "" "This applet shows you the CPU load, RAM usage, graphic card temperature, " "etc.\n" "Middle click on the icon to get some valuable info.\n" -"Left click on the icon to get a list of the most ressources using programs.\n" +"Left click on the icon to get a list of the most resources using programs.\n" "You can instanciate this applet several times to show different values each " "time." msgstr "" @@ -2880,7 +2880,7 @@ msgstr "Пошта" msgid "" "This applet is very useful to warn you when you get new e-mails\n" "It can check in any kind of mailbox (yahoo, gmail, etc)\n" -"Left-click to launch the prefered mail application,\n" +"Left-click to launch the preferred mail application,\n" "Middle-click to refresh all the mailboxes." msgstr "" "Цей додаток попереджає про нові поштові надходження.\n" @@ -3094,7 +3094,7 @@ msgstr "Мережа" msgid "" "This applet shows you the bit rate of your internet connection and some " "stats about it.\n" -"Left-click on the icon to have the total amount of data transfered\n" +"Left-click on the icon to have the total amount of data transferred\n" "Middle-click to (de)activate the network (needs NetworManager)" msgstr "" "Цей додаток відображає швидкість вашого Інтернет-з'єднання та деяку " diff --git a/po/uz.po b/po/uz.po index d341d88dd..114849bff 100644 --- a/po/uz.po +++ b/po/uz.po @@ -1436,7 +1436,7 @@ msgid "" "This applet shows you the CPU load, RAM usage, graphic card temperature, " "etc.\n" "Middle click on the icon to get some valuable info.\n" -"Left click on the icon to get a list of the most ressources using programs.\n" +"Left click on the icon to get a list of the most resources using programs.\n" "You can instanciate this applet several times to show different values each " "time." msgstr "" @@ -2633,7 +2633,7 @@ msgstr "почта" msgid "" "This applet is very useful to warn you when you get new e-mails\n" "It can check in any kind of mailbox (yahoo, gmail, etc)\n" -"Left-click to launch the prefered mail application,\n" +"Left-click to launch the preferred mail application,\n" "Middle-click to refresh all the mailboxes." msgstr "" @@ -2825,7 +2825,7 @@ msgstr "" msgid "" "This applet shows you the bit rate of your internet connection and some " "stats about it.\n" -"Left-click on the icon to have the total amount of data transfered\n" +"Left-click on the icon to have the total amount of data transferred\n" "Middle-click to (de)activate the network (needs NetworManager)" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 42b5c21c4..1fd6d7cc8 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1472,7 +1472,7 @@ msgid "" "This applet shows you the CPU load, RAM usage, graphic card temperature, " "etc.\n" "Middle click on the icon to get some valuable info.\n" -"Left click on the icon to get a list of the most ressources using programs.\n" +"Left click on the icon to get a list of the most resources using programs.\n" "You can instanciate this applet several times to show different values each " "time." msgstr "" @@ -2674,7 +2674,7 @@ msgstr "" msgid "" "This applet is very useful to warn you when you get new e-mails\n" "It can check in any kind of mailbox (yahoo, gmail, etc)\n" -"Left-click to launch the prefered mail application,\n" +"Left-click to launch the preferred mail application,\n" "Middle-click to refresh all the mailboxes." msgstr "" @@ -2868,7 +2868,7 @@ msgstr "" msgid "" "This applet shows you the bit rate of your internet connection and some " "stats about it.\n" -"Left-click on the icon to have the total amount of data transfered\n" +"Left-click on the icon to have the total amount of data transferred\n" "Middle-click to (de)activate the network (needs NetworManager)" msgstr "" diff --git a/po/zh_TW.po b/po/zh_TW.po index 37cf90171..339e029dd 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -1472,7 +1472,7 @@ msgid "" "This applet shows you the CPU load, RAM usage, graphic card temperature, " "etc.\n" "Middle click on the icon to get some valuable info.\n" -"Left click on the icon to get a list of the most ressources using programs.\n" +"Left click on the icon to get a list of the most resources using programs.\n" "You can instanciate this applet several times to show different values each " "time." msgstr "" @@ -2715,7 +2715,7 @@ msgstr "電子信件" msgid "" "This applet is very useful to warn you when you get new e-mails\n" "It can check in any kind of mailbox (yahoo, gmail, etc)\n" -"Left-click to launch the prefered mail application,\n" +"Left-click to launch the preferred mail application,\n" "Middle-click to refresh all the mailboxes." msgstr "" "這個面板程式非常有用，當您收到新的電子信件時會通知您，\n" @@ -2916,7 +2916,7 @@ msgstr "網路速度" msgid "" "This applet shows you the bit rate of your internet connection and some " "stats about it.\n" -"Left-click on the icon to have the total amount of data transfered\n" +"Left-click on the icon to have the total amount of data transferred\n" "Middle-click to (de)activate the network (needs NetworManager)" msgstr "" "這個面板程式顯示您網際網路連接的位元速率，還有關於它的一些統計資料。\n" From 965e01073943aa4adb84e0fdd86cf57a5a9ae935 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Fri, 5 Jul 2013 12:15:26 +0900 Subject: [PATCH 08/24] Fix MATCH as FreeBSD When only MATCH is used, FreeBSD matches kFreeBSD. We need ^ in front of "FreeBSD". Signed-off-by: Nobuhiro Iwamatsu --- Dbus/src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dbus/src/CMakeLists.txt b/Dbus/src/CMakeLists.txt index 10d523231..4909067a2 100644 --- a/Dbus/src/CMakeLists.txt +++ b/Dbus/src/CMakeLists.txt @@ -29,7 +29,7 @@ add_definitions (-DMY_APPLET_DOCK_VERSION="${dock_version}") add_definitions (-DMY_APPLET_ICON_FILE="icon.svg") add_definitions (-DCD_PLUGINS_DIR="${pluginsdir}") -IF (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") +IF (${CMAKE_SYSTEM_NAME} MATCHES ^"FreeBSD") set(kvm "kvm") endif() From 82c31471bc20a4c1708a2e3a731a3e98d2dc3fb7 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sat, 2 Jan 2021 21:48:45 +0900 Subject: [PATCH 09/24] Change ruby dir to vendor Signed-off-by: Nobuhiro Iwamatsu --- CMakeLists.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 047a79688..b1cb2a04a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -545,7 +545,7 @@ if (enable-ruby-interface) message (STATUS " * Ruby:") # find_package(Ruby) found libs of ruby-dev but we only need a directory where we can install ruby libs. find_program (RUBY_EXECUTABLE ruby) - EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubylibdir']" + EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['vendordir']" OUTPUT_VARIABLE RUBY_LIB_DIR) message (STATUS " Ruby library dir: ${RUBY_LIB_DIR}") if ("${RUBY_LIB_DIR}" STREQUAL "" OR "${RUBY_LIB_DIR}" STREQUAL "nil") @@ -554,10 +554,6 @@ if (enable-ruby-interface) set (PROGRAMS_MISSING "${PROGRAMS_MISSING} ruby") set (with_ruby no) else() - # /usr/lib/ruby/1.8 or /usr/lib/ruby/1.9.1 - string (REGEX REPLACE "lib/ruby/[0-9].[0-9]?.+" "" RUBY_LIB_DIR_INSTALL "${RUBY_LIB_DIR}") - string (REGEX REPLACE "${RUBY_LIB_DIR_INSTALL}" "" RUBY_LIB_DIR_INSTALL "${RUBY_LIB_DIR}") - set (RUBY_LIB_DIR "${CMAKE_INSTALL_PREFIX}/${RUBY_LIB_DIR_INSTALL}") message (STATUS " will be installed in: ${RUBY_LIB_DIR}") set (RUBY_FOUND "TRUE") set (with_ruby yes) From a31bdd8d0a1b1139c89c26f2d0df5e09517b67eb Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sat, 2 Jan 2021 21:52:57 +0900 Subject: [PATCH 10/24] Use correct C# compiler Signed-off-by: Nobuhiro Iwamatsu --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b1cb2a04a..288be50df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -565,9 +565,9 @@ enable_if_not_defined (enable-mono-interface) if (enable-mono-interface) message (STATUS " * Mono:") #find_package (Mono) - find_program (GMCS_EXECUTABLE gmcs) + find_program (GMCS_EXECUTABLE mcs) if (NOT GMCS_EXECUTABLE OR NOT EXISTS ${GMCS_EXECUTABLE}) - message (STATUS "Could not find Mono compiler gmcs, won't build Mono interface.") + message (STATUS "Could not find Mono compiler mcs, won't build Mono interface.") else() pkg_check_modules (MONO_PACKAGE dbus-sharp-2.0 dbus-sharp-glib-2.0 glib-sharp-2.0) if (NOT MONO_PACKAGE_FOUND) From f0adfd3754d279d9dfea51186852e31bdb18627c Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sat, 2 Jan 2021 21:58:06 +0900 Subject: [PATCH 11/24] Fix support libetpan pkgconfig Signed-off-by: Nobuhiro Iwamatsu --- CMakeLists.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 288be50df..9da346d1c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -974,9 +974,8 @@ set (with_mail no) # find the compilation flags enable_if_not_defined (enable-mail) if (enable-mail) - find_program (LIBETPAN_CONFIG_EXECUTABLE libetpan-config) execute_process( - COMMAND ${LIBETPAN_CONFIG_EXECUTABLE} --cflags + COMMAND pkg-config libetpan --cflags OUTPUT_VARIABLE MAIL_PACKAGE_CFLAGS) if (NOT "${MAIL_PACKAGE_CFLAGS}" STREQUAL "" AND NOT "${MAIL_PACKAGE_CFLAGS}" STREQUAL "\n") # if there is a problem with the previous, we don't want to have a lot of errors STRING (REGEX REPLACE "\n" "" TMP_VARIABLE "${MAIL_PACKAGE_CFLAGS}") # to not skip the last option @@ -989,7 +988,7 @@ if (enable-mail) endif() # find the link flags execute_process( - COMMAND ${LIBETPAN_CONFIG_EXECUTABLE} --libs + COMMAND pkg-config libetpan --libs OUTPUT_VARIABLE MAIL_PACKAGE_LIBS) if (NOT "${MAIL_PACKAGE_LIBS}" STREQUAL "") STRING (REGEX REPLACE "\n" "" MAIL_PACKAGE_LIBS "${MAIL_PACKAGE_LIBS}") From 48901e5e53a8b02021a3cf3e80528102e9610eff Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sun, 3 Jan 2021 01:07:32 +0900 Subject: [PATCH 12/24] Swith use libido3-0.1 to libayatana-ido3-0.4 Signed-off-by: Nobuhiro Iwamatsu --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9da346d1c..f4b9adf58 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -210,7 +210,7 @@ endif() ## libido enable_if_not_defined (enable-libido-support) if (enable-libido-support) - set (IDO_MODULE libido3-0.1) + set (IDO_MODULE libayatana-ido3-0.4) pkg_check_modules (IDO ${IDO_MODULE}) if (IDO_FOUND) STRING (REGEX REPLACE "\\..*" "" IDO_MAJOR "${IDO_VERSION}") From cf7329192adb92f2372c0fae72edc863a065c462 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sun, 3 Jan 2021 01:22:12 +0900 Subject: [PATCH 13/24] Change pkg-config from indicator3-0.4 to ayatana-indicator3-0.4 Signed-off-by: Nobuhiro Iwamatsu --- CMakeLists.txt | 6 +++--- Indicator-applet/indicator-applet.h | 4 ++-- Indicator-applet3/indicator-applet3-utils.h | 2 +- Indicator-applet3/indicator-applet3.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f4b9adf58..31358fb84 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -197,7 +197,7 @@ endif() ## Indicator enable_if_not_defined (enable-indicator-support) if (enable-indicator-support) - set (INDICATOR_APPLET_MODULE indicator3-0.4) + set (INDICATOR_APPLET_MODULE ayatana-indicator3-0.4) pkg_check_modules (INDICATOR_APPLET ${INDICATOR_APPLET_MODULE}) if (INDICATOR_APPLET_FOUND) set (INDICATOR_NEW_VERSION TRUE) # oneiric and newer @@ -264,10 +264,10 @@ if (INDICATOR_APPLET_FOUND) if (INDICATOR_NEW_VERSION) # oneiric and newer execute_process( - COMMAND pkg-config --variable=iconsdir indicator3-0.4 + COMMAND pkg-config --variable=iconsdir ayatana-indicator3-0.4 OUTPUT_VARIABLE INDICATORICONSDIR) execute_process( - COMMAND pkg-config --variable=indicatordir indicator3-0.4 + COMMAND pkg-config --variable=indicatordir ayatana-indicator3-0.4 OUTPUT_VARIABLE INDICATORDIR) STRING (REGEX REPLACE "\n" "" INDICATORDIR ${INDICATORDIR}) set (with_indicator3 yes) diff --git a/Indicator-applet/indicator-applet.h b/Indicator-applet/indicator-applet.h index 52a3d4ec6..deebaec0c 100755 --- a/Indicator-applet/indicator-applet.h +++ b/Indicator-applet/indicator-applet.h @@ -23,9 +23,9 @@ #include -#include +#include ///#include -#include +#include #include #include diff --git a/Indicator-applet3/indicator-applet3-utils.h b/Indicator-applet3/indicator-applet3-utils.h index 81bc89bcb..07e803a5e 100644 --- a/Indicator-applet3/indicator-applet3-utils.h +++ b/Indicator-applet3/indicator-applet3-utils.h @@ -22,7 +22,7 @@ #include #include -#include +#include /** * Use the image of a GtkImage to draw a Cairo-Dock Icon diff --git a/Indicator-applet3/indicator-applet3.h b/Indicator-applet3/indicator-applet3.h index 315737016..af29b75ed 100644 --- a/Indicator-applet3/indicator-applet3.h +++ b/Indicator-applet3/indicator-applet3.h @@ -22,7 +22,7 @@ #include #include -#include +#include #define INDICATOR_SERVICE_DIR "/usr/share/unity/indicators" From 4be6ba7b6c58d09936ecfdd3d8f4861ce775a6e7 Mon Sep 17 00:00:00 2001 From: Daniel Kondor Date: Sun, 10 Mar 2024 12:33:43 +0100 Subject: [PATCH 14/24] build: remove MeMenu (use Messaging-Menu instead) --- CMakeLists.txt | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 31358fb84..85fbb79ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -289,7 +289,7 @@ if (INDICATOR_APPLET_FOUND) endif() if (NOT DBUSMENU_FOUND OR NOT DBUSMENU_GTK_FOUND OR NOT INDICATOR_APPLET_FOUND) - message (WARNING "These modules are required to compile Indicators applet (MeMenu, Messaging-Menu, Sound-Control, Status-Notifier and Global-Menu): ${INDICATOR_APPLET_MODULE}(-0.4), ${IDO_MODULE}, ${DBUSMENU_MODULE}(-0.4), ${DBUSMENU_GTK_MODULE}(-0.4)") + message (WARNING "These modules are required to compile Indicators applet (Messaging-Menu, Sound-Control, Status-Notifier and Global-Menu): ${INDICATOR_APPLET_MODULE}(-0.4), ${IDO_MODULE}, ${DBUSMENU_MODULE}(-0.4), ${DBUSMENU_GTK_MODULE}(-0.4)") set (MODULES_MISSING "${MODULES_MISSING} ${INDICATOR_APPLET_MODULE}(-0.4) (${IDO_MODULE}) ${DBUSMENU_MODULE}(-0.4) ${DBUSMENU_GTK_MODULE}(-0.4)") endif() @@ -1025,21 +1025,6 @@ if (enable-mail) endif() endif() -############# MEMENU ################# -set (with_me_menu no) -if (INDICATOR_NEW_VERSION AND NOT enable-memenu) - message (STATUS "> MeMenu: this applet has been automatically merged with Messaging-Menu") # oneiric or newer -elseif (with_indicator AND IDO_FOUND) - message (STATUS "> MeMenu:") - set (GETTEXT_MEMENU ${GETTEXT_PLUGINS}) - set (VERSION_MEMENU "1.0.6") - set (PACKAGE_MEMENU "cd-MeMenu") - set (memenudatadir "${pluginsdatadir}/MeMenu") - set (with_me_menu yes) - configure_file (${CMAKE_CURRENT_SOURCE_DIR}/MeMenu/data/MeMenu.conf.in ${CMAKE_CURRENT_BINARY_DIR}/MeMenu/data/MeMenu.conf) - add_subdirectory (MeMenu) -endif() - ############# MESSAGING_MENU ################# set (with_messaging_menu no) if (with_indicator) @@ -1503,9 +1488,6 @@ message (STATUS " - with Impulse applet: ${with_impulse}") message (STATUS " - with Indicator-Generic applet: ${with_indicator_generic}") message (STATUS " - with Keyboard-indicator applet: ${with_keyboard_indicator}") message (STATUS " - with Mail applet: ${with_mail}") -if (NOT INDICATOR_NEW_VERSION OR enable-memenu) # oneiric or newer -message (STATUS " - with Me-Menu applet applet: ${with_me_menu}") -endif() message (STATUS " - with Messaging-Menu applet: ${with_messaging_menu}") message (STATUS " - with Recent-Events applet: ${with_recent_events}") message (STATUS " - with Sound Effects applet: ${with_sound_effects}") From 1662e08ef3a01896e3d87a62ea4ba8494384e99b Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Mon, 25 Mar 2024 10:16:04 +0000 Subject: [PATCH 15/24] Use setuptools instead of distutils distutils is no more as of Python 3.12; setuptools is the simplest migration option [1] although it does add a dependency to the project [1]: https://peps.python.org/pep-0632/#migration-advice --- Dbus/interfaces/bash/setup.py | 2 +- Dbus/interfaces/python/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dbus/interfaces/bash/setup.py b/Dbus/interfaces/bash/setup.py index 80aa9d418..756bf3474 100644 --- a/Dbus/interfaces/bash/setup.py +++ b/Dbus/interfaces/bash/setup.py @@ -13,7 +13,7 @@ # GNU General Public License for more details. # http://www.gnu.org/licenses/licenses.html#GPL -from distutils.core import setup +from setuptools import setup setup(name='CDBashApplet', version='1.0', license='GPL-3', diff --git a/Dbus/interfaces/python/setup.py b/Dbus/interfaces/python/setup.py index af33b73bd..04525688f 100644 --- a/Dbus/interfaces/python/setup.py +++ b/Dbus/interfaces/python/setup.py @@ -13,7 +13,7 @@ # GNU General Public License for more details. # http://www.gnu.org/licenses/licenses.html#GPL -from distutils.core import setup +from setuptools import setup setup(name='CDApplet', version='1.0', license='GPL-3', From c44c4c26b184ae2b961ba8970c6dcc813ebef823 Mon Sep 17 00:00:00 2001 From: Daniel Kondor Date: Sun, 10 Mar 2024 13:10:12 +0100 Subject: [PATCH 16/24] Indicators: adapt plug-ins to the switch to ayatana-indicator and ayatana-ido This concenrs the build files, Indicator-applet3 and the Indicator-generic, Status-Notifier, alsaMixer and Messaging-Menu plugins. This removes support for older indicator versions and switches back to using the ayatana DBus names everywhere. --- CMakeLists.txt | 68 ++++----------------- Indicator-Generic/src/CMakeLists.txt | 4 -- Indicator-Generic/src/applet-config.c | 16 ++--- Indicator-Generic/src/applet-launcher.c | 8 --- Indicator-applet3/CMakeLists.txt | 9 +-- Indicator-applet3/indicator-applet3.c | 12 +--- Indicator-applet3/indicator-applet3.h | 2 +- Messaging-Menu/src/CMakeLists.txt | 4 -- Messaging-Menu/src/applet-config.c | 6 +- Messaging-Menu/src/applet-menu.c | 36 ----------- Messaging-Menu/src/applet-struct.h | 4 -- Messaging-Menu/src/dbus-data-old.h | 23 ------- Messaging-Menu/src/dbus-data.h | 8 +-- Status-Notifier/src/CMakeLists.txt | 1 - Status-Notifier/src/applet-host-ias.c | 79 +------------------------ alsaMixer/src/CMakeLists.txt | 3 - alsaMixer/src/applet-config.c | 6 +- 17 files changed, 30 insertions(+), 259 deletions(-) delete mode 100644 Messaging-Menu/src/dbus-data-old.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 85fbb79ab..391682783 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -199,12 +199,6 @@ enable_if_not_defined (enable-indicator-support) if (enable-indicator-support) set (INDICATOR_APPLET_MODULE ayatana-indicator3-0.4) pkg_check_modules (INDICATOR_APPLET ${INDICATOR_APPLET_MODULE}) - if (INDICATOR_APPLET_FOUND) - set (INDICATOR_NEW_VERSION TRUE) # oneiric and newer - else() - set (INDICATOR_APPLET_MODULE indicator3) - pkg_check_modules (INDICATOR_APPLET ${INDICATOR_APPLET_MODULE}) - endif() endif() ## libido @@ -212,15 +206,6 @@ enable_if_not_defined (enable-libido-support) if (enable-libido-support) set (IDO_MODULE libayatana-ido3-0.4) pkg_check_modules (IDO ${IDO_MODULE}) - if (IDO_FOUND) - STRING (REGEX REPLACE "\\..*" "" IDO_MAJOR "${IDO_VERSION}") - STRING (REGEX REPLACE "[0-9]*\\.([^ ]+)" "\\1" IDO_MINOR "${IDO_VERSION}") # 0.1.7 => 1.7 - STRING (REGEX REPLACE "\\.[0-9]*" "" IDO_MINOR "${IDO_MINOR}") - if (${IDO_MAJOR} GREATER 13 - OR ${IDO_MAJOR} EQUAL 13 AND ${IDO_MINOR} GREATER 9) - set (INDICATOR_NG 1) - endif() - endif() endif() ## Extract versions of DBusMenu @@ -262,21 +247,16 @@ if (INDICATOR_APPLET_FOUND) set (INDICATOR_MESSAGES_HAS_LOZENGE 0) endif() - if (INDICATOR_NEW_VERSION) # oneiric and newer - execute_process( - COMMAND pkg-config --variable=iconsdir ayatana-indicator3-0.4 - OUTPUT_VARIABLE INDICATORICONSDIR) - execute_process( - COMMAND pkg-config --variable=indicatordir ayatana-indicator3-0.4 - OUTPUT_VARIABLE INDICATORDIR) - STRING (REGEX REPLACE "\n" "" INDICATORDIR ${INDICATORDIR}) - set (with_indicator3 yes) - message (STATUS " Indicators: with Indicator3 support") - else() - execute_process( - COMMAND pkg-config --variable=iconsdir indicator3 - OUTPUT_VARIABLE INDICATORICONSDIR) - endif() + execute_process( + COMMAND pkg-config --variable=iconsdir ayatana-indicator3-0.4 + OUTPUT_VARIABLE INDICATORICONSDIR) + execute_process( + COMMAND pkg-config --variable=indicatordir ayatana-indicator3-0.4 + OUTPUT_VARIABLE INDICATORDIR) + STRING (REGEX REPLACE "\n" "" INDICATORDIR ${INDICATORDIR}) + set (with_indicator3 yes) + message (STATUS " Indicators: with Indicator3 support") + STRING (REGEX REPLACE "\n" "" INDICATORICONSDIR "${INDICATORICONSDIR}") # la commande rajoute un retour chariot ... if (with_indicator3) add_subdirectory (Indicator-applet3) @@ -293,26 +273,6 @@ if (NOT DBUSMENU_FOUND OR NOT DBUSMENU_GTK_FOUND OR NOT INDICATOR_APPLET_FOUND) set (MODULES_MISSING "${MODULES_MISSING} ${INDICATOR_APPLET_MODULE}(-0.4) (${IDO_MODULE}) ${DBUSMENU_MODULE}(-0.4) ${DBUSMENU_GTK_MODULE}(-0.4)") endif() -############# INDICATOR-NAME ################# -message (STATUS "> Indicator Names:") -set (INDICATOR_OLD_NAMES 0) -if (force_old_indicator_names) - set (INDICATOR_OLD_NAMES 1) - message (STATUS " Indicators: use old Ayatana Dbus names (forced)") -#~ elseif ("${DISTRO_ID}" STREQUAL "Ubuntu") - #~ STRING (REGEX REPLACE "\\..*" "" DISTRO_RELEASE_MAJOR ${DISTRO_RELEASE}) - #~ # message (STATUS "DISTRO_RELEASE_MAJOR: ${DISTRO_RELEASE_MAJOR}") - #~ if (${DISTRO_RELEASE_MAJOR} LESS 11) # from 11.04, new names are used. - #~ set (INDICATOR_OLD_NAMES 1) - #~ message (STATUS " Indicators: use old Ayatana Dbus names") - #~ endif() -elseif (INDICATOR_APPLET_FOUND) - if (NOT (${INDICATOR_MAJOR} GREATER 0 OR ${INDICATOR_MINOR} GREATER 3 OR (${INDICATOR_MINOR} EQUAL 3 AND ${INDICATOR_NANO} GREATER 20))) - set (INDICATOR_OLD_NAMES 1) # maverick or older - message (STATUS " Indicators: use old Ayatana Dbus names") - endif() -endif() - ############# UPOWER ##################### message (STATUS "> UPower:") enable_if_not_defined (enable-upower-support) @@ -417,10 +377,7 @@ if (enable-alsa-mixer) set (alsa_mixerdatadir "${pluginsdatadir}/AlsaMixer") configure_file (${CMAKE_CURRENT_SOURCE_DIR}/alsaMixer/data/AlsaMixer.conf.in ${CMAKE_CURRENT_BINARY_DIR}/alsaMixer/data/AlsaMixer.conf) if (with_indicator3) - set (INDICATOR_SOUNDMENU_WITH_IND3 TRUE) # If it's supported, it's maybe better to use it - set (with_soundmenu yes) - elseif (with_indicator AND IDO_FOUND - AND "${INDICATOR_OLD_NAMES}" STREQUAL "0") + set (INDICATOR_SOUNDMENU_WITH_IND3 TRUE) set (with_soundmenu yes) endif() add_subdirectory ("alsaMixer") @@ -733,7 +690,7 @@ add_subdirectory (Folders) ############# GLOBAL-MENU ################# set (with_global_menu no) # unstable -if (enable-global-menu AND "${INDICATOR_OLD_NAMES}" STREQUAL "0" AND DBUSMENU_FOUND AND DBUSMENU_GTK_FOUND) # currently only supported with new name of the indicator module and with newer version of dbusmenu +if (enable-global-menu AND DBUSMENU_FOUND AND DBUSMENU_GTK_FOUND) # currently only supported with new name of the indicator module and with newer version of dbusmenu message (STATUS "> Global-Menu:") set (GETTEXT_GLOBAL_MENU ${GETTEXT_PLUGINS}) set (VERSION_GLOBAL_MENU "0.1.3") @@ -1272,7 +1229,6 @@ else() elseif (DEFINED force_indicator_applicationadded_have_hint) set (INDICATOR_APPLICATIONADDED_HAS_HINT 0) endif() - message (STATUS " Used old DBus name = ${INDICATOR_OLD_NAMES}") message (STATUS " ApplicationAdded signal has 'Hint' = ${INDICATOR_APPLICATIONADDED_HAS_HINT}") message (STATUS " ApplicationAdded signal has 'Title' = ${INDICATOR_APPLICATIONADDED_HAS_TITLE}") set (GETTEXT_STATUS_NOTIFIER ${GETTEXT_PLUGINS}) diff --git a/Indicator-Generic/src/CMakeLists.txt b/Indicator-Generic/src/CMakeLists.txt index deb8b6903..b0386218a 100644 --- a/Indicator-Generic/src/CMakeLists.txt +++ b/Indicator-Generic/src/CMakeLists.txt @@ -26,10 +26,6 @@ add_definitions (-DCD_APPLET_MULTI_INSTANCE="1") ### uncomment the following line to allow extended OpenGL drawing. #add_definitions (-DGL_GLEXT_PROTOTYPES="1") -if (INDICATOR_NG) - add_definitions (-DIS_INDICATOR_NG=1) -endif() - include_directories ( ${PACKAGE_INCLUDE_DIRS} ${INDICATOR_APPLET_INCLUDE_DIRS} diff --git a/Indicator-Generic/src/applet-config.c b/Indicator-Generic/src/applet-config.c index ec3df7586..43ac49c30 100755 --- a/Indicator-Generic/src/applet-config.c +++ b/Indicator-Generic/src/applet-config.c @@ -23,17 +23,11 @@ #include "applet-struct.h" #include "applet-config.h" -#ifdef IS_INDICATOR_NG -#define IND_GEN_EXCEPTIONS_HARD "libapplication.so;libappmenu.so;" \ - "libdatetime.so;libmessaging.so;libsoundmenu.so;libpower.so;libsession.so;" \ - "com.canonical.indicator.sound;com.canonical.indicator.messages;" \ - "com.canonical.indicator.datetime;com.canonical.indicator.power;" \ - "com.canonical.indicator.session;com.canonical.indicator.application;" \ - "com.canonical.indicator.appmenu" -#else -#define IND_GEN_EXCEPTIONS_HARD "libapplication.so;libappmenu.so;" \ - "libdatetime.so;libmessaging.so;libsoundmenu.so;libpower.so;libsession.so" -#endif +#define IND_GEN_EXCEPTIONS_HARD "libayatana-application.so;" \ + "org.ayatana.indicator.sound;org.ayatana.indicator.messages;" \ + "org.ayatana.indicator.datetime;org.ayatana.indicator.power;" \ + "org.ayatana.indicator.session;org.ayatana.indicator.application;" \ + "org.ayatana.indicator.appmenu" //\_________________ Here you have to get all your parameters from the conf file. Use the macros CD_CONFIG_GET_BOOLEAN, CD_CONFIG_GET_INTEGER, CD_CONFIG_GET_STRING, etc. myConfig has been reseted to 0 at this point. This function is called at the beginning of init and reload. CD_APPLET_GET_CONFIG_BEGIN diff --git a/Indicator-Generic/src/applet-launcher.c b/Indicator-Generic/src/applet-launcher.c index 460148b51..eaf0284bc 100644 --- a/Indicator-Generic/src/applet-launcher.c +++ b/Indicator-Generic/src/applet-launcher.c @@ -56,19 +56,15 @@ void cd_indicator_generic_add_monitor_dir (GldiModuleInstance *myApplet) { cairo_dock_fm_add_monitor_full (cd_indicator3_get_directory_path (), TRUE, NULL, (CairoDockFMMonitorCallback) _on_file_event, myApplet); - #ifdef IS_INDICATOR_NG cairo_dock_fm_add_monitor_full (INDICATOR_SERVICE_DIR, TRUE, NULL, (CairoDockFMMonitorCallback) _on_file_event, myApplet); - #endif } void cd_indicator_generic_remove_monitor_dir (void) { cairo_dock_fm_remove_monitor_full (cd_indicator3_get_directory_path (), TRUE, NULL); - #ifdef IS_INDICATOR_NG cairo_dock_fm_remove_monitor_full (INDICATOR_SERVICE_DIR, TRUE, NULL); - #endif } GDir * cd_indicator_generic_open_dir_modules (GldiModuleInstance *myApplet) @@ -85,7 +81,6 @@ GDir * cd_indicator_generic_open_dir_modules (GldiModuleInstance *myApplet) GDir * cd_indicator_generic_open_dir_sevices (GldiModuleInstance *myApplet) { - #ifdef IS_INDICATOR_NG GError *error = NULL; GDir *pDir = g_dir_open (INDICATOR_SERVICE_DIR, 0, &error); // all indicators are on the same dir if (error != NULL) @@ -94,9 +89,6 @@ GDir * cd_indicator_generic_open_dir_sevices (GldiModuleInstance *myApplet) return NULL; } return pDir; - #else - return NULL; - #endif } static gint _load_all_indicators_in_dir (GldiModuleInstance *myApplet, GDir *pDir, gboolean bIsModule) diff --git a/Indicator-applet3/CMakeLists.txt b/Indicator-applet3/CMakeLists.txt index a3853567e..cba56ae64 100644 --- a/Indicator-applet3/CMakeLists.txt +++ b/Indicator-applet3/CMakeLists.txt @@ -11,12 +11,9 @@ add_definitions (-fPIC) add_definitions (-DINDICATOR_DIR="${INDICATORDIR}") add_definitions (-DCD_APPLET_MULTI_INSTANCE="1") -if (INDICATOR_NG) - add_definitions (-DIS_INDICATOR_NG=1) - set (EXTRAS_LIBRARY_DIRS ${IDO_LIBRARY_DIRS}) - set (EXTRAS_INCLUDE_DIRS ${IDO_INCLUDE_DIRS}) - set (EXTRAS_LIBRARIES ${IDO_LIBRARIES}) -endif() +set (EXTRAS_LIBRARY_DIRS ${IDO_LIBRARY_DIRS}) +set (EXTRAS_INCLUDE_DIRS ${IDO_INCLUDE_DIRS}) +set (EXTRAS_LIBRARIES ${IDO_LIBRARIES}) link_directories( ${PACKAGE_LIBRARY_DIRS} diff --git a/Indicator-applet3/indicator-applet3.c b/Indicator-applet3/indicator-applet3.c index e484dae24..8e53cbac8 100644 --- a/Indicator-applet3/indicator-applet3.c +++ b/Indicator-applet3/indicator-applet3.c @@ -26,11 +26,9 @@ #include "indicator-applet3.h" -#ifdef IS_INDICATOR_NG -#include -#include +#include +#include static gboolean bIsIdoInit = FALSE; -#endif static void _init_new_entry_menu (IndicatorObject *pIndicator, IndicatorObjectEntry *pEntry, GldiModuleInstance *myApplet) { @@ -40,13 +38,11 @@ static void _init_new_entry_menu (IndicatorObject *pIndicator, IndicatorObjectEn IndicatorObject * cd_indicator3_load (const gchar *cName, CairoDockIndicator3Func entry_added, CairoDockIndicator3Func entry_removed, CairoDockIndicator3Func accessible_desc_update, CairoDockIndicator3FuncMenu menu_show, GldiModuleInstance *myApplet) { - #ifdef IS_INDICATOR_NG if (! bIsIdoInit) { ido_init(); // need to be init ones... bIsIdoInit = TRUE; } - #endif cd_debug ("Load: %s", cName); g_return_val_if_fail (cName != NULL, NULL); @@ -61,7 +57,6 @@ IndicatorObject * cd_indicator3_load (const gchar *cName, CairoDockIndicator3Fun } else { - #ifdef IS_INDICATOR_NG GError *error = NULL; cFullPath = g_build_filename (INDICATOR_SERVICE_DIR, cName, NULL); pIndicator = INDICATOR_OBJECT (indicator_ng_new_for_profile (cFullPath, "desktop", &error)); @@ -71,9 +66,6 @@ IndicatorObject * cd_indicator3_load (const gchar *cName, CairoDockIndicator3Fun cd_warning ("could not load indicator from '%s': %s", cName, error->message); g_error_free (error); } - #else - pIndicator = NULL; - #endif } if (pIndicator == NULL) diff --git a/Indicator-applet3/indicator-applet3.h b/Indicator-applet3/indicator-applet3.h index af29b75ed..ec440e807 100644 --- a/Indicator-applet3/indicator-applet3.h +++ b/Indicator-applet3/indicator-applet3.h @@ -24,7 +24,7 @@ #include #include -#define INDICATOR_SERVICE_DIR "/usr/share/unity/indicators" +#define INDICATOR_SERVICE_DIR "/usr/share/ayatana/indicators" typedef void (* CairoDockIndicator3Func ) (IndicatorObject *pIndicator, IndicatorObjectEntry *pEntry, GldiModuleInstance *myApplet); typedef void (* CairoDockIndicator3FuncMenu ) (IndicatorObject *pIndicator, IndicatorObjectEntry *pEntry, guint32 timestamp, GldiModuleInstance *myApplet); diff --git a/Messaging-Menu/src/CMakeLists.txt b/Messaging-Menu/src/CMakeLists.txt index 1478c12b2..3abc02224 100644 --- a/Messaging-Menu/src/CMakeLists.txt +++ b/Messaging-Menu/src/CMakeLists.txt @@ -26,7 +26,6 @@ add_definitions (-DMY_APPLET_VERSION="${VERSION_MESSAGING_MENU}") add_definitions (-DMY_APPLET_GETTEXT_DOMAIN="${GETTEXT_MESSAGING_MENU}") add_definitions (-DMY_APPLET_DOCK_VERSION="${dock_version}") add_definitions (-DMY_APPLET_ICON_FILE="icon.svg") -add_definitions (-DINDICATOR_OLD_NAMES=${INDICATOR_OLD_NAMES}) add_definitions (-DINDICATOR_MESSAGES_HAS_LOZENGE=${INDICATOR_MESSAGES_HAS_LOZENGE}) ### uncomment the following line to allow multi-instance applet. #add_definitions (-DCD_APPLET_MULTI_INSTANCE="1") @@ -39,9 +38,6 @@ if (INDICATOR_MESSAGES_WITH_IND3) set (EXTRAS_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/Indicator-applet3) set (EXTRAS_LIBRARY_DIRS ${CMAKE_SOURCE_DIR}/Indicator-applet3) set (EXTRAS_LIBRARIES indicator-applet3) - if (INDICATOR_NG) # now in com.canonical.indicator.messages - add_definitions (-DIS_INDICATOR_NG=1) - endif() else() set (EXTRAS_INCLUDE_DIRS ${DBUSMENU_INCLUDE_DIRS} ${DBUSMENU_GTK_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/Indicator-applet) set (EXTRAS_LIBRARY_DIRS ${DBUSMENU_LIBRARY_DIRS} ${DBUSMENU_GTK_LIBRARY_DIRS} ${CMAKE_SOURCE_DIR}/Indicator-applet) diff --git a/Messaging-Menu/src/applet-config.c b/Messaging-Menu/src/applet-config.c index ae0c576fc..4ba202543 100755 --- a/Messaging-Menu/src/applet-config.c +++ b/Messaging-Menu/src/applet-config.c @@ -32,11 +32,7 @@ CD_APPLET_GET_CONFIG_BEGIN #ifdef INDICATOR_MESSAGES_WITH_IND3 myConfig.cIndicatorName = CD_CONFIG_GET_STRING ("Configuration", "indicator name"); if (myConfig.cIndicatorName == NULL) - #ifdef IS_INDICATOR_NG - myConfig.cIndicatorName = g_strdup ("com.canonical.indicator.messages"); - #else - myConfig.cIndicatorName = g_strdup ("libmessaging.so"); - #endif + myConfig.cIndicatorName = g_strdup ("org.ayatana.indicator.messages"); #endif CD_APPLET_GET_CONFIG_END diff --git a/Messaging-Menu/src/applet-menu.c b/Messaging-Menu/src/applet-menu.c index 0001f08a3..19c9ce6cb 100755 --- a/Messaging-Menu/src/applet-menu.c +++ b/Messaging-Menu/src/applet-menu.c @@ -46,20 +46,12 @@ static GtkSizeGroup * indicator_right_group = NULL; /// TODO: check if it needs /* Sets the icon when it changes. */ static void -#if (INDICATOR_OLD_NAMES == 0) application_icon_change_cb (DbusmenuMenuitem * mi, gchar * prop, GVariant * value, gpointer user_data) -#else -application_icon_change_cb (DbusmenuMenuitem * mi, gchar * prop, GValue * value, gpointer user_data) -#endif { if (!g_strcmp0(prop, APPLICATION_MENUITEM_PROP_ICON)) { /* Set the main icon */ if (GTK_IS_IMAGE(user_data)) { -#if (INDICATOR_OLD_NAMES == 0) gtk_image_set_from_icon_name(GTK_IMAGE(user_data), g_variant_get_string(value, NULL), GTK_ICON_SIZE_MENU); -#else - gtk_image_set_from_icon_name(GTK_IMAGE(user_data), g_value_get_string(value), GTK_ICON_SIZE_MENU); -#endif } } @@ -68,20 +60,12 @@ application_icon_change_cb (DbusmenuMenuitem * mi, gchar * prop, GValue * value, /* Sets the label when it changes. */ static void -#if (INDICATOR_OLD_NAMES == 0) application_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GVariant * value, gpointer user_data) -#else -application_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GValue * value, gpointer user_data) -#endif { if (!g_strcmp0(prop, APPLICATION_MENUITEM_PROP_NAME)) { /* Set the main label */ if (GTK_IS_LABEL(user_data)) { -#if (INDICATOR_OLD_NAMES == 0) gtk_label_set_text(GTK_LABEL(user_data), g_variant_get_string(value, NULL)); -#else - gtk_label_set_text(GTK_LABEL(user_data), g_value_get_string(value)); -#endif } } @@ -228,7 +212,6 @@ new_application_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, Dbu cd_debug ("%s (\"%s\")", __func__, cName); #ifdef FORCE_REMOVE_DOUBLE_ENTRIES -#if (INDICATOR_OLD_NAMES == 0) if (newitem == NULL || !dbusmenu_menuitem_property_get_bool(newitem, DBUSMENU_MENUITEM_PROP_VISIBLE) #if INDICATOR_MESSAGES_HAS_LOZENGE == 1 && sIconName != NULL && *sIconName != '\0' // these menu @@ -240,7 +223,6 @@ new_application_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, Dbu g_free (cName); return TRUE; } -#endif #endif GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_image_menu_item_new()); @@ -302,32 +284,16 @@ struct _indicator_item_t { /* Whenever we have a property change on a DbusmenuMenuitem we need to be responsive to that. */ static void -#if (INDICATOR_OLD_NAMES == 0) indicator_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GVariant * value, indicator_item_t * mi_data) -#else -indicator_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GValue * value, indicator_item_t * mi_data) -#endif { -#if (INDICATOR_OLD_NAMES == 0) cd_debug ("%s (\"%s\": %s)", __func__, prop, g_variant_get_string(value, NULL)); -#else - cd_debug ("%s (\"%s\": %s)", __func__, prop, g_value_get_string(value)); -#endif if (!g_strcmp0(prop, INDICATOR_MENUITEM_PROP_LABEL)) { /* Set the main label */ -#if (INDICATOR_OLD_NAMES == 0) gtk_label_set_text(GTK_LABEL(mi_data->label), g_variant_get_string(value, NULL)); -#else - gtk_label_set_text(GTK_LABEL(mi_data->label), g_value_get_string(value)); -#endif } else if (!g_strcmp0(prop, INDICATOR_MENUITEM_PROP_RIGHT)) { /* Set the right label */ -#if (INDICATOR_OLD_NAMES == 0) gtk_label_set_text(GTK_LABEL(mi_data->right), g_variant_get_string(value, NULL)); -#else - gtk_label_set_text(GTK_LABEL(mi_data->right), g_value_get_string(value)); -#endif #if (INDICATOR_MESSAGES_HAS_LOZENGE == 1) } else if (!g_strcmp0(prop, INDICATOR_MENUITEM_PROP_RIGHT_IS_LOZENGE)) { g_object_set_data (G_OBJECT (mi_data->right), "is-lozenge", GINT_TO_POINTER (TRUE)); @@ -383,13 +349,11 @@ new_indicator_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, Dbusm cd_debug ("%s (\"%s\")", __func__, dbusmenu_menuitem_property_get(newitem, INDICATOR_MENUITEM_PROP_LABEL)); -#if (INDICATOR_OLD_NAMES == 0) if (newitem == NULL || !dbusmenu_menuitem_property_get_bool(newitem, DBUSMENU_MENUITEM_PROP_VISIBLE)) { cd_debug ("Not visible: %s", dbusmenu_menuitem_property_get(newitem, INDICATOR_MENUITEM_PROP_LABEL)); return TRUE; } -#endif indicator_item_t * mi_data = g_new0(indicator_item_t, 1); diff --git a/Messaging-Menu/src/applet-struct.h b/Messaging-Menu/src/applet-struct.h index 48b1d63a2..24b64ea36 100755 --- a/Messaging-Menu/src/applet-struct.h +++ b/Messaging-Menu/src/applet-struct.h @@ -28,11 +28,7 @@ #define FORCE_REMOVE_DOUBLE_SEPARATORS // let's include the Dbus name shere, so that we don't duplicate the logic. // we could put it directly in the .h, but having several .h will be easier to cope with further changes. -#if (INDICATOR_OLD_NAMES == 0) #include "dbus-data.h" -#else -#include "dbus-data-old.h" -#endif #else diff --git a/Messaging-Menu/src/dbus-data-old.h b/Messaging-Menu/src/dbus-data-old.h deleted file mode 100644 index 100ac0a58..000000000 --- a/Messaging-Menu/src/dbus-data-old.h +++ /dev/null @@ -1,23 +0,0 @@ - -#ifndef __DBUS_DATA_H__ -#define __DBUS_DATA_H__ 1 - -#define INDICATOR_MESSAGES_DBUS_NAME "org.ayatana.indicator.messages" -#define INDICATOR_MESSAGES_DBUS_OBJECT "/org/ayatana/indicator/messages/menu" - -#define INDICATOR_MESSAGES_DBUS_SERVICE_OBJECT "/org/ayatana/indicator/messages/service" -#define INDICATOR_MESSAGES_DBUS_SERVICE_INTERFACE "org.ayatana.indicator.messages.service" - -#define APPLICATION_MENUITEM_TYPE "application-item" -#define APPLICATION_MENUITEM_PROP_NAME "label" -#define APPLICATION_MENUITEM_PROP_ICON "icon-name" -#define APPLICATION_MENUITEM_PROP_RUNNING "app-running" - -#define INDICATOR_MENUITEM_TYPE "indicator-item" -#define INDICATOR_MENUITEM_PROP_LABEL "indicator-label" -#define INDICATOR_MENUITEM_PROP_ICON "indicator-icon" -#define INDICATOR_MENUITEM_PROP_RIGHT "right-side-text" - -#define MAX_NUMBER_OF_INDICATORS 7 - -#endif /* __DBUS_DATA_H__ */ diff --git a/Messaging-Menu/src/dbus-data.h b/Messaging-Menu/src/dbus-data.h index 26e2543d8..f87377fbd 100644 --- a/Messaging-Menu/src/dbus-data.h +++ b/Messaging-Menu/src/dbus-data.h @@ -2,11 +2,11 @@ #ifndef __DBUS_DATA_H__ #define __DBUS_DATA_H__ 1 -#define INDICATOR_MESSAGES_DBUS_NAME "com.canonical.indicator.messages" -#define INDICATOR_MESSAGES_DBUS_OBJECT "/com/canonical/indicator/messages/menu" +#define INDICATOR_MESSAGES_DBUS_NAME "org.ayatana.indicator.messages" +#define INDICATOR_MESSAGES_DBUS_OBJECT "/org/ayatana/indicator/messages/menu" -#define INDICATOR_MESSAGES_DBUS_SERVICE_OBJECT "/com/canonical/indicator/messages/service" -#define INDICATOR_MESSAGES_DBUS_SERVICE_INTERFACE "com.canonical.indicator.messages.service" +#define INDICATOR_MESSAGES_DBUS_SERVICE_OBJECT "/org/ayatana/indicator/messages/service" +#define INDICATOR_MESSAGES_DBUS_SERVICE_INTERFACE "org.ayatana.indicator.messages.service" #define APPLICATION_MENUITEM_TYPE "application-item" #define APPLICATION_MENUITEM_PROP_NAME "label" diff --git a/Status-Notifier/src/CMakeLists.txt b/Status-Notifier/src/CMakeLists.txt index 175567acc..997c7e508 100644 --- a/Status-Notifier/src/CMakeLists.txt +++ b/Status-Notifier/src/CMakeLists.txt @@ -24,7 +24,6 @@ add_definitions (-DMY_APPLET_VERSION="${VERSION_STATUS_NOTIFIER}") add_definitions (-DMY_APPLET_GETTEXT_DOMAIN="${GETTEXT_STATUS_NOTIFIER}") add_definitions (-DMY_APPLET_DOCK_VERSION="${dock_version}") add_definitions (-DMY_APPLET_ICON_FILE="icon.png") -add_definitions (-DINDICATOR_OLD_NAMES=${INDICATOR_OLD_NAMES}) add_definitions (-DINDICATOR_APPLICATIONADDED_HAS_HINT=${INDICATOR_APPLICATIONADDED_HAS_HINT}) add_definitions (-DINDICATOR_APPLICATIONADDED_HAS_TITLE=${INDICATOR_APPLICATIONADDED_HAS_TITLE}) add_definitions (-DCD_PLUGINS_DIR="${pluginsdir}") diff --git a/Status-Notifier/src/applet-host-ias.c b/Status-Notifier/src/applet-host-ias.c index 064b3b6e3..a236bef8e 100755 --- a/Status-Notifier/src/applet-host-ias.c +++ b/Status-Notifier/src/applet-host-ias.c @@ -28,16 +28,9 @@ #include "applet-host.h" #include "applet-host-ias.h" -// Ubuntu sort-of-high-level-Watcher (new or old address) -#if (INDICATOR_OLD_NAMES == 0) // Natty -#define CD_INDICATOR_APPLICATION_ADDR "com.canonical.indicator.application" -#define CD_INDICATOR_APPLICATION_OBJ "/com/canonical/indicator/application/service" -#define CD_INDICATOR_APPLICATION_IFACE "com.canonical.indicator.application.service" -#else #define CD_INDICATOR_APPLICATION_ADDR "org.ayatana.indicator.application" #define CD_INDICATOR_APPLICATION_OBJ "/org/ayatana/indicator/application/service" #define CD_INDICATOR_APPLICATION_IFACE "org.ayatana.indicator.application.service" -#endif // Ubuntu Indicator Service #define CD_INDICATOR_SERVICE_INTERFACE "org.ayatana.indicator.service" @@ -46,53 +39,6 @@ static DBusGProxyCall *s_pDetectIASCall = NULL; -#if (INDICATOR_OLD_NAMES != 0) // Maverick -static void _cd_cclosure_marshal_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) -{ - //cd_debug ("=== %s ()", __func__); - typedef void (*GMarshalFunc_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING) ( - gpointer data1, - gchar *arg_1, - gint arg_2, - gchar *arg_3, - gchar *arg_4, - gchar *arg_5, - gchar *arg_6, - gchar *arg_7, - gpointer data2); - register GMarshalFunc_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; - g_return_if_fail (n_param_values == 8); // return_value est NULL ici, car la callback ne renvoit rien. - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING) (marshal_data ? marshal_data : cc->callback); - - callback (data1, - (char*) g_value_get_string (param_values + 1), - g_value_get_int (param_values + 2), - (char*) g_value_get_string (param_values + 3), - (char*) g_value_get_string (param_values + 4), - (char*) g_value_get_string (param_values + 5), - (char*) g_value_get_string (param_values + 6), - (char*) g_value_get_string (param_values + 7), - data2); -} -#else // Natty #if (INDICATOR_APPLICATIONADDED_HAS_TITLE == 1) static void _cd_cclosure_marshal_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING_STRING_STRING_STRING ( #elif (INDICATOR_APPLICATIONADDED_HAS_HINT == 1) @@ -185,7 +131,7 @@ static void _cd_cclosure_marshal_VOID__STRING_INT_STRING_STRING_STRING_STRING_ST #endif data2); } -#endif + static void _cd_cclosure_marshal_VOID__INT_STRING_STRING (GClosure *closure, GValue *return_value G_GNUC_UNUSED, @@ -266,7 +212,6 @@ static void _cd_cclosure_marshal_VOID__INT_STRING (GClosure *closure, /////////////// static void on_new_application (DBusGProxy *proxy_watcher, const gchar *cIconName, gint iPosition, const gchar *cAddress, const gchar *cObjectPath, const gchar *cIconThemePath, const gchar *cLabel, const gchar *cLabelGuide, -#if (INDICATOR_OLD_NAMES == 0) // Natty const gchar *cAccessbleDesc, // WTF is this new param ?? #if (INDICATOR_APPLICATIONADDED_HAS_HINT == 1) const gchar *cHint, // is this a hint to work around a clumsy API ? @@ -274,12 +219,10 @@ const gchar *cHint, // is this a hint to work around a clumsy API ? only with indicator-0.4 (Oneiric) @@ -657,7 +583,6 @@ void cd_satus_notifier_get_items_from_ias (void) G_TYPE_STRING, // title => only with indicator-0.4.90 (Precise) #endif #endif - #endif G_TYPE_INVALID); dbus_g_proxy_connect_signal(myData.pProxyIndicatorApplicationService, "ApplicationAdded", G_CALLBACK(on_new_application), myApplet, NULL); @@ -743,9 +668,7 @@ static void _on_watch_service (DBusGProxy *proxy, DBusGProxyCall *call, gpointer * https://bugs.launchpad.net/bugs/1303731 * TODO: remove this ugly hack... */ - #if (INDICATOR_OLD_NAMES == 0) service_api_version = 1; - #endif } cd_debug ("=== got indicator service (API: %d, service: %d, broken watcher: %d)", service_api_version, this_service_version, myData.bBrokenWatcher); diff --git a/alsaMixer/src/CMakeLists.txt b/alsaMixer/src/CMakeLists.txt index cbb3e378f..2ed0aa7d0 100644 --- a/alsaMixer/src/CMakeLists.txt +++ b/alsaMixer/src/CMakeLists.txt @@ -41,9 +41,6 @@ add_definitions (-DMY_APPLET_ICON_FILE="icon.png") if (INDICATOR_SOUNDMENU_WITH_IND3) message (STATUS " With Indicator-Applet3") add_definitions (-DINDICATOR_SOUNDMENU_WITH_IND3=1) - if (INDICATOR_NG) - add_definitions (-DIS_INDICATOR_NG=1) - endif() set (EXTRAS_INCLUDE_DIRS ${INDICATOR_APPLET_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/Indicator-applet3) set (EXTRAS_LIBRARY_DIRS ${INDICATOR_APPLET_LIBRARY_DIRS} diff --git a/alsaMixer/src/applet-config.c b/alsaMixer/src/applet-config.c index 558057bf8..c7413a817 100755 --- a/alsaMixer/src/applet-config.c +++ b/alsaMixer/src/applet-config.c @@ -77,11 +77,7 @@ CD_APPLET_GET_CONFIG_BEGIN #ifdef INDICATOR_SOUNDMENU_WITH_IND3 myConfig.cIndicatorName = CD_CONFIG_GET_STRING ("Configuration", "indicator name"); // we take it from the config just in case the name changes, it's not a visible option. if (myConfig.cIndicatorName == NULL) - #ifdef IS_INDICATOR_NG - myConfig.cIndicatorName = g_strdup ("com.canonical.indicator.sound"); - #else - myConfig.cIndicatorName = g_strdup ("libsoundmenu.so"); - #endif + myConfig.cIndicatorName = g_strdup ("org.ayatana.indicator.sound"); #endif CD_APPLET_GET_CONFIG_END From 71d40ec7015dc24f559d400b0951bc121cab3050 Mon Sep 17 00:00:00 2001 From: Daniel Kondor Date: Thu, 7 Mar 2024 22:37:44 +0100 Subject: [PATCH 17/24] Dbus: fix a crash in ShowDesklet() --- Dbus/src/interface-main-methods.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dbus/src/interface-main-methods.c b/Dbus/src/interface-main-methods.c index 18c8cccb6..b6017ac07 100644 --- a/Dbus/src/interface-main-methods.c +++ b/Dbus/src/interface-main-methods.c @@ -120,7 +120,7 @@ gboolean cd_dbus_main_show_desklet (dbusMainObject *pDbusCallback, gboolean *wid } else { - gldi_desklets_set_visible (widgetLayer != NULL ? *widgetLayer : FALSE); + gldi_desklets_set_visible (!!widgetLayer); } dbus_deskletVisible = !dbus_deskletVisible; return TRUE; From 10364bc0f8bd2900fcf96d8be91d6869e5a29321 Mon Sep 17 00:00:00 2001 From: Daniel Kondor Date: Thu, 7 Mar 2024 22:40:23 +0100 Subject: [PATCH 18/24] Dbus: do not use a deprecated CMake function --- Dbus/interfaces/bash/BashInstall.cmake.in | 46 ++++++++++++------- Dbus/interfaces/bash/CMakeLists.txt | 6 +-- Dbus/interfaces/python/CMakeLists.txt | 6 +-- Dbus/interfaces/python/PythonInstall.cmake.in | 46 ++++++++++++------- 4 files changed, 66 insertions(+), 38 deletions(-) diff --git a/Dbus/interfaces/bash/BashInstall.cmake.in b/Dbus/interfaces/bash/BashInstall.cmake.in index dd0f7924f..d46a02e9f 100644 --- a/Dbus/interfaces/bash/BashInstall.cmake.in +++ b/Dbus/interfaces/bash/BashInstall.cmake.in @@ -2,38 +2,52 @@ IF ("@PYTHON2_FOUND@" STREQUAL "TRUE") IF("@ROOT_PREFIX@" STREQUAL "") - EXEC_PROGRAM("@PYTHON2_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS + set (ROOT1 "$ENV{DESTDIR}") + IF ("${ROOT1}" STREQUAL "") + set (ROOT1 "/") + ENDIF() + execute_process(COMMAND "@PYTHON2_EXECUTABLE@" "setup.py" "install" - "--prefix=${CMAKE_INSTALL_PREFIX}" - "--root=`test -z \"\$DESTDIR\" && echo / || echo \$DESTDIR`" - "@DEBIAN_INSTALL_LAYOUT@") + "--prefix=@CMAKE_INSTALL_PREFIX@" + "--root=${ROOT1}" + @DEBIAN_INSTALL_LAYOUT@ + WORKING_DIRECTORY "@CMAKE_CURRENT_BINARY_DIR@") ELSEIF("@python_no_deb_layout@" STREQUAL "") - EXEC_PROGRAM("@PYTHON2_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS + execute_process(COMMAND "@PYTHON2_EXECUTABLE@" "setup.py" "install" "--root=@ROOT_PREFIX@" - "@DEBIAN_INSTALL_LAYOUT@") + @DEBIAN_INSTALL_LAYOUT@ + WORKING_DIRECTORY "@CMAKE_CURRENT_BINARY_DIR@") ELSE() - EXEC_PROGRAM("@PYTHON2_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS + execute_process(COMMAND "@PYTHON2_EXECUTABLE@" "setup.py" "install" - "--root=@ROOT_PREFIX@") + "--root=@ROOT_PREFIX@" + WORKING_DIRECTORY "@CMAKE_CURRENT_BINARY_DIR@") ENDIF() ENDIF() IF ("@PYTHON3_FOUND@" STREQUAL "TRUE") IF("@ROOT_PREFIX@" STREQUAL "") - EXEC_PROGRAM("@PYTHON3_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS + set (ROOT1 "$ENV{DESTDIR}") + IF ("${ROOT1}" STREQUAL "") + set (ROOT1 "/") + ENDIF() + execute_process(COMMAND "@PYTHON3_EXECUTABLE@" "setup.py" "install" - "--prefix=${CMAKE_INSTALL_PREFIX}" - "--root=`test -z \"\$DESTDIR\" && echo / || echo \$DESTDIR`" - "@DEBIAN_INSTALL_LAYOUT@") + "--prefix=@CMAKE_INSTALL_PREFIX@" + "--root=${ROOT1}" + @DEBIAN_INSTALL_LAYOUT@ + WORKING_DIRECTORY "@CMAKE_CURRENT_BINARY_DIR@") ELSEIF("@python_no_deb_layout@" STREQUAL "") - EXEC_PROGRAM("@PYTHON3_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS + execute_process(COMMAND "@PYTHON3_EXECUTABLE@" "setup.py" "install" "--root=@ROOT_PREFIX@" - "@DEBIAN_INSTALL_LAYOUT@") + @DEBIAN_INSTALL_LAYOUT@ + WORKING_DIRECTORY "@CMAKE_CURRENT_BINARY_DIR@") ELSE() - EXEC_PROGRAM("@PYTHON3_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS + execute_process(COMMAND "@PYTHON3_EXECUTABLE@" "setup.py" "install" - "--root=@ROOT_PREFIX@") + "--root=@ROOT_PREFIX@" + WORKING_DIRECTORY "@CMAKE_CURRENT_BINARY_DIR@") ENDIF() ENDIF() diff --git a/Dbus/interfaces/bash/CMakeLists.txt b/Dbus/interfaces/bash/CMakeLists.txt index 024296919..e1fd86763 100644 --- a/Dbus/interfaces/bash/CMakeLists.txt +++ b/Dbus/interfaces/bash/CMakeLists.txt @@ -8,16 +8,16 @@ if (NOT "${CMAKE_CURRENT_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") endif() if (PYTHON2_FOUND) - exec_program("${PYTHON2_EXECUTABLE}" "${CMAKE_CURRENT_BINARY_DIR}" ARGS "setup.py" "-q" "build") + execute_process(COMMAND "${PYTHON2_EXECUTABLE}" "setup.py" "-q" "build" WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") endif() if (PYTHON3_FOUND) - exec_program("${PYTHON3_EXECUTABLE}" "${CMAKE_CURRENT_BINARY_DIR}" ARGS "setup.py" "-q" "build") # if both are present, the build sub-folder will not have the same name, so we can build now and then install during the 'make install'. + execute_process(COMMAND "${PYTHON3_EXECUTABLE}" "setup.py" "-q" "build" WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") # if both are present, the build sub-folder will not have the same name, so we can build now and then install during the 'make install'. endif() ########### install files ############### # Run a custom script with 'make install' add_custom_target(bash_pyc ALL) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/BashInstall.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/BashInstall.cmake) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/BashInstall.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/BashInstall.cmake @ONLY) set_target_properties(bash_pyc PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/BashInstall.cmake) # and the bash functions goes into the data dir of the applet (didn't find a better place). diff --git a/Dbus/interfaces/python/CMakeLists.txt b/Dbus/interfaces/python/CMakeLists.txt index c24ed0d9e..d57b6e071 100644 --- a/Dbus/interfaces/python/CMakeLists.txt +++ b/Dbus/interfaces/python/CMakeLists.txt @@ -8,14 +8,14 @@ endif() ########### byte-compile the python scripts to .pyc ############### if (PYTHON2_FOUND) - exec_program("${PYTHON2_EXECUTABLE}" "${CMAKE_CURRENT_BINARY_DIR}" ARGS "setup.py" "-q" "build") + execute_process(COMMAND "${PYTHON2_EXECUTABLE}" "setup.py" "-q" "build" WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") endif() if (PYTHON3_FOUND) - exec_program("${PYTHON3_EXECUTABLE}" "${CMAKE_CURRENT_BINARY_DIR}" ARGS "setup.py" "-q" "build") # if both are present, the build sub-folder will not have the same name, so we can build now and then install during the 'make install', which allows us to not build as root. + execute_process(COMMAND "${PYTHON3_EXECUTABLE}" "setup.py" "-q" "build" WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") # if both are present, the build sub-folder will not have the same name, so we can build now and then install during the 'make install', which allows us to not build as root. endif() ########### install files ############### # Run a custom script with 'make install' add_custom_target(python_pyc ALL) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/PythonInstall.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/PythonInstall.cmake) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/PythonInstall.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/PythonInstall.cmake @ONLY) set_target_properties(python_pyc PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/PythonInstall.cmake) diff --git a/Dbus/interfaces/python/PythonInstall.cmake.in b/Dbus/interfaces/python/PythonInstall.cmake.in index e0a45b797..00e8a747f 100644 --- a/Dbus/interfaces/python/PythonInstall.cmake.in +++ b/Dbus/interfaces/python/PythonInstall.cmake.in @@ -2,38 +2,52 @@ if ("@PYTHON2_FOUND@" STREQUAL "TRUE") IF("@ROOT_PREFIX@" STREQUAL "") - EXEC_PROGRAM("@PYTHON2_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS + set (ROOT1 "$ENV{DESTDIR}") + IF ("${ROOT1}" STREQUAL "") + set (ROOT1 "/") + ENDIF() + execute_process(COMMAND "@PYTHON2_EXECUTABLE@" "setup.py" "install" - "--prefix=${CMAKE_INSTALL_PREFIX}" - "--root=`test -z \"\$DESTDIR\" && echo / || echo \$DESTDIR`" - "@DEBIAN_INSTALL_LAYOUT@") + "--prefix=@CMAKE_INSTALL_PREFIX@" + "--root=${ROOT1}" + @DEBIAN_INSTALL_LAYOUT@ + WORKING_DIRECTORY "@CMAKE_CURRENT_BINARY_DIR@") ELSEIF("@python_no_deb_layout@" STREQUAL "") - EXEC_PROGRAM("@PYTHON2_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS + execute_process(COMMAND "@PYTHON2_EXECUTABLE@" "setup.py" "install" "--root=@ROOT_PREFIX@" - "@DEBIAN_INSTALL_LAYOUT@") + @DEBIAN_INSTALL_LAYOUT@ + WORKING_DIRECTORY "@CMAKE_CURRENT_BINARY_DIR@") ELSE() - EXEC_PROGRAM("@PYTHON2_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS + execute_process(COMMAND "@PYTHON2_EXECUTABLE@" "setup.py" "install" - "--root=@ROOT_PREFIX@") + "--root=@ROOT_PREFIX@" + WORKING_DIRECTORY "@CMAKE_CURRENT_BINARY_DIR@") ENDIF() ENDIF() if ("@PYTHON3_FOUND@" STREQUAL "TRUE") IF("@ROOT_PREFIX@" STREQUAL "") - EXEC_PROGRAM("@PYTHON3_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS + set (ROOT1 "$ENV{DESTDIR}") + IF ("${ROOT1}" STREQUAL "") + set (ROOT1 "/") + ENDIF() + execute_process(COMMAND "@PYTHON3_EXECUTABLE@" "setup.py" "install" - "--prefix=${CMAKE_INSTALL_PREFIX}" - "--root=`test -z \"\$DESTDIR\" && echo / || echo \$DESTDIR`" - "@DEBIAN_INSTALL_LAYOUT@") + "--prefix=@CMAKE_INSTALL_PREFIX@" + "--root=${ROOT1}" + @DEBIAN_INSTALL_LAYOUT@ + WORKING_DIRECTORY "@CMAKE_CURRENT_BINARY_DIR@") ELSEIF("@python_no_deb_layout@" STREQUAL "") - EXEC_PROGRAM("@PYTHON3_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS + execute_process(COMMAND "@PYTHON3_EXECUTABLE@" "setup.py" "install" "--root=@ROOT_PREFIX@" - "@DEBIAN_INSTALL_LAYOUT@") + @DEBIAN_INSTALL_LAYOUT@ + WORKING_DIRECTORY "@CMAKE_CURRENT_BINARY_DIR@") ELSE() - EXEC_PROGRAM("@PYTHON3_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS + execute_process(COMMAND "@PYTHON3_EXECUTABLE@" "setup.py" "install" - "--root=@ROOT_PREFIX@") + "--root=@ROOT_PREFIX@" + WORKING_DIRECTORY "@CMAKE_CURRENT_BINARY_DIR@") ENDIF() ENDIF() From c05c2bdc60bed9ee7ab7242debdd6c5374ef04d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kondor=20D=C3=A1niel?= Date: Thu, 18 Apr 2024 00:44:54 +0200 Subject: [PATCH 19/24] vala interface: silence compiler warnings --- Dbus/interfaces/vala/src/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dbus/interfaces/vala/src/CMakeLists.txt b/Dbus/interfaces/vala/src/CMakeLists.txt index 5b86d61f4..966566be4 100644 --- a/Dbus/interfaces/vala/src/CMakeLists.txt +++ b/Dbus/interfaces/vala/src/CMakeLists.txt @@ -5,6 +5,8 @@ else() set (VALA_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}) endif() +add_compile_options (-fPIC -Wno-all -Wno-incompatible-pointer-types) + # now, compile it as any normal C lib. add_library (${CDAPPLET} SHARED ${VALA_SRC_DIR}/${CDAPPLET}.c) STRING (REGEX REPLACE "\\..*" "" SOVERSION_VALA "${VERSION_VALA}") @@ -17,8 +19,6 @@ set_target_properties (${CDAPPLET} PROPERTIES # avoid conflicts between library and binary target names #OUTPUT_NAME ${PROJECT_NAME} ) -add_definitions (-fPIC -Wno-all) - pkg_check_modules ("CDAPPLET_DEPS" "gobject-2.0" "gio-2.0") include_directories ( From 7235e8b5227ce592a6a56f74d0a028e556cef40c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kondor=20D=C3=A1niel?= Date: Thu, 18 Apr 2024 21:49:08 +0200 Subject: [PATCH 20/24] Status-Notifier: fix empty functions (introduced recently) --- Status-Notifier/watcher/status-notifier-watcher.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Status-Notifier/watcher/status-notifier-watcher.py b/Status-Notifier/watcher/status-notifier-watcher.py index ea8d87656..f0a2279a5 100755 --- a/Status-Notifier/watcher/status-notifier-watcher.py +++ b/Status-Notifier/watcher/status-notifier-watcher.py @@ -134,21 +134,25 @@ def Get(self, interface, property): @dbus.service.signal(dbus_interface=bus_name_str, signature='s') def StatusNotifierItemRegistered(self, service): + pass # print("%s registered" % (service)) sys.stdout.flush() @dbus.service.signal(dbus_interface=bus_name_str, signature='s') def StatusNotifierItemUnregistered(self, service): + pass # print("%s unregistered" % (service)) sys.stdout.flush() @dbus.service.signal(dbus_interface=bus_name_str, signature=None) def StatusNotifierHostRegistered(self): + pass # print("a host has been registered") sys.stdout.flush() @dbus.service.signal(dbus_interface=bus_name_str, signature=None) def StatusNotifierHostUnregistered(self): + pass # print("a host has been unregistered") sys.stdout.flush() From ec75ec6c4d8201c8f6b7fe5ee8e79e5642853032 Mon Sep 17 00:00:00 2001 From: Daniel Kondor Date: Sun, 21 Apr 2024 13:41:36 +0200 Subject: [PATCH 21/24] fix the use of the ampersand (&) character in GUI text --- drop-indicator/data/drop_indicator.conf.in | 2 +- illusion/src/applet-init.c | 2 +- po/ar.po | 4 ++-- po/ca.po | 4 ++-- po/cs.po | 4 ++-- po/da.po | 4 ++-- po/de.po | 4 ++-- po/el.po | 4 ++-- po/en_GB.po | 8 ++++---- po/es.po | 4 ++-- po/et.po | 4 ++-- po/eu.po | 4 ++-- po/fr.po | 4 ++-- po/he.po | 4 ++-- po/hr.po | 4 ++-- po/hu.po | 4 ++-- po/id.po | 4 ++-- po/it.po | 4 ++-- po/ja.po | 10 +++++----- po/ko.po | 4 ++-- po/lt.po | 4 ++-- po/nl.po | 4 ++-- po/pl.po | 4 ++-- po/pt.po | 4 ++-- po/pt_BR.po | 4 ++-- po/ru.po | 4 ++-- po/sk.po | 6 +++--- po/sr.po | 4 ++-- po/sr@latin.po | 4 ++-- po/sv.po | 4 ++-- po/tr.po | 4 ++-- po/uk.po | 4 ++-- po/uz.po | 4 ++-- po/zh_CN.po | 4 ++-- po/zh_TW.po | 4 ++-- 35 files changed, 74 insertions(+), 74 deletions(-) diff --git a/drop-indicator/data/drop_indicator.conf.in b/drop-indicator/data/drop_indicator.conf.in index 4082622f2..c442cd3a1 100644 --- a/drop-indicator/data/drop_indicator.conf.in +++ b/drop-indicator/data/drop_indicator.conf.in @@ -6,7 +6,7 @@ #F[Images] images = -#g+[Default] Image for the drag & drop animation: +#g+[Default] Image for the drag & drop animation: #{Typically an arrow, this will be displayed when you try to drop a new launcher into the dock. Leave this empty to use the default.} drop indicator = diff --git a/illusion/src/applet-init.c b/illusion/src/applet-init.c index 1d6793215..a68644835 100755 --- a/illusion/src/applet-init.c +++ b/illusion/src/applet-init.c @@ -30,7 +30,7 @@ CD_APPLET_DEFINE_BEGIN (N_("illusion"), 2, 0, 0, CAIRO_DOCK_CATEGORY_THEME, - N_("This plugin provides animations for appearance & disappearance of icons."), + N_("This plugin provides animations for the appearance & disappearance of icons."), "Fabounet (Fabrice Rey)") if (! g_bUseOpenGL) return FALSE; diff --git a/po/ar.po b/po/ar.po index 25bf20fa7..46c289380 100644 --- a/po/ar.po +++ b/po/ar.po @@ -2360,7 +2360,7 @@ msgstr "" #: ../illusion/src/applet-init.c:33 msgid "" -"This plugin provides animations for appearance & disappearance of icons." +"This plugin provides animations for the appearance & disappearance of icons." msgstr "" #: ../keyboard-indicator/src/applet-init.c:32 @@ -7389,7 +7389,7 @@ msgid "" msgstr "" #: ../drop-indicator/data/messages:7 -msgid "Image for the drag & drop animation:" +msgid "Image for the drag & drop animation:" msgstr "" #: ../drop-indicator/data/messages:9 diff --git a/po/ca.po b/po/ca.po index ce736788e..613543dbd 100644 --- a/po/ca.po +++ b/po/ca.po @@ -2486,7 +2486,7 @@ msgstr "" #: ../illusion/src/applet-init.c:33 msgid "" -"This plugin provides animations for appearance & disappearance of icons." +"This plugin provides animations for the appearance & disappearance of icons." msgstr "" #: ../keyboard-indicator/src/applet-init.c:32 @@ -7526,7 +7526,7 @@ msgid "" msgstr "" #: ../drop-indicator/data/messages:7 -msgid "Image for the drag & drop animation:" +msgid "Image for the drag & drop animation:" msgstr "" #: ../drop-indicator/data/messages:9 diff --git a/po/cs.po b/po/cs.po index 01c572063..f386a6072 100644 --- a/po/cs.po +++ b/po/cs.po @@ -2428,7 +2428,7 @@ msgstr "iluze" #: ../illusion/src/applet-init.c:33 msgid "" -"This plugin provides animations for appearance & disappearance of icons." +"This plugin provides animations for the appearance & disappearance of icons." msgstr "Tento zásuvný modul poskytuje animace pro objevování a mizení ikon." #: ../keyboard-indicator/src/applet-init.c:32 @@ -7520,7 +7520,7 @@ msgid "" msgstr "" #: ../drop-indicator/data/messages:7 -msgid "Image for the drag & drop animation:" +msgid "Image for the drag & drop animation:" msgstr "" #: ../drop-indicator/data/messages:9 diff --git a/po/da.po b/po/da.po index 372fcbe12..3c44ecbc5 100644 --- a/po/da.po +++ b/po/da.po @@ -2323,7 +2323,7 @@ msgstr "" #: ../illusion/src/applet-init.c:33 msgid "" -"This plugin provides animations for appearance & disappearance of icons." +"This plugin provides animations for the appearance & disappearance of icons." msgstr "" #: ../keyboard-indicator/src/applet-init.c:32 @@ -7359,7 +7359,7 @@ msgid "" msgstr "" #: ../drop-indicator/data/messages:7 -msgid "Image for the drag & drop animation:" +msgid "Image for the drag & drop animation:" msgstr "" #: ../drop-indicator/data/messages:9 diff --git a/po/de.po b/po/de.po index 41710a88a..f5e014749 100644 --- a/po/de.po +++ b/po/de.po @@ -2602,7 +2602,7 @@ msgstr "Illusion" #: ../illusion/src/applet-init.c:33 msgid "" -"This plugin provides animations for appearance & disappearance of icons." +"This plugin provides animations for the appearance & disappearance of icons." msgstr "" "Diese Erweiterung stellt Animationen für das Erscheinen und Verschwinden von " "Symbolen bereit." @@ -7981,7 +7981,7 @@ msgstr "" "benutzen." #: ../drop-indicator/data/messages:7 -msgid "Image for the drag & drop animation:" +msgid "Image for the drag & drop animation:" msgstr "Bild für die Ziehen und ablegen Animation :" #: ../drop-indicator/data/messages:9 diff --git a/po/el.po b/po/el.po index ce81ecd4a..1f2cebc40 100644 --- a/po/el.po +++ b/po/el.po @@ -2488,7 +2488,7 @@ msgstr "ψευδαίσθηση" #: ../illusion/src/applet-init.c:33 msgid "" -"This plugin provides animations for appearance & disappearance of icons." +"This plugin provides animations for the appearance & disappearance of icons." msgstr "" "Αυτό το πρόσθετο παρέχει εφέ κίνησης για την εμφάνιση και απόκρυψη των " "εικονιδίων." @@ -7771,7 +7771,7 @@ msgstr "" "εκκινητή στο dock. Αφήστε το κενό για χρήση της προεπιλογής." #: ../drop-indicator/data/messages:7 -msgid "Image for the drag & drop animation:" +msgid "Image for the drag & drop animation:" msgstr "Εικόνα για το εφέ κίνησης της μετακίνησης και άφεσης:" #: ../drop-indicator/data/messages:9 diff --git a/po/en_GB.po b/po/en_GB.po index 14c2e96df..2f4e33cc7 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -2553,9 +2553,9 @@ msgstr "Illusion" #: ../illusion/src/applet-init.c:33 msgid "" -"This plugin provides animations for appearance & disappearance of icons." +"This plugin provides animations for the appearance & disappearance of icons." msgstr "" -"This plugin provides animations for appearance & disappearance of icons." +"This plugin provides animations for the appearance & disappearance of icons." #: ../keyboard-indicator/src/applet-init.c:32 msgid "keyboard indicator" @@ -7833,8 +7833,8 @@ msgstr "" "launcher into the dock. Leave this empty to use the default." #: ../drop-indicator/data/messages:7 -msgid "Image for the drag & drop animation:" -msgstr "Image for the drag & drop animation:" +msgid "Image for the drag & drop animation:" +msgstr "Image for the drag & drop animation:" #: ../drop-indicator/data/messages:9 msgid "" diff --git a/po/es.po b/po/es.po index 0a65846b8..0bb18c100 100644 --- a/po/es.po +++ b/po/es.po @@ -2473,7 +2473,7 @@ msgstr "Ilusión" #: ../illusion/src/applet-init.c:33 msgid "" -"This plugin provides animations for appearance & disappearance of icons." +"This plugin provides animations for the appearance & disappearance of icons." msgstr "" "Este complemento provee animaciones para la aparición y desaparición de los " "iconos." @@ -7763,7 +7763,7 @@ msgstr "" "predeterminado." #: ../drop-indicator/data/messages:7 -msgid "Image for the drag & drop animation:" +msgid "Image for the drag & drop animation:" msgstr "Imagen para la animación de «arrastrar y soltar»:" #: ../drop-indicator/data/messages:9 diff --git a/po/et.po b/po/et.po index 4ea4218b1..539d0feb2 100644 --- a/po/et.po +++ b/po/et.po @@ -2394,7 +2394,7 @@ msgstr "illusioon" #: ../illusion/src/applet-init.c:33 msgid "" -"This plugin provides animations for appearance & disappearance of icons." +"This plugin provides animations for the appearance & disappearance of icons." msgstr "" #: ../keyboard-indicator/src/applet-init.c:32 @@ -7431,7 +7431,7 @@ msgid "" msgstr "" #: ../drop-indicator/data/messages:7 -msgid "Image for the drag & drop animation:" +msgid "Image for the drag & drop animation:" msgstr "" #: ../drop-indicator/data/messages:9 diff --git a/po/eu.po b/po/eu.po index 5c1572b73..df265d1fd 100644 --- a/po/eu.po +++ b/po/eu.po @@ -2317,7 +2317,7 @@ msgstr "Ilusioa" #: ../illusion/src/applet-init.c:33 msgid "" -"This plugin provides animations for appearance & disappearance of icons." +"This plugin provides animations for the appearance & disappearance of icons." msgstr "" #: ../keyboard-indicator/src/applet-init.c:32 @@ -7348,7 +7348,7 @@ msgid "" msgstr "" #: ../drop-indicator/data/messages:7 -msgid "Image for the drag & drop animation:" +msgid "Image for the drag & drop animation:" msgstr "" #: ../drop-indicator/data/messages:9 diff --git a/po/fr.po b/po/fr.po index 3663c36ec..f40aed0ef 100644 --- a/po/fr.po +++ b/po/fr.po @@ -2597,7 +2597,7 @@ msgstr "Illusion" #: ../illusion/src/applet-init.c:33 msgid "" -"This plugin provides animations for appearance & disappearance of icons." +"This plugin provides animations for the appearance & disappearance of icons." msgstr "" "Ce plug-in ajoute des animations pour l'apparition et la disparition des " "icônes." @@ -7954,7 +7954,7 @@ msgstr "" "par défaut." #: ../drop-indicator/data/messages:7 -msgid "Image for the drag & drop animation:" +msgid "Image for the drag & drop animation:" msgstr "Image pour l'animation lors d'un dépôt :" #: ../drop-indicator/data/messages:9 diff --git a/po/he.po b/po/he.po index 74208d536..6e8a76efb 100644 --- a/po/he.po +++ b/po/he.po @@ -2361,7 +2361,7 @@ msgstr "" #: ../illusion/src/applet-init.c:33 msgid "" -"This plugin provides animations for appearance & disappearance of icons." +"This plugin provides animations for the appearance & disappearance of icons." msgstr "" #: ../keyboard-indicator/src/applet-init.c:32 @@ -7392,7 +7392,7 @@ msgid "" msgstr "" #: ../drop-indicator/data/messages:7 -msgid "Image for the drag & drop animation:" +msgid "Image for the drag & drop animation:" msgstr "" #: ../drop-indicator/data/messages:9 diff --git a/po/hr.po b/po/hr.po index cb029ab1e..f464ba86e 100644 --- a/po/hr.po +++ b/po/hr.po @@ -2429,7 +2429,7 @@ msgstr "" #: ../illusion/src/applet-init.c:33 msgid "" -"This plugin provides animations for appearance & disappearance of icons." +"This plugin provides animations for the appearance & disappearance of icons." msgstr "" #: ../keyboard-indicator/src/applet-init.c:32 @@ -7458,7 +7458,7 @@ msgid "" msgstr "" #: ../drop-indicator/data/messages:7 -msgid "Image for the drag & drop animation:" +msgid "Image for the drag & drop animation:" msgstr "" #: ../drop-indicator/data/messages:9 diff --git a/po/hu.po b/po/hu.po index bd26b5d86..784e9ace5 100644 --- a/po/hu.po +++ b/po/hu.po @@ -2468,7 +2468,7 @@ msgstr "szemfényvesztés" #: ../illusion/src/applet-init.c:33 msgid "" -"This plugin provides animations for appearance & disappearance of icons." +"This plugin provides animations for the appearance & disappearance of icons." msgstr "" "Ez a bővítmény megjelenési és eltűnési animációkat biztosít ikonjainak." @@ -7651,7 +7651,7 @@ msgid "" msgstr "" #: ../drop-indicator/data/messages:7 -msgid "Image for the drag & drop animation:" +msgid "Image for the drag & drop animation:" msgstr "" #: ../drop-indicator/data/messages:9 diff --git a/po/id.po b/po/id.po index 238e69603..b560e2fd3 100644 --- a/po/id.po +++ b/po/id.po @@ -2317,7 +2317,7 @@ msgstr "" #: ../illusion/src/applet-init.c:33 msgid "" -"This plugin provides animations for appearance & disappearance of icons." +"This plugin provides animations for the appearance & disappearance of icons." msgstr "" #: ../keyboard-indicator/src/applet-init.c:32 @@ -7346,7 +7346,7 @@ msgid "" msgstr "" #: ../drop-indicator/data/messages:7 -msgid "Image for the drag & drop animation:" +msgid "Image for the drag & drop animation:" msgstr "" #: ../drop-indicator/data/messages:9 diff --git a/po/it.po b/po/it.po index efcfecd6b..4b774f869 100644 --- a/po/it.po +++ b/po/it.po @@ -2576,7 +2576,7 @@ msgstr "Illusione" #: ../illusion/src/applet-init.c:33 msgid "" -"This plugin provides animations for appearance & disappearance of icons." +"This plugin provides animations for the appearance & disappearance of icons." msgstr "" "Questo plugin fornisce animazioni per l'apparire/scomparire delle icone." @@ -7913,7 +7913,7 @@ msgstr "" "predefinito." #: ../drop-indicator/data/messages:7 -msgid "Image for the drag & drop animation:" +msgid "Image for the drag & drop animation:" msgstr "Percorso dell'immagine per l'animazione di trascinamento:" #: ../drop-indicator/data/messages:9 diff --git a/po/ja.po b/po/ja.po index 0093d0260..b249b10ef 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1054,7 +1054,7 @@ msgstr "有効なURLではないようです。" #: ../RSSreader/src/applet-notifications.c:124 msgid "Paste a new RSS Url (drag and drop)" -msgstr "新しいRSS URLを貼り付け（ドラッグ&ドロップ）" +msgstr "新しいRSS URLを貼り付け（ドラッグ&ドロップ）" #: ../RSSreader/src/applet-notifications.c:128 msgid "Open with your web browser" @@ -2459,7 +2459,7 @@ msgstr "イリュージョン" #: ../illusion/src/applet-init.c:33 msgid "" -"This plugin provides animations for appearance & disappearance of icons." +"This plugin provides animations for the appearance & disappearance of icons." msgstr "アイコンの出現と消失のアニメーションを提供するプラグイン" #: ../keyboard-indicator/src/applet-init.c:32 @@ -3253,7 +3253,7 @@ msgid "" msgstr "" "あらゆるショートカットに素早くアクセスできるアプレット。\n" "ディスクやネットワークポイント、Nautilusブックマーク（Nautilusは必須ではありません）を管理できます。\n" -"ブックマークを追加するには、メインのアイコンまたはサブ・ドックにフォルダをドラッグ&ドロップします。\n" +"ブックマークを追加するには、メインのアイコンまたはサブ・ドックにフォルダをドラッグ&ドロップします。\n" "メイン・アイコンを中クリックすると、ホームフォルダが表示されます。\n" "マウントポイント・アイコンの中クリックで、素早く（アン）マウント。\n" "アプレットは、空き容量や種類などの有益なディスク情報を表示することもできます。" @@ -7624,7 +7624,7 @@ msgstr "" #: ../drop-indicator/data/messages:1 msgid "Drag and drop indicator" -msgstr "ドロップ&ドロップ標示" +msgstr "ドロップ&ドロップ標示" #: ../drop-indicator/data/messages:5 msgid "" @@ -7634,7 +7634,7 @@ msgstr "" "ドックに新規ランチャーをドロップしようとするときなどに表示されるもので、典型なのは矢印です。デフォルトの画像を使用するには空欄のままにしてください。" #: ../drop-indicator/data/messages:7 -msgid "Image for the drag & drop animation:" +msgid "Image for the drag & drop animation:" msgstr "ドラッグ＆ドロップ・アニメーションの画像 :" #: ../drop-indicator/data/messages:9 diff --git a/po/ko.po b/po/ko.po index 379865648..513cd8b30 100644 --- a/po/ko.po +++ b/po/ko.po @@ -2316,7 +2316,7 @@ msgstr "환상" #: ../illusion/src/applet-init.c:33 msgid "" -"This plugin provides animations for appearance & disappearance of icons." +"This plugin provides animations for the appearance & disappearance of icons." msgstr "" #: ../keyboard-indicator/src/applet-init.c:32 @@ -7347,7 +7347,7 @@ msgid "" msgstr "" #: ../drop-indicator/data/messages:7 -msgid "Image for the drag & drop animation:" +msgid "Image for the drag & drop animation:" msgstr "" #: ../drop-indicator/data/messages:9 diff --git a/po/lt.po b/po/lt.po index 4713bd8b5..9bbfa7c42 100644 --- a/po/lt.po +++ b/po/lt.po @@ -2310,7 +2310,7 @@ msgstr "" #: ../illusion/src/applet-init.c:33 msgid "" -"This plugin provides animations for appearance & disappearance of icons." +"This plugin provides animations for the appearance & disappearance of icons." msgstr "" #: ../keyboard-indicator/src/applet-init.c:32 @@ -7339,7 +7339,7 @@ msgid "" msgstr "" #: ../drop-indicator/data/messages:7 -msgid "Image for the drag & drop animation:" +msgid "Image for the drag & drop animation:" msgstr "" #: ../drop-indicator/data/messages:9 diff --git a/po/nl.po b/po/nl.po index b2d153054..693c7e518 100644 --- a/po/nl.po +++ b/po/nl.po @@ -2570,7 +2570,7 @@ msgstr "Illusie" #: ../illusion/src/applet-init.c:33 msgid "" -"This plugin provides animations for appearance & disappearance of icons." +"This plugin provides animations for the appearance & disappearance of icons." msgstr "" "Deze plug-in bevat animaties voor het verschijnen & verdwijnen van " "pictogrammen." @@ -7898,7 +7898,7 @@ msgstr "" "sleept. Laat leeg als u de standaardwaarde wilt gebruiken." #: ../drop-indicator/data/messages:7 -msgid "Image for the drag & drop animation:" +msgid "Image for the drag & drop animation:" msgstr "Afbeelding voor de sleepanimatie :" #: ../drop-indicator/data/messages:9 diff --git a/po/pl.po b/po/pl.po index 46ad0c7d6..d37a7dbd0 100644 --- a/po/pl.po +++ b/po/pl.po @@ -2327,7 +2327,7 @@ msgstr "" #: ../illusion/src/applet-init.c:33 msgid "" -"This plugin provides animations for appearance & disappearance of icons." +"This plugin provides animations for the appearance & disappearance of icons." msgstr "" #: ../keyboard-indicator/src/applet-init.c:32 @@ -7366,7 +7366,7 @@ msgid "" msgstr "" #: ../drop-indicator/data/messages:7 -msgid "Image for the drag & drop animation:" +msgid "Image for the drag & drop animation:" msgstr "" #: ../drop-indicator/data/messages:9 diff --git a/po/pt.po b/po/pt.po index 72904c744..6fd7d56e2 100644 --- a/po/pt.po +++ b/po/pt.po @@ -2390,7 +2390,7 @@ msgstr "Ilusão" #: ../illusion/src/applet-init.c:33 msgid "" -"This plugin provides animations for appearance & disappearance of icons." +"This plugin provides animations for the appearance & disappearance of icons." msgstr "" "Este plugin fornece animações para o aparecimento e desaparecimento dos " "ícones." @@ -7528,7 +7528,7 @@ msgid "" msgstr "" #: ../drop-indicator/data/messages:7 -msgid "Image for the drag & drop animation:" +msgid "Image for the drag & drop animation:" msgstr "" #: ../drop-indicator/data/messages:9 diff --git a/po/pt_BR.po b/po/pt_BR.po index 475b3d6b8..935fa0d73 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -2490,7 +2490,7 @@ msgstr "Ilusão" #: ../illusion/src/applet-init.c:33 msgid "" -"This plugin provides animations for appearance & disappearance of icons." +"This plugin provides animations for the appearance & disappearance of icons." msgstr "" "Este plugin provê animações para o aparecimento e desaparecimento dos ícones." @@ -7757,7 +7757,7 @@ msgstr "" "lançador no dock. Deixe em branco para usar o padrão." #: ../drop-indicator/data/messages:7 -msgid "Image for the drag & drop animation:" +msgid "Image for the drag & drop animation:" msgstr "Imagem para a animação 'arrastar e soltar':" #: ../drop-indicator/data/messages:9 diff --git a/po/ru.po b/po/ru.po index a4736fa19..5e52de402 100644 --- a/po/ru.po +++ b/po/ru.po @@ -2483,7 +2483,7 @@ msgstr "Иллюзии" #: ../illusion/src/applet-init.c:33 msgid "" -"This plugin provides animations for appearance & disappearance of icons." +"This plugin provides animations for the appearance & disappearance of icons." msgstr "Этот плагин предлагает эффекты появления и исчезновения значков." #: ../keyboard-indicator/src/applet-init.c:32 @@ -7724,7 +7724,7 @@ msgstr "" "панель новый значок запуска. Оставьте пустым, чтобы использовать стандартный." #: ../drop-indicator/data/messages:7 -msgid "Image for the drag & drop animation:" +msgid "Image for the drag & drop animation:" msgstr "Изображение для анимации перетаскивания:" #: ../drop-indicator/data/messages:9 diff --git a/po/sk.po b/po/sk.po index 6ae3113a9..3faf55bd3 100644 --- a/po/sk.po +++ b/po/sk.po @@ -2448,8 +2448,8 @@ msgstr "ilúzie" #: ../illusion/src/applet-init.c:33 msgid "" -"This plugin provides animations for appearance & disappearance of icons." -msgstr "Tento plug-in umožňuje animácie pre vzhľad & miznutie ikôn." +"This plugin provides animations for the appearance & disappearance of icons." +msgstr "Tento plug-in umožňuje animácie pre vzhľad & miznutie ikôn." #: ../keyboard-indicator/src/applet-init.c:32 msgid "keyboard indicator" @@ -7651,7 +7651,7 @@ msgstr "" "spúšťačov do docku. Ponechať prázdne pre použitie predvoleného." #: ../drop-indicator/data/messages:7 -msgid "Image for the drag & drop animation:" +msgid "Image for the drag & drop animation:" msgstr "Obrátok pre animáciu ťahaj a pusti :" #: ../drop-indicator/data/messages:9 diff --git a/po/sr.po b/po/sr.po index f6d862ba8..a3acb4e35 100644 --- a/po/sr.po +++ b/po/sr.po @@ -2552,7 +2552,7 @@ msgstr "привид" #: ../illusion/src/applet-init.c:33 msgid "" -"This plugin provides animations for appearance & disappearance of icons." +"This plugin provides animations for the appearance & disappearance of icons." msgstr "Овај прикључак обезбеђује дејства за приказ и нестајање иконица." #: ../keyboard-indicator/src/applet-init.c:32 @@ -7848,7 +7848,7 @@ msgstr "" "покретач на док. оставите празно да би користили задату." #: ../drop-indicator/data/messages:7 -msgid "Image for the drag & drop animation:" +msgid "Image for the drag & drop animation:" msgstr "Слика за анимацију превуци и спусти:" #: ../drop-indicator/data/messages:9 diff --git a/po/sr@latin.po b/po/sr@latin.po index 49b3c0b96..7095840c8 100644 --- a/po/sr@latin.po +++ b/po/sr@latin.po @@ -2315,7 +2315,7 @@ msgstr "Iluzija" #: ../illusion/src/applet-init.c:33 msgid "" -"This plugin provides animations for appearance & disappearance of icons." +"This plugin provides animations for the appearance & disappearance of icons." msgstr "" #: ../keyboard-indicator/src/applet-init.c:32 @@ -7356,7 +7356,7 @@ msgid "" msgstr "" #: ../drop-indicator/data/messages:7 -msgid "Image for the drag & drop animation:" +msgid "Image for the drag & drop animation:" msgstr "Slika za animaciju prevlačenja i ispuštanja:" #: ../drop-indicator/data/messages:9 diff --git a/po/sv.po b/po/sv.po index fc160f444..133e46154 100644 --- a/po/sv.po +++ b/po/sv.po @@ -2562,7 +2562,7 @@ msgstr "illusion" #: ../illusion/src/applet-init.c:33 msgid "" -"This plugin provides animations for appearance & disappearance of icons." +"This plugin provides animations for the appearance & disappearance of icons." msgstr "" "Detta insticksprogram tillhandahåller animeringar för framträdande & " "försvinnande av ikoner." @@ -7860,7 +7860,7 @@ msgstr "" "startare i dockan. Lämna detta tomt för att använda standard." #: ../drop-indicator/data/messages:7 -msgid "Image for the drag & drop animation:" +msgid "Image for the drag & drop animation:" msgstr "Bild för dra-och-släppanimeringen:" #: ../drop-indicator/data/messages:9 diff --git a/po/tr.po b/po/tr.po index 69cd5eddb..adbd753b1 100644 --- a/po/tr.po +++ b/po/tr.po @@ -2355,7 +2355,7 @@ msgstr "yanılsama" #: ../illusion/src/applet-init.c:33 msgid "" -"This plugin provides animations for appearance & disappearance of icons." +"This plugin provides animations for the appearance & disappearance of icons." msgstr "" #: ../keyboard-indicator/src/applet-init.c:32 @@ -7394,7 +7394,7 @@ msgid "" msgstr "" #: ../drop-indicator/data/messages:7 -msgid "Image for the drag & drop animation:" +msgid "Image for the drag & drop animation:" msgstr "" #: ../drop-indicator/data/messages:9 diff --git a/po/uk.po b/po/uk.po index 95f896e51..3680d75dc 100644 --- a/po/uk.po +++ b/po/uk.po @@ -2558,7 +2558,7 @@ msgstr "Ілюзії" #: ../illusion/src/applet-init.c:33 msgid "" -"This plugin provides animations for appearance & disappearance of icons." +"This plugin provides animations for the appearance & disappearance of icons." msgstr "Цей додаток пропонує ефекти появи та зникнення іконок." #: ../keyboard-indicator/src/applet-init.c:32 @@ -7854,7 +7854,7 @@ msgstr "" "панель новий значок запуску. Залиште порожнім, щоб використовувати типове." #: ../drop-indicator/data/messages:7 -msgid "Image for the drag & drop animation:" +msgid "Image for the drag & drop animation:" msgstr "Зображення для анімації перетягування:" #: ../drop-indicator/data/messages:9 diff --git a/po/uz.po b/po/uz.po index 114849bff..1051d58ff 100644 --- a/po/uz.po +++ b/po/uz.po @@ -2337,7 +2337,7 @@ msgstr "иллюзия" #: ../illusion/src/applet-init.c:33 msgid "" -"This plugin provides animations for appearance & disappearance of icons." +"This plugin provides animations for the appearance & disappearance of icons." msgstr "" "Ушбу плагин нишончаларнинг пайдо бўлиши ва ғойиб бўлиши учун анимацияларни " "таъминлайди." @@ -7372,7 +7372,7 @@ msgid "" msgstr "" #: ../drop-indicator/data/messages:7 -msgid "Image for the drag & drop animation:" +msgid "Image for the drag & drop animation:" msgstr "" #: ../drop-indicator/data/messages:9 diff --git a/po/zh_CN.po b/po/zh_CN.po index 1fd6d7cc8..72126a129 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -2375,7 +2375,7 @@ msgstr "" #: ../illusion/src/applet-init.c:33 msgid "" -"This plugin provides animations for appearance & disappearance of icons." +"This plugin provides animations for the appearance & disappearance of icons." msgstr "" #: ../keyboard-indicator/src/applet-init.c:32 @@ -7419,7 +7419,7 @@ msgid "" msgstr "" #: ../drop-indicator/data/messages:7 -msgid "Image for the drag & drop animation:" +msgid "Image for the drag & drop animation:" msgstr "" #: ../drop-indicator/data/messages:9 diff --git a/po/zh_TW.po b/po/zh_TW.po index 339e029dd..88b84fa48 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -2414,7 +2414,7 @@ msgstr "幻象" #: ../illusion/src/applet-init.c:33 msgid "" -"This plugin provides animations for appearance & disappearance of icons." +"This plugin provides animations for the appearance & disappearance of icons." msgstr "此插件提供圖示的顯示與消失動畫。" #: ../keyboard-indicator/src/applet-init.c:32 @@ -7519,7 +7519,7 @@ msgid "" msgstr "典型的箭頭，當您試著要 拖-放 一個新的快速啟動進入 Dock 時會顯示出來。要使用預設的圖形請讓它空白。" #: ../drop-indicator/data/messages:7 -msgid "Image for the drag & drop animation:" +msgid "Image for the drag & drop animation:" msgstr "拖-放 動畫的圖形：" #: ../drop-indicator/data/messages:9 From eca4ddacfcaaa0f47e81011ac97dbab0fed2787f Mon Sep 17 00:00:00 2001 From: Daniel Kondor Date: Sat, 9 Mar 2024 13:24:05 +0100 Subject: [PATCH 22/24] Dbus: use an explicit working directory for valac Seems to be required by f771b22 in some cases. --- Dbus/interfaces/vala/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dbus/interfaces/vala/CMakeLists.txt b/Dbus/interfaces/vala/CMakeLists.txt index f3d7d5fd2..8e3048df6 100644 --- a/Dbus/interfaces/vala/CMakeLists.txt +++ b/Dbus/interfaces/vala/CMakeLists.txt @@ -24,7 +24,8 @@ if ("${VALAC_FOUND}" STREQUAL "TRUE") --vapi=${VALA_DIR}/src/${CDAPPLET}.vapi --header=${VALA_DIR}/src/${CDAPPLET}.h -o ${CDAPPLET}.c - ${CMAKE_CURRENT_SOURCE_DIR}/${CDAPPLET}.vala) + ${CMAKE_CURRENT_SOURCE_DIR}/${CDAPPLET}.vala + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) # it seems that valac can only produce the output c file into the current directory... execute_process(COMMAND mv ${CMAKE_CURRENT_SOURCE_DIR}/${CDAPPLET}.c ${VALA_DIR}/src/${CDAPPLET}.c) From e62b7a0f3a7c99b5ee9e99d2f4616d6441dd73c8 Mon Sep 17 00:00:00 2001 From: Daniel Kondor Date: Sun, 15 Sep 2024 21:41:58 +0200 Subject: [PATCH 23/24] Bump version --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 391682783..6e351bf74 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ include ("${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/GNUInstallDirs.cmake") ########### project ############### project ("cairo-dock-plugins") -set (VERSION "3.5.0") +set (VERSION "3.5.1") add_definitions (-std=gnu99 -Wall -Werror-implicit-function-declaration) # -Wextra -Wwrite-strings -Wuninitialized -Werror-implicit-function-declaration -Wstrict-prototypes -Wreturn-type -Wparentheses -Warray-bounds) if (NOT DEFINED CMAKE_BUILD_TYPE) From a89b3daad502e8a807276a51ba2b3e832cc93050 Mon Sep 17 00:00:00 2001 From: Daniel Kondor Date: Wed, 18 Sep 2024 22:40:52 +0200 Subject: [PATCH 24/24] Status-Notifier: signal handlers do not do anything --- Status-Notifier/watcher/status-notifier-watcher.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Status-Notifier/watcher/status-notifier-watcher.py b/Status-Notifier/watcher/status-notifier-watcher.py index f0a2279a5..2e17c939d 100755 --- a/Status-Notifier/watcher/status-notifier-watcher.py +++ b/Status-Notifier/watcher/status-notifier-watcher.py @@ -136,25 +136,25 @@ def Get(self, interface, property): def StatusNotifierItemRegistered(self, service): pass # print("%s registered" % (service)) - sys.stdout.flush() + # sys.stdout.flush() @dbus.service.signal(dbus_interface=bus_name_str, signature='s') def StatusNotifierItemUnregistered(self, service): pass # print("%s unregistered" % (service)) - sys.stdout.flush() + # sys.stdout.flush() @dbus.service.signal(dbus_interface=bus_name_str, signature=None) def StatusNotifierHostRegistered(self): pass # print("a host has been registered") - sys.stdout.flush() + # sys.stdout.flush() @dbus.service.signal(dbus_interface=bus_name_str, signature=None) def StatusNotifierHostUnregistered(self): pass # print("a host has been unregistered") - sys.stdout.flush() + # sys.stdout.flush() if __name__ == '__main__':