← Back to branch summary

~ubuntu-branches/ubuntu/utopic/awn-extras-applets/utopic

« back to all changes in this revision

Viewing changes to applets/maintained/showdesktop/applet.c

  • Committer: Bazaar Package Importer
  • Author(s): Julien Lavergne
  • Date: 2010-04-11 22:38:55 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20100411223855-mamzuv887xyms08b
Tags: 0.4.0-0ubuntu1
https://launchpad.net/bugs/511256
https://launchpad.net/bugs/545164
https://launchpad.net/bugs/556175
https://launchpad.net/bugs/558463
https://launchpad.net/bugs/551119
https://launchpad.net/bugs/552376
* New upstream release.
 - Close cairo-menu after a click (LP: #511256)
 - Fix crash of awn-system-monitor (LP: #545164)
 - Fix crash when removing a volume >1 or adding volume >1 or using prefs
   while > 1 volumes is present (LP: #556175)
 - Fix crash of media-control when Rhythmbox quit (LP: #558463)
 - Fix crash of file-browser-launcher when there is no .gtk-bookmarks
   (LP: #551119)
* debian/awn-c-extras.install: 
 - Install icons and ini files for webapplets
* debian/awn-python-core.install:
 - Install ui file for comics (LP: #552376)
* debian/patches:
 - 03-remove-cairo-menu-pref.patch: Merged upstream.
 - 04-tomboy-threading-free.patch: Merged upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
applets/maintained/showdesktop/applet.c
82
82
static void show_desktop_finalize (GObject* obj);
83
83
AwnApplet* awn_applet_factory_initp (const char* canonical_name, const char* uid, gint panel_id);
84
84
 
85
 
static const char* SHOW_DESKTOP_authors[] = {"Mark Lee <avant-wn@lazymalevolence.com>"};
 
85
static const char* SHOW_DESKTOP_authors[1] = {"Mark Lee <avant-wn@lazymalevolence.com>"};
86
86
 
87
87
 
88
88
static void _show_desktop_on_clicked_awn_applet_simple_clicked (AwnAppletSimple* _sender, gpointer self) {
155
155
 
156
156
 
157
157
static gboolean show_desktop_on_map_event (ShowDesktop* self, GdkEvent* event) {
158
 
        gboolean result;
 
158
        gboolean result = FALSE;
159
159
        AwnIcon* _tmp0_;
160
160
        AwnTooltip* tooltip;
161
161
        g_return_val_if_fail (self != NULL, FALSE);
231
231
 
232
232
 
233
233
GType show_desktop_get_type (void) {
234
 
        static GType show_desktop_type_id = 0;
235
 
        if (show_desktop_type_id == 0) {
 
234
        static volatile gsize show_desktop_type_id__volatile = 0;
 
235
        if (g_once_init_enter (&show_desktop_type_id__volatile)) {
236
236
                static const GTypeInfo g_define_type_info = { sizeof (ShowDesktopClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) show_desktop_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ShowDesktop), 0, (GInstanceInitFunc) show_desktop_instance_init, NULL };
 
237
                GType show_desktop_type_id;
237
238
                show_desktop_type_id = g_type_register_static (AWN_TYPE_APPLET_SIMPLE, "ShowDesktop", &g_define_type_info, 0);
 
239
                g_once_init_leave (&show_desktop_type_id__volatile, show_desktop_type_id);
238
240
        }
239
 
        return show_desktop_type_id;
 
241
        return show_desktop_type_id__volatile;
240
242
}
241
243
 
242
244
 
243
245
AwnApplet* awn_applet_factory_initp (const char* canonical_name, const char* uid, gint panel_id) {
244
 
        AwnApplet* result;
 
246
        AwnApplet* result = NULL;
245
247
        g_return_val_if_fail (canonical_name != NULL, NULL);
246
248
        g_return_val_if_fail (uid != NULL, NULL);
247
249
        setlocale (LC_ALL, "");