← Back to branch summary

~ubuntu-branches/ubuntu/precise/cairo-dock/precise-updates

« back to all changes in this revision

Viewing changes to src/cairo-dock-gui-backend.c

  • Committer: Package Import Robot
  • Author(s): Matthieu Baerts (matttbe)
  • Date: 2012-02-16 01:08:11 UTC
  • mfrom: (1.1.21)
  • Revision ID: package-import@ubuntu.com-20120216010811-yhscmns26s6ngil8
Tags: 3.0.0.0beta1-0ubuntu1
https://launchpad.net/bugs/932041
* New upstream release. (LP: #932041)
* Upstream (short) ChangeLog:
 - The taskbar has been greatly enhanced.
 - The control of the dock from the keyboard is now very powerful:
  - many shortkeys have been added in different applets
  - you can activate a launcher by pressing a shortkey + its number
  - all shortkeys can now be managed in a single place
     in the configuration window.
 - A new Twitter applet lets you tweet in one click.
 - A new applet to inhibit the screensaver in one click.
 - Cairo-Dock now uses GTK3, for a better integration in a Gnome desktop
 - It's possible to donate to support the project!
 - (...)
* debian/patches:
 - Removed all previous patches (now in upstream)
* debian/rules and debian/control:
 - Added multiarch support
* debian/control:
 - libgtk-3-dev is now needed instead of libgtk2.0-dev
 - libgtkglext1-dev is no longer needed
    (replaced by libgl, libglu and libpango)
 - cairo-dock: increase the version of plug-ins packages
    and added: cairo-dock-plug-ins-dbus-interface-python
 - cairo-dock-dev has been replaced by libgldi-dev
    and dependences have been updated
 - Added a new package (libgldi3) in order to support multiarch
    and to fix this lintian error: package-name-doesnt-match-sonames
* debian/cairo-dock-core.install and debian/libgldi3.install:
 - libgldi3 package has been added
 - It contains the library used by cairo-dock
 - MultiArch is supported
* debian/cairo-dock-dev.install and debian/libgldi-dev.install:
 - cairo-dock-dev has been replaced by libgldi-dev
* Updated debian/watch

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/cairo-dock-gui-backend.c
24
24
#include <glib/gstdio.h>
25
25
#include <glib/gi18n.h>
26
26
 
27
 
#include "cairo-dock-config.h"
 
27
#include "cairo-dock-keyfile-utilities.h"
28
28
#include "cairo-dock-gui-main.h"
29
29
#include "cairo-dock-gui-simple.h"
30
30
#include "cairo-dock-gui-manager.h"
103
103
        s_iSidUpdateDesklet = 0;
104
104
        return FALSE;
105
105
}
106
 
static gboolean _on_stop_desklet (gpointer pUserData, CairoDesklet *pDesklet)
 
106
static gboolean _on_desklet_destroyed (gpointer pUserData, CairoDesklet *pDesklet)
107
107
{
108
108
        if (s_DeskletToUpdate == pDesklet)  // the desklet we were about to update has been destroyed, cancel.
109
109
        {
136
136
                        NULL);
137
137
                s_DeskletToUpdate = pDesklet;
138
138
                cairo_dock_register_notification_on_object (pDesklet,
139
 
                        NOTIFICATION_STOP_DESKLET,
140
 
                        (CairoDockNotificationFunc) _on_stop_desklet,
 
139
                        NOTIFICATION_DESTROY,
 
140
                        (CairoDockNotificationFunc) _on_desklet_destroyed,
141
141
                        CAIRO_DOCK_RUN_AFTER, NULL);
142
142
        }
143
143
}
175
175
                        NULL);
176
176
                s_DeskletToUpdate = pDesklet;
177
177
                cairo_dock_register_notification_on_object (pDesklet,
178
 
                        NOTIFICATION_STOP_DESKLET,
179
 
                        (CairoDockNotificationFunc) _on_stop_desklet,
 
178
                        NOTIFICATION_DESTROY,
 
179
                        (CairoDockNotificationFunc) _on_desklet_destroyed,
180
180
                        CAIRO_DOCK_RUN_AFTER, NULL);
181
181
        }
182
182
}
249
249
}
250
250
 
251
251
 
 
252
static guint s_iSidReloadShortkeys = 0;
 
253
static gboolean _update_shortkeys (gpointer data)
 
254
{
 
255
        if (s_pMainGuiBackend && s_pMainGuiBackend->update_shortkeys)
 
256
                s_pMainGuiBackend->update_shortkeys ();
 
257
        
 
258
        s_iSidReloadShortkeys = 0;
 
259
        return FALSE;
 
260
}
 
261
void cairo_dock_gui_trigger_reload_shortkeys (void)
 
262
{
 
263
        if (s_iSidReloadShortkeys == 0)
 
264
        {
 
265
                s_iSidReloadShortkeys = g_idle_add_full (G_PRIORITY_LOW,
 
266
                        (GSourceFunc) _update_shortkeys,
 
267
                        NULL,
 
268
                        NULL);
 
269
        }
 
270
}
 
271
 
 
272
 
252
273
void cairo_dock_gui_trigger_update_module_container (CairoDockModuleInstance *pInstance, gboolean bIsDetached)
253
274
{
254
275
        if (s_pMainGuiBackend && s_pMainGuiBackend->update_module_instance_container)