← Back to branch summary

~ubuntu-branches/ubuntu/saucy/gnome-shell/saucy-proposed

« back to all changes in this revision

Viewing changes to src/shell-app-system.c

Tags: upstream-3.3.90
Import upstream version 3.3.90

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/shell-app-system.c
26
26
static const char*const vendor_prefixes[] = { "gnome-",
27
27
                                              "fedora-",
28
28
                                              "mozilla-",
 
29
                                              "debian-",
29
30
                                              NULL };
30
31
 
31
32
enum {
69
70
                                             SHELL_TYPE_APP_SYSTEM,
70
71
                                             G_SIGNAL_RUN_LAST,
71
72
                                             0,
72
 
                                             NULL, NULL,
73
 
                                             g_cclosure_marshal_VOID__OBJECT,
 
73
                                             NULL, NULL, NULL,
74
74
                                             G_TYPE_NONE, 1,
75
75
                                             SHELL_TYPE_APP);
76
76
  signals[INSTALLED_CHANGED] =
78
78
                  SHELL_TYPE_APP_SYSTEM,
79
79
                  G_SIGNAL_RUN_LAST,
80
80
                  G_STRUCT_OFFSET (ShellAppSystemClass, installed_changed),
81
 
                  NULL, NULL,
82
 
                  g_cclosure_marshal_VOID__VOID,
 
81
          NULL, NULL, NULL,
83
82
                  G_TYPE_NONE, 0);
84
83
 
85
84
  g_type_class_add_private (gobject_class, sizeof (ShellAppSystemPrivate));
321
320
 
322
321
  if (!gmenu_tree_load_sync (self->priv->apps_tree, &error))
323
322
    {
324
 
      g_warning ("Failed to load apps: %s", error->message);
 
323
      if (error)
 
324
        {
 
325
          g_warning ("Failed to load apps: %s", error->message);
 
326
          g_error_free (error);
 
327
        }
 
328
      else
 
329
        {
 
330
          g_warning ("Failed to load apps");
 
331
        }
325
332
      return;
326
333
    }
327
334
 
412
419
  g_hash_table_remove_all (self->priv->setting_id_to_app);
413
420
  if (!gmenu_tree_load_sync (self->priv->settings_tree, &error))
414
421
    {
415
 
      g_warning ("Failed to load settings: %s", error->message);
 
422
      if (error)
 
423
        {
 
424
          g_warning ("Failed to load apps: %s", error->message);
 
425
          g_error_free (error);
 
426
        }
 
427
      else
 
428
        {
 
429
          g_warning ("Failed to load apps");
 
430
        }
416
431
      return;
417
432
    }
418
433