Jesús González has proposed merging lp:~jgonzalezdr/cairo-dock-plug-ins/3.3 into lp:cairo-dock-plug-ins.
Requested reviews: Cairo-Dock Devs (cairo-dock-team) For more details, see: https://code.launchpad.net/~jgonzalezdr/cairo-dock-plug-ins/3.3/+merge/233143 Added Suspend-Workaround applet that fixes the icon corruption that happens with some graphic cards (e.g. nvidia) when suspending the computer. Fixes bug #535065 "symptoms" with a workaround that doesn't need external scripts added and configured manually by affected users (as proposed in https://bugs.launchpad.net/cairo-dock-plug-ins/+bug/535065/comments/14), therefore it's a lot more user-friendly solution and it's more robust (the python script solution sometimes fails, maybe because dbus messages to reboot cairo-dock are lost). To test it just install the applet in an affected computer and enable it, suspend the computer, resume, and voilà... icons aren't corrupted any more. -- https://code.launchpad.net/~jgonzalezdr/cairo-dock-plug-ins/3.3/+merge/233143 Your team Cairo-Dock Devs is requested to review the proposed merge of lp:~jgonzalezdr/cairo-dock-plug-ins/3.3 into lp:cairo-dock-plug-ins.
=== modified file 'Animated-icons/data/Animated-icons.conf.in' === modified file 'Animated-icons/src/applet-config.c' === modified file 'CMakeLists.txt' --- CMakeLists.txt 2014-08-17 22:45:21 +0000 +++ CMakeLists.txt 2014-09-03 02:30:44 +0000 @@ -11,7 +11,11 @@ ########### project ############### project ("cairo-dock-plugins") +<<<<<<< TREE set (VERSION "3.3.99.rc1") +======= +set (VERSION "3.3.2") +>>>>>>> MERGE-SOURCE add_definitions (-std=c99 -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) @@ -1468,6 +1472,19 @@ endif() endif() +############# SUSPEND-WORKAROUND ################# +set (with_suspend_workaround no) +if (enable-suspend-workaround) + message (STATUS "> Suspend-Workaround:") + set (GETTEXT_SUSPEND_WORKAROUND ${GETTEXT_PLUGINS}) + set (VERSION_SUSPEND_WORKAROUND "1.0.0") + set (PACKAGE_SUSPEND_WORKAROUND "cd-SuspendWorkaround") + set (with_suspend_workaround yes) + set (suspendworkarounddatadir "${pluginsdatadir}/Suspend-Workaround") + configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Suspend-Workaround/data/Suspend-Workaround.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Suspend-Workaround/data/Suspend-Workaround.conf) + add_subdirectory (Suspend-Workaround) +endif() + message ("") message (STATUS "===============") message (STATUS "Language build:") @@ -1502,6 +1519,7 @@ message (STATUS " - with Terminal applet: ${with_terminal}") message (STATUS " - with Weblets applet: ${with_weblets}") message (STATUS " - with Xgamma applet: ${with_xgamma}") +message (STATUS " - with Suspend-Workaround applet: ${with_suspend_workaround}") message (STATUS "Add On:") message (STATUS " - with Sound-Menu support: ${with_soundmenu}") message (STATUS " - with Screen Resolution support: ${with_xrandr}") === modified file 'Dbus/src/applet-dbus.c' === modified file 'GMenu/src/applet-apps.c' --- GMenu/src/applet-apps.c 2014-07-14 21:09:16 +0000 +++ GMenu/src/applet-apps.c 2014-09-03 02:30:44 +0000 @@ -91,7 +91,12 @@ void cd_menu_check_for_new_apps (void) { +<<<<<<< TREE if (myData.pNewApps != NULL && myConfig.bShowNewApps) +======= + gldi_dialogs_remove_on_icon (myIcon); /// TODO: just replace the combo box + if (myData.pNewApps != NULL) +>>>>>>> MERGE-SOURCE { if (s_pNewAppsDialog) // the dialogue already exists: add new items in the list { @@ -104,10 +109,14 @@ GTK_COMBO_BOX_TEXT (s_pNewAppsDialog->pInteractiveWidget), g_app_info_get_name (a->data)); } +<<<<<<< TREE gtk_combo_box_set_active ( GTK_COMBO_BOX (s_pNewAppsDialog->pInteractiveWidget), 0); gldi_dialog_redraw_interactive_widget (s_pNewAppsDialog); +======= + gtk_combo_box_set_active (GTK_COMBO_BOX (pInteractiveWidget), 0); // select the first one +>>>>>>> MERGE-SOURCE } else { @@ -157,6 +166,7 @@ { // check the XDG_CURRENT_DESKTOP env variable, it is used to match the 'OnlyShowIn' key in the .desktop files in gio and libgnomemenu const gchar *cDesktopEnv = g_getenv ("XDG_CURRENT_DESKTOP"); +<<<<<<< TREE if (! cDesktopEnv) // the system didn't set the variable: this is probably a bug, so let's try to set a value ourselves (this is needed for both gio and libgnomemenu); this is a workaround, most of the time the value will be set correctly. { switch (g_iDesktopEnv) @@ -174,11 +184,34 @@ #if ! GLIB_CHECK_VERSION (2,41,0) // Since 2.41 the value of the XDG_CURRENT_DESKTOP environment variable will be used. if (cDesktopEnv) // also set it for g_app_info_should_show() in gio +======= + if (! cDesktopEnv) // the system didn't set the variable: this is probably a bug, so let's try to set a value ourselves (this is needed for both gio and libgnomemenu); this is a workaround, most of the time the value will be set correctly. + { + switch (g_iDesktopEnv) + { + case CAIRO_DOCK_GNOME: cDesktopEnv = "GNOME"; break; + case CAIRO_DOCK_XFCE: cDesktopEnv = "XFCE"; break; + case CAIRO_DOCK_KDE: cDesktopEnv = "KDE"; break; + default: break; + } + // if we found something, set the env variable, because libgnomemenu uses it directly, and if it is not set, will drop any element that has a OnlyShowIn key... + if (cDesktopEnv) + g_setenv ("XDG_CURRENT_DESKTOP", cDesktopEnv, TRUE); + } + + if (cDesktopEnv) // also set it for g_app_info_should_show() in gio +>>>>>>> MERGE-SOURCE g_desktop_app_info_set_desktop_env (cDesktopEnv); +<<<<<<< TREE #endif s_bDesktopEnvDef = (cDesktopEnv != NULL); // if cDesktopEnv is NULL, g_app_info_should_show will drop any element that has a OnlyShowIn key (it does a direct comparison), so we won't use this function, as it's better to show more apps than having missing apps. +======= + + s_bDesktopEnvDef = (cDesktopEnv != NULL); // if cDesktopEnv is NULL, g_app_info_should_show will drop any element that has a OnlyShowIn key (it does a direct comparison), so we won't use this function, as it's better to show more apps than having missing apps. + +>>>>>>> MERGE-SOURCE myData.bFirstLaunch = TRUE; myData.pKnownApplications = g_hash_table_new_full (g_str_hash, g_str_equal, === modified file 'GMenu/src/applet-entry.c' === added directory 'Suspend-Workaround' === added file 'Suspend-Workaround/CMakeLists.txt' --- Suspend-Workaround/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ Suspend-Workaround/CMakeLists.txt 2014-09-03 02:30:44 +0000 @@ -0,0 +1,2 @@ +add_subdirectory(src) +add_subdirectory(data) === added directory 'Suspend-Workaround/data' === added file 'Suspend-Workaround/data/CMakeLists.txt' --- Suspend-Workaround/data/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ Suspend-Workaround/data/CMakeLists.txt 2014-09-03 02:30:44 +0000 @@ -0,0 +1,7 @@ + +########### install files ############### + +install (FILES ${CMAKE_CURRENT_BINARY_DIR}/Suspend-Workaround.conf + icon.png + DESTINATION ${suspendworkarounddatadir}) + === added file 'Suspend-Workaround/data/Suspend-Workaround.conf.in' --- Suspend-Workaround/data/Suspend-Workaround.conf.in 1970-01-01 00:00:00 +0000 +++ Suspend-Workaround/data/Suspend-Workaround.conf.in 2014-09-03 02:30:44 +0000 @@ -0,0 +1,8 @@ +#@VERSION_SUSPEND_WORKAROUND@ + +#[gtk-about] +[Icon] + +#A +handbook=Suspend-Workaround + === added file 'Suspend-Workaround/data/icon.png' Binary files Suspend-Workaround/data/icon.png 1970-01-01 00:00:00 +0000 and Suspend-Workaround/data/icon.png 2014-09-03 02:30:44 +0000 differ === added directory 'Suspend-Workaround/src' === added file 'Suspend-Workaround/src/CMakeLists.txt' --- Suspend-Workaround/src/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ Suspend-Workaround/src/CMakeLists.txt 2014-09-03 02:30:44 +0000 @@ -0,0 +1,38 @@ + +########### sources ############### + +SET(MODULE_SRCS + applet-struct.h + applet-init.c + applet-init.h + applet-config.h +) + +add_library(${PACKAGE_SUSPEND_WORKAROUND} SHARED ${MODULE_SRCS}) + +########### compil ############### +add_definitions (-DMY_APPLET_SHARE_DATA_DIR="${suspendworkarounddatadir}") +add_definitions (-DMY_APPLET_PREVIEW_FILE="icon.png") +add_definitions (-DMY_APPLET_CONF_FILE="Suspend-Workaround.conf") +add_definitions (-DMY_APPLET_USER_DATA_DIR="Suspend-Workaround") +add_definitions (-DMY_APPLET_VERSION="${VERSION_SUSPEND_WORKAROUND}") +add_definitions (-DMY_APPLET_GETTEXT_DOMAIN="${GETTEXT_SUSPEND_WORKAROUND}") +add_definitions (-DMY_APPLET_DOCK_VERSION="${dock_version}") +add_definitions (-DMY_APPLET_ICON_FILE="icon.png") +### uncomment the following line to allow multi-instance applet. +#add_definitions (-DCD_APPLET_MULTI_INSTANCE="1") +### uncomment the following line to allow extended OpenGL drawing. +#add_definitions (-DGL_GLEXT_PROTOTYPES="1") + +include_directories ( + ${PACKAGE_INCLUDE_DIRS}) + +link_directories ( + ${PACKAGE_LIBRARY_DIRS}) + +target_link_libraries (${PACKAGE_SUSPEND_WORKAROUND} + ${PACKAGE_LIBRARIES}) + +########### install files ############### + +install(TARGETS ${PACKAGE_SUSPEND_WORKAROUND} DESTINATION ${pluginsdir}) === added file 'Suspend-Workaround/src/applet-config.h' --- Suspend-Workaround/src/applet-config.h 1970-01-01 00:00:00 +0000 +++ Suspend-Workaround/src/applet-config.h 2014-09-03 02:30:44 +0000 @@ -0,0 +1,30 @@ +/** +* This file is a part of the Cairo-Dock project +* +* Copyright : (C) see the 'copyright' file. +* E-mail : see the 'copyright' file. +* +* 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 3 +* 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. +* You should have received a copy of the GNU General Public License +* along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + + +#ifndef __APPLET_CONFIG__ +#define __APPLET_CONFIG__ + +#include <cairo-dock.h> + + +CD_APPLET_CONFIG_H + + +#endif === added file 'Suspend-Workaround/src/applet-init.c' --- Suspend-Workaround/src/applet-init.c 1970-01-01 00:00:00 +0000 +++ Suspend-Workaround/src/applet-init.c 2014-09-03 02:30:44 +0000 @@ -0,0 +1,157 @@ +/** +* This file is a part of the Cairo-Dock project +* +* Copyright : (C) see the 'copyright' file. +* E-mail : see the 'copyright' file. +* +* 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 3 +* 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. +* You should have received a copy of the GNU General Public License +* along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#include "stdlib.h" + +#include "applet-config.h" +#include "applet-struct.h" +#include "applet-init.h" + +#define SIGNAL_TYPE_LOGIN1 0 +#define SIGNAL_TYPE_UPOWER 1 + +#define APPLET_NAME "Suspend-Workaround" +#define APPLET_LOG APPLET_NAME " > " + +CD_APPLET_DEFINE_BEGIN( APPLET_NAME, + 1, 0, 0, + CAIRO_DOCK_CATEGORY_APPLET_SYSTEM, + N_("This plug-in is a workaround that fixes the icon corruption that " + "happens with some graphic cards (e.g. nvidia) when suspending the computer"), + "Jesús González" ) + pInterface->initModule = CD_APPLET_INIT_FUNC; + pInterface->stopModule = CD_APPLET_STOP_FUNC; + CD_APPLET_SET_CONTAINER_TYPE( CAIRO_DOCK_MODULE_IS_PLUGIN ); + CD_APPLET_REDEFINE_TITLE (N_("Corruption-on-Suspend workaround")) +CD_APPLET_DEFINE_END + +#define DBUS_POWER_OBJECT_INFO_SIZE 2 + +struct _dbus_power_object_info dbus_power_object_info[DBUS_POWER_OBJECT_INFO_SIZE] = +{ + { + "org.freedesktop.login1", "/org/freedesktop/login1", "org.freedesktop.login1.Manager", "PrepareForSleep", G_TYPE_BOOLEAN, + }, + { + "org.freedesktop.UPower", "/org/freedesktop/UPower", "org.freedesktop.UPower", "Resuming", G_TYPE_NONE, + } +}; + +static void _on_resuming(void) +{ + cd_message( APPLET_LOG "Resuming from sleep" ); + cairo_dock_load_current_theme(); +} + +static void _on_prepare_for_sleep( DBusGProxy* proxy, gboolean going_to_sleep, gpointer userData ) +{ + if( going_to_sleep ) + { + cd_message( APPLET_LOG "Going to sleep" ); + } + else + { + _on_resuming(); + } +} + +CD_APPLET_INIT_BEGIN + + myDataPtr->power_object_info = NULL; + + DBusGProxy *pMainProxy = cairo_dock_get_main_system_proxy(); + if( pMainProxy == NULL ) + { + cd_warning( APPLET_LOG "Can't get main system dbus proxy" ); + return; + } + + int pwrobj_index = 0; + gboolean pwrobj_found = FALSE; + while( (pwrobj_index < DBUS_POWER_OBJECT_INFO_SIZE) ) { + org_freedesktop_DBus_name_has_owner( pMainProxy, dbus_power_object_info[pwrobj_index].name, &pwrobj_found, NULL ); + if( pwrobj_found ) + { + break; + } + pwrobj_index++; + } + + if( !pwrobj_found ) + { + cd_warning( APPLET_LOG "Power management object not available on dbus" ); + return; + } + + myDataPtr->power_object_info = &dbus_power_object_info[pwrobj_index]; + + cd_message( APPLET_LOG "Power management object used is %s", myDataPtr->power_object_info->name ); + + myDataPtr->pProxy = cairo_dock_create_new_system_proxy( myDataPtr->power_object_info->name, myDataPtr->power_object_info->path, myDataPtr->power_object_info->interface ); + if( myDataPtr->pProxy == NULL ) + { + cd_warning( APPLET_LOG "Error accessing power management object on dbus" ); + return; + } + + if( myDataPtr->power_object_info->signal_type == SIGNAL_TYPE_UPOWER ) + { + dbus_g_object_register_marshaller ( + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + G_TYPE_INVALID); + + dbus_g_proxy_add_signal( myDataPtr->pProxy, myDataPtr->power_object_info->resume_signal, G_TYPE_INVALID ); + dbus_g_proxy_connect_signal( myDataPtr->pProxy, myDataPtr->power_object_info->resume_signal, G_CALLBACK( _on_resuming ), NULL, NULL ); + } + else + { + dbus_g_object_register_marshaller ( + g_cclosure_marshal_VOID__BOOLEAN, + G_TYPE_NONE, + G_TYPE_BOOLEAN, + G_TYPE_INVALID); + + dbus_g_proxy_add_signal( myDataPtr->pProxy, myDataPtr->power_object_info->resume_signal, G_TYPE_BOOLEAN, G_TYPE_INVALID ); + dbus_g_proxy_connect_signal( myDataPtr->pProxy, myDataPtr->power_object_info->resume_signal, G_CALLBACK( _on_prepare_for_sleep ), NULL, NULL ); + } + + cd_message( APPLET_LOG "Listening for power management events..." ); + +CD_APPLET_INIT_END + + +CD_APPLET_STOP_BEGIN + + if( myDataPtr->pProxy != NULL ) + { + if( myDataPtr->power_object_info->signal_type == SIGNAL_TYPE_UPOWER ) + { + dbus_g_proxy_disconnect_signal( myDataPtr->pProxy, myDataPtr->power_object_info->resume_signal, G_CALLBACK( _on_resuming ), NULL); + } + else + { + dbus_g_proxy_disconnect_signal( myDataPtr->pProxy, myDataPtr->power_object_info->resume_signal, G_CALLBACK( _on_prepare_for_sleep ), NULL); + } + g_object_unref( myDataPtr->pProxy ); + } + + cd_message( APPLET_LOG "Stopped listening for power management events" ); + +CD_APPLET_STOP_END === added file 'Suspend-Workaround/src/applet-init.h' --- Suspend-Workaround/src/applet-init.h 1970-01-01 00:00:00 +0000 +++ Suspend-Workaround/src/applet-init.h 2014-09-03 02:30:44 +0000 @@ -0,0 +1,31 @@ +/** +* This file is a part of the Cairo-Dock project +* +* Copyright : (C) see the 'copyright' file. +* E-mail : see the 'copyright' file. +* +* 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 3 +* 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. +* You should have received a copy of the GNU General Public License +* along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + + +#ifndef __APPLET_INIT__ +#define __APPLET_INIT__ + + +#include <cairo-dock.h> + + +CD_APPLET_H + + +#endif === added file 'Suspend-Workaround/src/applet-struct.h' --- Suspend-Workaround/src/applet-struct.h 1970-01-01 00:00:00 +0000 +++ Suspend-Workaround/src/applet-struct.h 2014-09-03 02:30:44 +0000 @@ -0,0 +1,47 @@ +/** +* This file is a part of the Cairo-Dock project +* +* Copyright : (C) see the 'copyright' file. +* E-mail : see the 'copyright' file. +* +* 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 3 +* 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. +* You should have received a copy of the GNU General Public License +* along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + + +#ifndef __CD_APPLET_STRUCT__ +#define __CD_APPLET_STRUCT__ + +#include <cairo-dock.h> + +#include <dbus/dbus-glib.h> + +//\___________ structure containing the applet's configuration parameters. +struct _AppletConfig { +} ; + +struct _dbus_power_object_info { + char* name; + char* path; + char* interface; + char* resume_signal; + int signal_type; +}; + +//\___________ structure containing the applet's data, like surfaces, dialogs, results of calculus, etc. +struct _AppletData { + DBusGProxy *pProxy; + struct _dbus_power_object_info *power_object_info; +} ; + + +#endif === modified file 'System-Monitor/src/applet-monitor.c' === modified file 'System-Monitor/src/applet-rame.c' === modified file 'System-Monitor/src/applet-struct.h' === modified file 'icon-effect/data/icon-effect.conf.in' --- icon-effect/data/icon-effect.conf.in 2014-06-29 14:42:32 +0000 +++ icon-effect/data/icon-effect.conf.in 2014-09-03 02:30:44 +0000 @@ -15,9 +15,15 @@ #V+[Fire;Stars;Rain;Snow;Storm;Firework] Effects used on launcher: click launchers = 0 +<<<<<<< TREE #b Repeat these effects until the corresponding application opens? opening animation = true +======= +#b Repeat these effects until the corresponding application opens? +opening animation = false + +>>>>>>> MERGE-SOURCE #F-[when clicking on an application] frame_appli = === modified file 'icon-effect/src/applet-config.c' === modified file 'musicPlayer/src/applet-init.c' === modified file 'musicPlayer/src/applet-musicplayer.c' === modified file 'musicPlayer/src/applet-notifications.c' === modified file 'po/ca.po' --- po/ca.po 2014-08-17 23:14:15 +0000 +++ po/ca.po 2014-09-03 02:30:44 +0000 @@ -7,15 +7,26 @@ msgstr "" "Project-Id-Version: cairo-dock-plug-ins\n" "Report-Msgid-Bugs-To: fabou...@glx-dock.org\n" -"PO-Revision-Date: 2013-10-25 22:37+0000\n" -"Last-Translator: Sergi Parra i Ramírez <egrupopa...@gmail.com>\n" +<<<<<<< TREE +"PO-Revision-Date: 2013-10-25 22:37+0000\n" +"Last-Translator: Sergi Parra i Ramírez <egrupopa...@gmail.com>\n" +======= +"POT-Creation-Date: 2013-09-23 10:57+0000\n" +"PO-Revision-Date: 2013-10-25 22:37+0000\n" +"Last-Translator: Sergi Parra i Ramírez <egrupopa...@gmail.com>\n" +>>>>>>> MERGE-SOURCE "Language-Team: Catalan <c...@li.org>\n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +<<<<<<< TREE "X-Launchpad-Export-Date: 2014-06-14 05:48+0000\n" "X-Generator: Launchpad (build 17045)\n" +======= +"X-Launchpad-Export-Date: 2013-10-26 05:53+0000\n" +"X-Generator: Launchpad (build 16810)\n" +>>>>>>> MERGE-SOURCE #: ../Animated-icons/src/applet-blink.c:77 ../Animated-icons/data/messages:11 #: ../Animated-icons/data/messages:31 ../Animated-icons/data/messages:55 @@ -807,6 +818,17 @@ msgid "Enter a command to launch:" msgstr "Escriviu la comanda per executar" +<<<<<<< TREE +======= +#: ../GMenu/src/applet-apps.c:67 +msgid "Launch this new application?" +msgstr "Carrega aquesta aplicació?" + +#: ../GMenu/src/applet-entry.c:435 +msgid "Launch this command" +msgstr "Executa aquesta comanda" + +>>>>>>> MERGE-SOURCE #: ../Global-Menu/src/applet-init.c:30 msgid "Global Menu" msgstr "Menú global" @@ -1160,6 +1182,7 @@ #: ../Recent-Events/src/applet-dialog.c:405 msgid "All" +<<<<<<< TREE msgstr "Tot" #: ../Recent-Events/src/applet-dialog.c:406 @@ -1173,15 +1196,29 @@ #: ../Recent-Events/src/applet-dialog.c:409 ../drop-indicator/data/messages:3 msgid "Images" msgstr "" +======= +msgstr "Tot" +>>>>>>> MERGE-SOURCE #: ../Recent-Events/src/applet-dialog.c:410 +<<<<<<< TREE msgid "Audio" msgstr "Àudio" +======= +msgid "Applications" +msgstr "Aplicacions" +>>>>>>> MERGE-SOURCE #: ../Recent-Events/src/applet-dialog.c:411 +<<<<<<< TREE msgid "Videos" msgstr "" +======= +msgid "Document" +msgstr "Document" +>>>>>>> MERGE-SOURCE +<<<<<<< TREE #: ../Recent-Events/src/applet-dialog.c:412 msgid "Web" msgstr "Web" @@ -1189,8 +1226,32 @@ #: ../Recent-Events/src/applet-dialog.c:413 msgid "Others" msgstr "" +======= +#: ../Recent-Events/src/applet-dialog.c:413 ../logout/data/messages:117 +msgid "Image" +msgstr "Imatge" +>>>>>>> MERGE-SOURCE #: ../Recent-Events/src/applet-dialog.c:414 +<<<<<<< TREE +======= +msgid "Audio" +msgstr "Àudio" + +#: ../Recent-Events/src/applet-dialog.c:415 +msgid "Video" +msgstr "Vídeo" + +#: ../Recent-Events/src/applet-dialog.c:416 +msgid "Web" +msgstr "Web" + +#: ../Recent-Events/src/applet-dialog.c:417 +msgid "Other" +msgstr "Altre" + +#: ../Recent-Events/src/applet-dialog.c:418 +>>>>>>> MERGE-SOURCE msgid "Top Results" msgstr "Resultats principals" === modified file 'po/de.po' --- po/de.po 2014-08-17 23:14:15 +0000 +++ po/de.po 2014-09-03 02:30:44 +0000 @@ -8,15 +8,31 @@ msgstr "" "Project-Id-Version: cairo-dock-plug-ins\n" "Report-Msgid-Bugs-To: fabou...@glx-dock.org\n" +<<<<<<< TREE "PO-Revision-Date: 2014-06-13 21:26+0000\n" "Last-Translator: Matthieu Baerts <matt...@gmail.com>\n" +======= +"POT-Creation-Date: 2013-09-23 10:57+0000\n" +"PO-Revision-Date: 2013-10-29 02:10+0000\n" +"Last-Translator: Tobias B. <Unknown>\n" +>>>>>>> MERGE-SOURCE "Language-Team: German <d...@li.org>\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +<<<<<<< TREE "X-Launchpad-Export-Date: 2014-06-14 05:49+0000\n" "X-Generator: Launchpad (build 17045)\n" +======= +"X-Launchpad-Export-Date: 2013-10-29 04:59+0000\n" +"X-Generator: Launchpad (build 16818)\n" +"Language: de\n" +>>>>>>> MERGE-SOURCE + +#: ../shortcuts/src/applet-init.c:32 +msgid "shortcuts" +msgstr "Lesezeichen" #: ../Animated-icons/src/applet-blink.c:77 ../Animated-icons/data/messages:11 #: ../Animated-icons/data/messages:31 ../Animated-icons/data/messages:55 @@ -833,7 +849,11 @@ #: ../GMenu/src/applet-notifications.c:102 msgid "None of these applications seems available:" +<<<<<<< TREE msgstr "Keine dieser Anwendungen scheint verfügbar zu sein:" +======= +msgstr "Keine dieser Applikationen scheint verfügbar zu sein :" +>>>>>>> MERGE-SOURCE #: ../GMenu/src/applet-notifications.c:110 msgid "Clear recent" @@ -851,6 +871,17 @@ msgid "Enter a command to launch:" msgstr "Kommando zum Ausführen eingeben :" +<<<<<<< TREE +======= +#: ../GMenu/src/applet-apps.c:67 +msgid "Launch this new application?" +msgstr "Diese neue Applikation starten ?" + +#: ../GMenu/src/applet-entry.c:435 +msgid "Launch this command" +msgstr "Dieses Kommando ausführen" + +>>>>>>> MERGE-SOURCE #: ../Global-Menu/src/applet-init.c:30 msgid "Global Menu" msgstr "Globales Menü" @@ -2215,7 +2246,16 @@ #: ../dnd2share/src/applet-backend-dropbox.c:63 msgid "This directory seems not valid:" -msgstr "Dieses Verzeichnis scheint nicht gültig zu sein :" +<<<<<<< TREE +msgstr "Dieses Verzeichnis scheint nicht gültig zu sein :" +======= +msgstr "Dieses Verzeichnis scheint nicht gültig zu sein :" + +#: ../dnd2share/src/applet-backend-imageshack.c:31 +#: ../dnd2share/src/applet-backend-uppix.c:31 +msgid "Thumbnail" +msgstr "Vorschaubild" +>>>>>>> MERGE-SOURCE #: ../dnd2share/src/applet-backend-imgur.c:33 msgid "Display Image" @@ -3209,7 +3249,11 @@ #: ../powermanager/src/powermanager-draw.c:204 msgid "mn" +<<<<<<< TREE msgstr "min" +======= +msgstr "Monat" +>>>>>>> MERGE-SOURCE #: ../powermanager/src/powermanager-draw.c:213 msgid "remaining" @@ -3420,10 +3464,13 @@ msgid "%s is now unmounted" msgstr "%s ist jetzt ausgehängt" +<<<<<<< TREE #: ../shortcuts/src/applet-init.c:32 msgid "shortcuts" msgstr "Lesezeichen" +======= +>>>>>>> MERGE-SOURCE #: ../shortcuts/src/applet-init.c:35 msgid "" "An applet that let you access quickly to all of your shortcuts.\n" @@ -6203,12 +6250,16 @@ #: ../GMenu/data/messages:103 msgid "Display the description in search's results?" +<<<<<<< TREE msgstr "Die Beschreibung in den Suchergebnissen anzeigen ?" #: ../GMenu/data/messages:105 msgid "Display a notification to quickly launch new applications?" msgstr "" "Eine Benachrichtigung zum schnellen Starten von neuen Anwendungen anzeigen?" +======= +msgstr "Die Beschreibung in den Suchergebnissen anzeigen ?" +>>>>>>> MERGE-SOURCE #: ../GMenu/data/messages:107 msgid "Command to use for configuring the menu:" @@ -7481,6 +7532,53 @@ msgid "Add or remove an alarm:" msgstr "Einen Alarm hinzufügen oder entfernen :" +<<<<<<< TREE +======= +#: ../dialog-rendering/data/messages:1 +msgid "Comics" +msgstr "Comics" + +#: ../dialog-rendering/data/messages:3 ../dialog-rendering/data/messages:11 +#: ../dialog-rendering/data/messages:21 ../dialog-rendering/data/messages:29 +#: ../dock-rendering/data/messages:69 +msgid "Corner radius:" +msgstr "Eckradius :" + +#: ../dialog-rendering/data/messages:5 ../dialog-rendering/data/messages:13 +#: ../dialog-rendering/data/messages:23 ../dialog-rendering/data/messages:31 +msgid "Border width:" +msgstr "Rahmenbreite:" + +#: ../dialog-rendering/data/messages:7 ../dialog-rendering/data/messages:15 +#: ../dialog-rendering/data/messages:25 ../dialog-rendering/data/messages:33 +msgid "Bubble's line colour:" +msgstr "Linienfarbe der Sprechblasen:" + +#: ../dialog-rendering/data/messages:9 +msgid "Modern" +msgstr "Modern" + +#: ../dialog-rendering/data/messages:17 +msgid "Space between lines of the tip :" +msgstr "Leerraum zwischen den Linien des Tipps :" + +#: ../dialog-rendering/data/messages:19 +msgid "Tooltip" +msgstr "Tooltipp" + +#: ../dialog-rendering/data/messages:27 +msgid "Curly" +msgstr "gewellt" + +#: ../dialog-rendering/data/messages:35 +msgid "Curvature of the tip :" +msgstr "Krümmung des Tipps :" + +#: ../dialog-rendering/data/messages:37 +msgid "Curve the sides too?" +msgstr "Die Seiten ebenfalls krümmen ?" + +>>>>>>> MERGE-SOURCE #: ../dnd2share/data/messages:87 msgid "Info-bubbles" msgstr "Informationsblasen" @@ -7582,6 +7680,13 @@ msgstr "Imgur.com" #: ../dnd2share/data/messages:147 +<<<<<<< TREE +======= +msgid "Imgur.com" +msgstr "Imgur.com" + +#: ../dnd2share/data/messages:149 +>>>>>>> MERGE-SOURCE msgid "Preferred site for videos hosting :" msgstr "Bevorzugte Seite für Videohosting :" @@ -7637,6 +7742,20 @@ msgstr "Pfad zu einem benutzerdefinierten »Dropox« / »Ubuntu One«-Ordner:" #: ../dnd2share/data/messages:181 +<<<<<<< TREE +======= +msgid "" +"Leave empty to upload files into '~/Dropbox/Public' or '~/Ubuntu One'." +msgstr "" +"Leer lassen, um die Dateien nach '~/Dropbox/Public' oder '~/Ubuntu One' " +"hochzuladen." + +#: ../dnd2share/data/messages:183 +msgid "Path of a custom DropBox / UbuntuOne folder :" +msgstr "Pfad zu einem benutzerdefinierten DropBox / UbuntuOne Verzeichnis :" + +#: ../dnd2share/data/messages:185 +>>>>>>> MERGE-SOURCE msgid "Otherwise, your user name will be used when possible." msgstr "Sonst wird ihr Benutzername verwendet, wenn möglich." @@ -8045,6 +8164,14 @@ msgid "Rotate effects with dock?" msgstr "Effekte mit dem Dock rotieren lassen ?" +<<<<<<< TREE +======= +#: ../icon-effect/data/messages:55 +msgid "Repeat these effects until the corresponding application opens?" +msgstr "" +"Diese Effekte wiederholen, bis die dazugehörige Applikation sich öffnet ?" + +>>>>>>> MERGE-SOURCE #: ../icon-effect/data/messages:59 msgid "In ms. Set 0 to not use this effect." msgstr "In ms. Auf 0 setzen, um diesen Effekt nicht zu benutzen." @@ -8275,10 +8402,15 @@ msgstr "Kommandos" #: ../logout/data/messages:123 +<<<<<<< TREE msgid "Fallback user-defined command to execute for logout in case of problem:" msgstr "" "Nutzerdefinierter Befehl, der im Falle eines Problems zum Abmelden " "ausgeführt werden soll:" +======= +msgid "User-defined command to execute for logout:" +msgstr "Benutzerdefiniertes Kommando zum Ausführen des Abmeldens:" +>>>>>>> MERGE-SOURCE #: ../logout/data/messages:125 msgid "" @@ -8292,11 +8424,16 @@ "Ausloggen." #: ../logout/data/messages:127 +<<<<<<< TREE msgid "" "Fallback user-defined command to execute for shutdown in case of problem:" msgstr "" "Nutzerdefinierter Befehl, der im Falle eines Problems zum Herunterfahren " "ausgeführt werden soll:" +======= +msgid "User-defined command to execute for shutdown:" +msgstr "Benutzerdefiniertes Kommando zum Ausführen des Herunterfahrens:" +>>>>>>> MERGE-SOURCE #: ../logout/data/messages:129 msgid "" @@ -9227,12 +9364,32 @@ msgstr "Eine benutzerdefinierte Schriftart verwenden ?" #: ../terminal/data/messages:99 +<<<<<<< TREE +======= +msgid "opaque" +msgstr "undurchsichtig" + +#: ../terminal/data/messages:101 +msgid "Foreground colour:" +msgstr "Vordergrundfarbe :" + +#: ../terminal/data/messages:105 +msgid "Use a custom font?" +msgstr "Eine benutzerdefinierte Schriftart verwenden ?" + +#: ../terminal/data/messages:107 +>>>>>>> MERGE-SOURCE msgid "Custom font:" msgstr "Benutzerdefinierte Schriftart :" #: ../terminal/data/messages:103 msgid "Automatically scroll to the bottom when new data are received" +<<<<<<< TREE msgstr "Automatisch ganz nach unten scrollen, wenn neue Daten empfangen werden" +======= +msgstr "" +"Automatisch ganz nach unten scrollen, wenn neue Daten empfangen werden" +>>>>>>> MERGE-SOURCE #: ../terminal/data/messages:105 msgid "Scroll on output" === modified file 'po/it.po' --- po/it.po 2014-08-17 23:14:15 +0000 +++ po/it.po 2014-09-03 02:30:44 +0000 @@ -7,15 +7,27 @@ msgstr "" "Project-Id-Version: 1.0.0\n" "Report-Msgid-Bugs-To: fabou...@glx-dock.org\n" +<<<<<<< TREE "PO-Revision-Date: 2014-06-13 21:32+0000\n" "Last-Translator: Matthieu Baerts <matt...@gmail.com>\n" +======= +"POT-Creation-Date: 2013-09-23 10:57+0000\n" +"PO-Revision-Date: 2013-10-19 13:32+0000\n" +"Last-Translator: Wonderfulheart <Unknown>\n" +>>>>>>> MERGE-SOURCE "Language-Team: Italian <l...@li.org>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +<<<<<<< TREE "X-Launchpad-Export-Date: 2014-06-14 05:50+0000\n" "X-Generator: Launchpad (build 17045)\n" +======= +"X-Launchpad-Export-Date: 2013-10-20 04:42+0000\n" +"X-Generator: Launchpad (build 16807)\n" +"Language: it\n" +>>>>>>> MERGE-SOURCE #: ../Animated-icons/src/applet-blink.c:77 ../Animated-icons/data/messages:11 #: ../Animated-icons/data/messages:31 ../Animated-icons/data/messages:55 @@ -839,6 +851,17 @@ msgid "Enter a command to launch:" msgstr "Inserisci un comando da lanciare:" +<<<<<<< TREE +======= +#: ../GMenu/src/applet-apps.c:67 +msgid "Launch this new application?" +msgstr "Lancio questa nuova applicazione?" + +#: ../GMenu/src/applet-entry.c:435 +msgid "Launch this command" +msgstr "Lancia questo comando" + +>>>>>>> MERGE-SOURCE #: ../Global-Menu/src/applet-init.c:30 msgid "Global Menu" msgstr "Menù Globale" @@ -6147,6 +6170,7 @@ #: ../GMenu/data/messages:103 msgid "Display the description in search's results?" +<<<<<<< TREE msgstr "Visualizzo la descrizione nei risultati della ricerca?" #: ../GMenu/data/messages:105 @@ -6154,6 +6178,11 @@ msgstr "Visualizzo una notifica per l'avvio rapido delle nuove applicazioni?" #: ../GMenu/data/messages:107 +======= +msgstr "Visualizzo la descrizione nei risultati della ricerca?" + +#: ../GMenu-old/data/messages:105 ../GMenu/data/messages:105 +>>>>>>> MERGE-SOURCE msgid "Command to use for configuring the menu:" msgstr "Comando da utilizzare per configurare il menù:" @@ -8652,7 +8681,15 @@ #: ../quick-browser/data/messages:107 msgid "Display icons in the menu?" -msgstr "Mostrare le icone nel menù?" +<<<<<<< TREE +msgstr "Mostrare le icone nel menù?" +======= +msgstr "Mostrare le icone nel menù?" + +#: ../quick-browser/data/messages:109 +msgid "Icon size :" +msgstr "Dimensione dell'icona:" +>>>>>>> MERGE-SOURCE #: ../quick-browser/data/messages:111 msgid "" === modified file 'po/ru.po' --- po/ru.po 2014-08-17 23:14:15 +0000 +++ po/ru.po 2014-09-03 02:30:44 +0000 @@ -7,15 +7,45 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: fabou...@glx-dock.org\n" +<<<<<<< TREE "PO-Revision-Date: 2014-06-13 21:39+0000\n" "Last-Translator: Matthieu Baerts <matt...@gmail.com>\n" +======= +"POT-Creation-Date: 2013-09-23 10:57+0000\n" +"PO-Revision-Date: 2013-10-23 10:36+0000\n" +"Last-Translator: fossil <Unknown>\n" +>>>>>>> MERGE-SOURCE "Language-Team: LANGUAGE <l...@li.org>\n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +<<<<<<< TREE "X-Launchpad-Export-Date: 2014-06-14 05:51+0000\n" "X-Generator: Launchpad (build 17045)\n" +======= +"X-Launchpad-Export-Date: 2013-10-24 04:48+0000\n" +"X-Generator: Launchpad (build 16810)\n" +"Language: \n" + +#: ../Cairo-Penguin/src/applet-init.c:33 +msgid "" +"Add a lively Penguin in your dock !\n" +"Left click to change the animation,\n" +"Middle-click to disturb him ^_^\n" +"Tux images are taken from Pingus, some other characters are available or can " +"be added easily." +msgstr "" +"Добавьте симпатичного пингвинчика к себе на панель!\n" +"Левым щелчком менять анимацию,\n" +"Средним - побеспокоить его ^_^\n" +"Изображения Тукса взяты из Pingus, есть и другие персонажи, а также можно с " +"лёгкостью подключить своих." + +#: ../Cairo-Penguin/src/applet-init.c:39 +msgid "Cairo-Penguin" +msgstr "Cairo-Пингвин" +>>>>>>> MERGE-SOURCE #: ../Animated-icons/src/applet-blink.c:77 ../Animated-icons/data/messages:11 #: ../Animated-icons/data/messages:31 ../Animated-icons/data/messages:55 @@ -2117,6 +2147,14 @@ msgid "This directory seems not valid:" msgstr "" +<<<<<<< TREE +======= +#: ../dnd2share/src/applet-backend-imageshack.c:31 +#: ../dnd2share/src/applet-backend-uppix.c:31 +msgid "Thumbnail" +msgstr "Миниатюра" + +>>>>>>> MERGE-SOURCE #: ../dnd2share/src/applet-backend-imgur.c:33 msgid "Display Image" msgstr "" @@ -7359,6 +7397,13 @@ msgstr "Imgur.com" #: ../dnd2share/data/messages:147 +<<<<<<< TREE +======= +msgid "Imgur.com" +msgstr "Imgur.com" + +#: ../dnd2share/data/messages:149 +>>>>>>> MERGE-SOURCE msgid "Preferred site for videos hosting :" msgstr "Предпочитаемые сайты для видео:" === modified file 'po/sr.po' --- po/sr.po 2014-08-17 23:14:15 +0000 +++ po/sr.po 2014-09-03 02:30:44 +0000 @@ -5,15 +5,26 @@ msgstr "" "Project-Id-Version: то\n" "Report-Msgid-Bugs-To: fabou...@glx-dock.org\n" +<<<<<<< TREE "PO-Revision-Date: 2014-06-13 21:44+0000\n" +======= +"POT-Creation-Date: 2013-09-23 10:57+0000\n" +"PO-Revision-Date: 2013-10-01 05:55+0000\n" +>>>>>>> MERGE-SOURCE "Last-Translator: Саша Петровић <salepetron...@gmail.com>\n" "Language-Team: српски <српски <xfce-i...@xfce.org>>\n" "Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +<<<<<<< TREE "X-Launchpad-Export-Date: 2014-06-14 05:52+0000\n" "X-Generator: Launchpad (build 17045)\n" +======= +"X-Launchpad-Export-Date: 2013-10-02 05:20+0000\n" +"X-Generator: Launchpad (build 16774)\n" +"Language: sr\n" +>>>>>>> MERGE-SOURCE #: ../Animated-icons/src/applet-blink.c:77 ../Animated-icons/data/messages:11 #: ../Animated-icons/data/messages:31 ../Animated-icons/data/messages:55 @@ -828,6 +839,17 @@ msgid "Enter a command to launch:" msgstr "Унесите наредбу за покретање:" +<<<<<<< TREE +======= +#: ../GMenu/src/applet-apps.c:67 +msgid "Launch this new application?" +msgstr "Да ли да покренем оваај нови програм?" + +#: ../GMenu/src/applet-entry.c:435 +msgid "Launch this command" +msgstr "Покрени ову наредбу" + +>>>>>>> MERGE-SOURCE #: ../Global-Menu/src/applet-init.c:30 msgid "Global Menu" msgstr "Општи изборник" @@ -6099,6 +6121,7 @@ #: ../GMenu/data/messages:103 msgid "Display the description in search's results?" +<<<<<<< TREE msgstr "Да ли приказивати опис у излазиме претраге?" #: ../GMenu/data/messages:105 @@ -6106,6 +6129,11 @@ msgstr "Да ли да приказујем обавештења за брзо покретање нових програма?" #: ../GMenu/data/messages:107 +======= +msgstr "Да ли приказивати опис у излазиме претраге?" + +#: ../GMenu-old/data/messages:105 ../GMenu/data/messages:105 +>>>>>>> MERGE-SOURCE msgid "Command to use for configuring the menu:" msgstr "Наредба која ће се користити за подешавање изборника:" === modified file 'po/uk.po' --- po/uk.po 2014-08-17 23:14:15 +0000 +++ po/uk.po 2014-09-03 02:30:44 +0000 @@ -7,15 +7,27 @@ msgstr "" "Project-Id-Version: cairo-dock-plug-ins\n" "Report-Msgid-Bugs-To: fabou...@glx-dock.org\n" +<<<<<<< TREE "PO-Revision-Date: 2014-06-13 21:35+0000\n" "Last-Translator: Matthieu Baerts <matt...@gmail.com>\n" +======= +"POT-Creation-Date: 2013-09-23 10:57+0000\n" +"PO-Revision-Date: 2013-10-14 21:07+0000\n" +"Last-Translator: ma$terok <Unknown>\n" +>>>>>>> MERGE-SOURCE "Language-Team: Ukrainian <u...@li.org>\n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +<<<<<<< TREE "X-Launchpad-Export-Date: 2014-06-14 05:53+0000\n" "X-Generator: Launchpad (build 17045)\n" +======= +"X-Launchpad-Export-Date: 2013-10-15 04:44+0000\n" +"X-Generator: Launchpad (build 16799)\n" +"Language: uk\n" +>>>>>>> MERGE-SOURCE #: ../Animated-icons/src/applet-blink.c:77 ../Animated-icons/data/messages:11 #: ../Animated-icons/data/messages:31 ../Animated-icons/data/messages:55 === modified file 'shortcuts/src/applet-bookmarks.c' --- shortcuts/src/applet-bookmarks.c 2013-12-30 15:33:02 +0000 +++ shortcuts/src/applet-bookmarks.c 2014-09-03 02:30:44 +0000 @@ -177,7 +177,11 @@ { cd_message ("The bookmarks list has changed"); +<<<<<<< TREE //\____________________ Read bookmarks file +======= + //\____________________ On lit le fichier des signets. +>>>>>>> MERGE-SOURCE gchar *cContent = NULL; gsize length=0; GError *erreur = NULL; @@ -409,6 +413,52 @@ g_free (cNewLine); fclose (f); } +<<<<<<< TREE +======= +} + +static Icon * _cd_shortcuts_get_icon (gchar *cFileName, const gchar *cUserName, double fCurrentOrder) +{ + cd_debug ("New icon: %s, %s, %f", cFileName, cUserName, fCurrentOrder); + gchar *cName, *cRealURI, *cIconName; + gboolean bIsDirectory; + gint iVolumeID; + gdouble fOrder; + if (! cairo_dock_fm_get_file_info (cFileName, &cName, &cRealURI, &cIconName, + &bIsDirectory, &iVolumeID, &fOrder, CAIRO_DOCK_FM_SORT_BY_NAME)) + return NULL; + if (cUserName != NULL) + { + g_free (cName); + if (cName == NULL) // a bookmark on a unmounted system or a folder that doesn't exist any more + cName = g_strdup_printf ("%s\n[%s]", cUserName, D_("Unmounted")); + else + cName = g_strdup (cUserName); + } + else if (cName == NULL) // a bookmark on a unmounted system + { + gchar *cGuessedName = g_path_get_basename (cFileName); + cairo_dock_remove_html_spaces (cGuessedName); // or: g_uri_unescape_string + cName = g_strdup_printf ("%s\n[%s]", cGuessedName, D_("Unmounted")); + g_free (cGuessedName); + } + if (cRealURI == NULL) + cRealURI = g_strdup (cFileName); + if (cIconName == NULL) + cIconName = cairo_dock_search_icon_s_path ( + CD_SHORTCUT_DEFAULT_DIRECTORY_ICON_FILENAME, + CAIRO_DOCK_DEFAULT_ICON_SIZE); // should be the default icon + + Icon *pNewIcon = cairo_dock_create_dummy_launcher (cName, + cIconName, + cRealURI, + NULL, + fCurrentOrder); + pNewIcon->iGroup = CD_BOOKMARK_GROUP; + pNewIcon->cBaseURI = cFileName; + pNewIcon->iVolumeID = iVolumeID; + return pNewIcon; +>>>>>>> MERGE-SOURCE } GList *cd_shortcuts_list_bookmarks (gchar *cBookmarkFilePath, GldiModuleInstance *myApplet) === modified file 'shortcuts/src/applet-load-icons.c' === modified file 'shortcuts/src/applet-notifications.c' --- shortcuts/src/applet-notifications.c 2014-06-28 11:10:26 +0000 +++ shortcuts/src/applet-notifications.c 2014-09-03 02:30:44 +0000 @@ -344,11 +344,16 @@ // Click on a bookmark if (CD_APPLET_CLICKED_ICON->iGroup == (CairoDockIconGroup) CD_BOOKMARK_GROUP) { +<<<<<<< TREE CD_APPLET_ADD_IN_MENU_WITH_STOCK_AND_DATA (D_("Rename this bookmark"), GLDI_ICON_NAME_EDIT, _cd_shortcuts_rename_bookmark, CD_APPLET_MY_MENU, data); CD_APPLET_ADD_IN_MENU_WITH_STOCK_AND_DATA (D_("Remove this bookmark"), GLDI_ICON_NAME_REMOVE, _cd_shortcuts_remove_bookmark, CD_APPLET_MY_MENU, data); +======= + CD_APPLET_ADD_IN_MENU_WITH_STOCK_AND_DATA (D_("Rename this bookmark"), NULL, _cd_shortcuts_rename_bookmark, CD_APPLET_MY_MENU, data); + CD_APPLET_ADD_IN_MENU_WITH_STOCK_AND_DATA (D_("Remove this bookmark"), GTK_STOCK_REMOVE, _cd_shortcuts_remove_bookmark, CD_APPLET_MY_MENU, data); +>>>>>>> MERGE-SOURCE CD_APPLET_LEAVE (GLDI_NOTIFICATION_INTERCEPT); } else if (CD_APPLET_CLICKED_ICON->iGroup == (CairoDockIconGroup) CD_DRIVE_GROUP === modified file 'shortcuts/src/applet-struct.h' --- shortcuts/src/applet-struct.h 2014-08-17 22:45:21 +0000 +++ shortcuts/src/applet-struct.h 2014-09-03 02:30:44 +0000 @@ -23,7 +23,10 @@ #include <cairo-dock.h> +<<<<<<< TREE #define CD_VOLUME_ID_BOOKMARK_CMD -1 +======= +>>>>>>> MERGE-SOURCE typedef enum { CD_SHOW_NOTHING=0, === modified file 'weather/src/applet-notifications.c'
_______________________________________________ Mailing list: https://launchpad.net/~cairo-dock-team Post to : cairo-dock-team@lists.launchpad.net Unsubscribe : https://launchpad.net/~cairo-dock-team More help : https://help.launchpad.net/ListHelp