[libpeas] Kill peas-ui-plugin-info.h

[Steve Frécinaux <sfre src gnome org>]

commit df6c9dfb127a84599b1f0e1777e3b198e228ad17
Author: Steve Frécinaux <code istique net>
Date:   Thu Jul 22 12:41:09 2010 +0200

    Kill peas-ui-plugin-info.h
    
    The single function it contained was moved to peas-plugin-info.h

 libpeas/peas-plugin-info.c               |   21 ++++++++++
 libpeas/peas-plugin-info.h               |    1 +
 libpeasui/Makefile.am                    |    2 -
 libpeasui/peas-ui-plugin-info.c          |   65 ------------------------------
 libpeasui/peas-ui-plugin-info.h          |   33 ---------------
 libpeasui/peas-ui-plugin-manager-store.c |   11 ++++-
 libpeasui/peas-ui-plugin-manager.c       |    3 +-
 libpeasui/peas-ui.h                      |    1 -
 8 files changed, 31 insertions(+), 106 deletions(-)
---
diff --git a/libpeas/peas-plugin-info.c b/libpeas/peas-plugin-info.c
index 540ab10..6023d8c 100644
--- a/libpeas/peas-plugin-info.c
+++ b/libpeas/peas-plugin-info.c
@@ -456,6 +456,27 @@ peas_plugin_info_get_description (const PeasPluginInfo *info)
 }
 
 /**
+ * peas_plugin_info_get_icon_name:
+ * @info: A #PeasPluginInfo.
+ *
+ * Gets the icon name of the plugin.
+ *
+ * Returns: the plugin's icon name.
+ */
+const gchar *
+peas_plugin_info_get_icon_name (const PeasPluginInfo *info)
+{
+  g_return_val_if_fail (info != NULL, NULL);
+
+  /* use the libpeas-plugin icon as a default if the plugin does not
+     have its own */
+  if (info->icon_name != NULL)
+    return info->icon_name;
+  else
+    return "libpeas-plugin";
+}
+
+/**
  * peas_plugin_info_get_authors:
  * @info: A #PeasPluginInfo.
  *
diff --git a/libpeas/peas-plugin-info.h b/libpeas/peas-plugin-info.h
index 1a47ee3..8afa7ba 100644
--- a/libpeas/peas-plugin-info.h
+++ b/libpeas/peas-plugin-info.h
@@ -49,6 +49,7 @@ const gchar  *peas_plugin_info_get_data_dir     (const PeasPluginInfo *info);
 
 const gchar  *peas_plugin_info_get_name         (const PeasPluginInfo *info);
 const gchar  *peas_plugin_info_get_description  (const PeasPluginInfo *info);
+const gchar  *peas_plugin_info_get_icon_name    (const PeasPluginInfo *info);
 const gchar **peas_plugin_info_get_authors      (const PeasPluginInfo *info);
 const gchar  *peas_plugin_info_get_website      (const PeasPluginInfo *info);
 const gchar  *peas_plugin_info_get_copyright    (const PeasPluginInfo *info);
diff --git a/libpeasui/Makefile.am b/libpeasui/Makefile.am
index fcbf548..6dbc41e 100644
--- a/libpeasui/Makefile.am
+++ b/libpeasui/Makefile.am
@@ -19,7 +19,6 @@ libpeasui_1_0_la_LIBADD = \
 
 INST_H_FILES = \
 	peas-ui-configurable.h		\
-	peas-ui-plugin-info.h		\
 	peas-ui-plugin-manager.h	\
 	peas-ui-plugin-manager-view.h	\
 	peas-ui.h
@@ -29,7 +28,6 @@ NOINST_H_FILES = \
 
 C_FILES = \
 	peas-ui-configurable.c		\
-	peas-ui-plugin-info.c		\
 	peas-ui-plugin-manager.c	\
 	peas-ui-plugin-manager-store.c	\
 	peas-ui-plugin-manager-view.c
diff --git a/libpeasui/peas-ui-plugin-manager-store.c b/libpeasui/peas-ui-plugin-manager-store.c
index 61b268c..158b24c 100644
--- a/libpeasui/peas-ui-plugin-manager-store.c
+++ b/libpeasui/peas-ui-plugin-manager-store.c
@@ -29,7 +29,6 @@
 #include <libpeas/peas-plugin-info.h>
 
 #include "peas-ui-plugin-manager-store.h"
-#include "peas-ui-plugin-info.h"
 
 static const GType ColumnTypes[] = {
   G_TYPE_BOOLEAN, /* Enabled */
@@ -78,9 +77,15 @@ update_plugin (PeasUIPluginManagerStore *store,
                                     peas_plugin_info_get_description (info));
 
   if (peas_plugin_info_is_available (info))
-    icon_name = peas_ui_plugin_info_get_icon_name (info);
+    {
+      icon_name = peas_plugin_info_get_icon_name (info);
+      if (!gtk_icon_theme_has_icon (gtk_icon_theme_get_default (), icon_name))
+        icon_name = "libpeas-plugin";
+    }
   else
-    icon_name = GTK_STOCK_DIALOG_ERROR;
+    {
+      icon_name = GTK_STOCK_DIALOG_ERROR;
+    }
 
   gtk_list_store_set (GTK_LIST_STORE (store), iter,
     PEAS_UI_PLUGIN_MANAGER_STORE_ENABLED_COLUMN,          loaded,
diff --git a/libpeasui/peas-ui-plugin-manager.c b/libpeasui/peas-ui-plugin-manager.c
index eb4ba16..60089c8 100644
--- a/libpeasui/peas-ui-plugin-manager.c
+++ b/libpeasui/peas-ui-plugin-manager.c
@@ -34,7 +34,6 @@
 
 #include "peas-ui-plugin-manager.h"
 #include "peas-ui-plugin-manager-view.h"
-#include "peas-ui-plugin-info.h"
 #include "peas-ui-configurable.h"
 
 /**
@@ -116,7 +115,7 @@ show_about_cb (GtkWidget           *widget,
                                               "authors", peas_plugin_info_get_authors (info),
                                               "comments", peas_plugin_info_get_description (info),
                                               "website", peas_plugin_info_get_website (info),
-                                              "logo-icon-name", peas_ui_plugin_info_get_icon_name (info),
+                                              "logo-icon-name", peas_plugin_info_get_icon_name (info),
                                               "version", peas_plugin_info_get_version (info),
                                               NULL));
 
diff --git a/libpeasui/peas-ui.h b/libpeasui/peas-ui.h
index f2e7c6e..b722d49 100644
--- a/libpeasui/peas-ui.h
+++ b/libpeasui/peas-ui.h
@@ -21,7 +21,6 @@
 #define __PEAS_UI_H__
 
 #include "peas-ui-configurable.h"
-#include "peas-ui-plugin-info.h"
 #include "peas-ui-plugin-manager.h"
 #include "peas-ui-plugin-manager-view.h"