← Back to branch summary

~noskcaj/ubuntu/vivid/xfce4-panel/4.11.2

« back to all changes in this revision

Viewing changes to panel/panel-module.c

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Le Folgoc
  • Date: 2011-01-22 15:13:26 UTC
  • mfrom: (1.1.28 upstream)
  • Revision ID: james.westby@ubuntu.com-20110122151326-4k6g8xp8g1i79rr7
Tags: 4.8.0-0ubuntu1
* New upstream release.
* debian/control: bump required xfce b-deps to >= 4.8.0.

Show diffs side-by-side

added added

removed removed

Lines of Context:
panel/panel-module.c
26
26
#include <libxfce4util/libxfce4util.h>
27
27
 
28
28
#include <common/panel-private.h>
 
29
#include <common/panel-debug.h>
29
30
#include <libxfce4panel/libxfce4panel.h>
30
31
#include <libxfce4panel/xfce-panel-plugin-provider.h>
31
32
 
408
409
        module->unique_mode = UNIQUE_TRUE;
409
410
      else
410
411
        module->unique_mode = UNIQUE_FALSE;
 
412
 
 
413
       panel_debug_filtered (PANEL_DEBUG_MODULE, "new module %s, filename=%s, internal=%s",
 
414
                             name, module->filename,
 
415
                             PANEL_DEBUG_BOOL (module->mode == INTERNAL));
411
416
    }
412
417
 
413
418
  xfce_rc_close (rc);
423
428
                         gint          unique_id,
424
429
                         gchar       **arguments)
425
430
{
426
 
  GtkWidget *plugin = NULL;
 
431
  GtkWidget   *plugin = NULL;
 
432
  const gchar *debug_type = NULL;
427
433
 
428
434
  panel_return_val_if_fail (PANEL_IS_MODULE (module), NULL);
429
435
  panel_return_val_if_fail (G_IS_TYPE_MODULE (module), NULL);
450
456
                                     "comment", module->comment,
451
457
                                     "arguments", arguments,
452
458
                                     NULL);
 
459
 
 
460
              debug_type = "object-type";
453
461
            }
454
462
          else if (module->construct_func != NULL)
455
463
            {
460
468
                                                  module->comment,
461
469
                                                  arguments,
462
470
                                                  screen);
 
471
 
 
472
              debug_type = "construct-func";
463
473
            }
464
474
 
465
475
          if (G_LIKELY (plugin != NULL))
473
483
 
474
484
    case WRAPPER:
475
485
      plugin = panel_plugin_external_wrapper_new (module, unique_id, arguments);
 
486
      debug_type = "external-wrapper";
476
487
      break;
477
488
 
478
489
    case EXTERNAL_46:
479
490
      plugin = panel_plugin_external_46_new (module, unique_id, arguments);
 
491
      debug_type = "external-46";
480
492
      break;
481
493
 
482
494
    default:
489
501
      /* increase count */
490
502
      module->use_count++;
491
503
 
 
504
      panel_debug (PANEL_DEBUG_MODULE, "new item (type=%s, name=%s, id=%d)",
 
505
          debug_type, panel_module_get_name (module), unique_id);
 
506
 
492
507
      /* handle module use count and unloading */
493
508
      g_object_weak_ref (G_OBJECT (plugin),
494
509
          panel_module_plugin_destroyed, module);