← Back to branch summary

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

« back to all changes in this revision

Viewing changes to applets/maintained/notification-area/na-prefs.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/notification-area/na-prefs.c
357
357
 
358
358
 
359
359
GtkDialog* notification_area_prefs_get_dialog (NotificationAreaPrefs* self) {
360
 
        GtkDialog* result;
 
360
        GtkDialog* result = NULL;
361
361
        g_return_val_if_fail (self != NULL, NULL);
362
362
        result = self->priv->dialog;
363
363
        return result;
524
524
 
525
525
 
526
526
GType notification_area_prefs_get_type (void) {
527
 
        static GType notification_area_prefs_type_id = 0;
528
 
        if (notification_area_prefs_type_id == 0) {
 
527
        static volatile gsize notification_area_prefs_type_id__volatile = 0;
 
528
        if (g_once_init_enter (&notification_area_prefs_type_id__volatile)) {
529
529
                static const GTypeInfo g_define_type_info = { sizeof (NotificationAreaPrefsClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) notification_area_prefs_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (NotificationAreaPrefs), 0, (GInstanceInitFunc) notification_area_prefs_instance_init, NULL };
 
530
                GType notification_area_prefs_type_id;
530
531
                notification_area_prefs_type_id = g_type_register_static (G_TYPE_OBJECT, "NotificationAreaPrefs", &g_define_type_info, 0);
 
532
                g_once_init_leave (&notification_area_prefs_type_id__volatile, notification_area_prefs_type_id);
531
533
        }
532
 
        return notification_area_prefs_type_id;
 
534
        return notification_area_prefs_type_id__volatile;
533
535
}
534
536
 
535
537