[vinagre/plugin] Make applet work with plugins

[Jonh Wendell <jwendell src gnome org>]

commit 77c62b381b024ac86c96479614da0c5f1e012df1
Author: Jonh Wendell <jwendell gnome org>
Date:   Sat Jul 25 12:15:08 2009 -0300

    Make applet work with plugins

 vinagre/Makefile.am      |    2 +-
 vinagre/vinagre-applet.c |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/vinagre/Makefile.am b/vinagre/Makefile.am
index 449a129..a6a6d6f 100644
--- a/vinagre/Makefile.am
+++ b/vinagre/Makefile.am
@@ -184,7 +184,7 @@ vinagre_applet_LDADD =			\
 	$(AVAHI_LIBS)			\
 	view/libview.la			\
 	$(NULL)
-
+vinagre_applet_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*"
 
 ##############################
 # Autogenerated stuff
diff --git a/vinagre/vinagre-applet.c b/vinagre/vinagre-applet.c
index f7ecb6b..d172b24 100644
--- a/vinagre/vinagre-applet.c
+++ b/vinagre/vinagre-applet.c
@@ -280,6 +280,7 @@ fill_recursive_menu (GSList *entries, GtkWidget *menu)
 {
   GSList    *l;
   GtkWidget *item, *image, *child;
+  gchar     *icon_name;
 
   for (l = entries; l; l = l->next)
     {
@@ -305,7 +306,9 @@ fill_recursive_menu (GSList *entries, GtkWidget *menu)
 
 	  case VINAGRE_BOOKMARKS_ENTRY_NODE_CONN:
 	    conn = vinagre_bookmarks_entry_get_conn (entry);
-	    image = gtk_image_new_from_icon_name ("application-x-vnc", GTK_ICON_SIZE_MENU);
+	    icon_name = g_strdup_printf ("application-x-%s", vinagre_connection_get_protocol (conn));
+	    image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
+	    g_free (icon_name);
 	    item = gtk_image_menu_item_new_with_label (vinagre_connection_get_name (conn));
 	    gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item),
 					   image);