From 66bb1fad2ab48e6727017cb23ff3fba57aac9b36 Mon Sep 17 00:00:00 2001
From: Sebastien Helleu <flashcode@flashtux.org>
Date: Mon, 27 Oct 2008 15:51:44 +0100
Subject: [PATCH] Add name of plugins next to plugin pointers in dump (to log
 file)

---
 src/core/wee-config-file.c | 4 +++-
 src/core/wee-hook.c        | 3 +--
 src/gui/gui-bar-item.c     | 3 +--
 src/gui/gui-bar.c          | 4 +++-
 src/gui/gui-buffer.c       | 3 ++-
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/core/wee-config-file.c b/src/core/wee-config-file.c
index 1afc80f4f..d78b344d3 100644
--- a/src/core/wee-config-file.c
+++ b/src/core/wee-config-file.c
@@ -2501,7 +2501,9 @@ config_file_print_log ()
     {
         log_printf ("");
         log_printf ("[config (addr:0x%x)]", ptr_config_file);
-        log_printf ("  plugin . . . . . . . . : 0x%x", ptr_config_file->plugin);
+        log_printf ("  plugin . . . . . . . . : 0x%x ('%s')",
+                    ptr_config_file->plugin,
+                    plugin_get_name (ptr_config_file->plugin));
         log_printf ("  name . . . . . . . . . : '%s'", ptr_config_file->name);
         log_printf ("  filename . . . . . . . : '%s'", ptr_config_file->filename);
         log_printf ("  file . . . . . . . . . : 0x%x", ptr_config_file->file);
diff --git a/src/core/wee-hook.c b/src/core/wee-hook.c
index e872f67c4..d1fdbab7a 100644
--- a/src/core/wee-hook.c
+++ b/src/core/wee-hook.c
@@ -1948,8 +1948,7 @@ hook_print_log ()
             log_printf ("");
             log_printf ("[hook (addr:0x%x)]", ptr_hook);
             log_printf ("  plugin . . . . . . . . : 0x%x ('%s')",
-                        ptr_hook->plugin,
-                        (ptr_hook->plugin) ? ptr_hook->plugin->name : "");
+                        ptr_hook->plugin, plugin_get_name (ptr_hook->plugin));
             log_printf ("  deleted. . . . . . . . : %d",   ptr_hook->deleted);
             log_printf ("  running. . . . . . . . : %d",   ptr_hook->running);
             log_printf ("  type . . . . . . . . . : %d (%s)",
diff --git a/src/gui/gui-bar-item.c b/src/gui/gui-bar-item.c
index 0061ccae0..087d46147 100644
--- a/src/gui/gui-bar-item.c
+++ b/src/gui/gui-bar-item.c
@@ -1455,8 +1455,7 @@ gui_bar_item_print_log ()
         log_printf ("");
         log_printf ("[bar item (addr:0x%x)]", ptr_item);
         log_printf ("  plugin . . . . . . . . : 0x%x ('%s')",
-                    ptr_item->plugin,
-                    (ptr_item->plugin) ? ptr_item->plugin->name : "");
+                    ptr_item->plugin, plugin_get_name (ptr_item->plugin));
         log_printf ("  name . . . . . . . . . : '%s'", ptr_item->name);
         log_printf ("  build_callback . . . . : 0x%x", ptr_item->build_callback);
         log_printf ("  build_callback_data. . : 0x%x", ptr_item->build_callback_data);
diff --git a/src/gui/gui-bar.c b/src/gui/gui-bar.c
index 1f151eea0..d4e79d671 100644
--- a/src/gui/gui-bar.c
+++ b/src/gui/gui-bar.c
@@ -31,6 +31,7 @@
 #include "../core/wee-config.h"
 #include "../core/wee-log.h"
 #include "../core/wee-string.h"
+#include "../plugins/plugin.h"
 #include "gui-bar.h"
 #include "gui-bar-item.h"
 #include "gui-buffer.h"
@@ -1990,7 +1991,8 @@ gui_bar_print_log ()
     {
         log_printf ("");
         log_printf ("[bar (addr:0x%x)]", ptr_bar);
-        log_printf ("  plugin . . . . . . . . : 0x%x", ptr_bar->plugin);
+        log_printf ("  plugin . . . . . . . . : 0x%x ('%s')",
+                    ptr_bar->plugin, plugin_get_name (ptr_bar->plugin));
         log_printf ("  name . . . . . . . . . : '%s'", ptr_bar->name);
         log_printf ("  hidden . . . . . . . . : %d",   CONFIG_INTEGER(ptr_bar->hidden));
         log_printf ("  priority . . . . . . . : %d",   CONFIG_INTEGER(ptr_bar->priority));
diff --git a/src/gui/gui-buffer.c b/src/gui/gui-buffer.c
index 76f56061e..fa33d463f 100644
--- a/src/gui/gui-buffer.c
+++ b/src/gui/gui-buffer.c
@@ -1666,7 +1666,8 @@ gui_buffer_print_log ()
     {
         log_printf ("");
         log_printf ("[buffer (addr:0x%x)]", ptr_buffer);
-        log_printf ("  plugin . . . . . . . . : 0x%x", ptr_buffer->plugin);
+        log_printf ("  plugin . . . . . . . . : 0x%x ('%s')",
+                    ptr_buffer->plugin, plugin_get_name (ptr_buffer->plugin));
         log_printf ("  plugin_name_for_upgrade: '%s'", ptr_buffer->plugin_name_for_upgrade);
         log_printf ("  number . . . . . . . . : %d",   ptr_buffer->number);
         log_printf ("  layout_number. . . . . : %d",   ptr_buffer->layout_number);