add an 'icon' property to idousermenuitem

1 files changed, 28 insertions, 27 deletions

diff --git a/example/menus.c b/example/menus.c
index 1675f45..da2103a 100644
--- a/example/menus.c
+++ b/example/menus.c
@@ -19,6 +19,28 @@ slider_released (GtkWidget *widget, gpointer user_data)
   g_print ("released\n");
 }
 
+static GtkWidget *
+create_user_menu (const char * username,
+                  const char * filename,
+                  gboolean is_logged_in,
+                  gboolean is_active)
+{
+  GtkWidget * ret;
+  GFile * file = g_file_new_for_path (filename);
+  GIcon * icon = g_file_icon_new (file);
+
+  ret = g_object_new (IDO_USER_MENU_ITEM_TYPE,
+                      "label", username,
+                      "icon", icon,
+                      "is-logged-in", is_logged_in,
+                      "is-current-user", is_active,
+                      NULL);
+
+  g_object_unref (icon);
+  g_object_unref (file);
+  return ret;
+}
+
 int
 main (int argc, char *argv[])
 {
@@ -100,44 +122,23 @@ main (int argc, char *argv[])
   ***  Users
   **/
 
-  menuitem = gtk_separator_menu_item_new ();
+  menuitem = create_user_menu ("Guest", NULL, FALSE, FALSE);
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
 
   menuitem = ido_user_menu_item_new ();
-  g_object_set (menuitem,
-                "label", "Guest",
-                "icon-filename", NULL,
-                "is-logged-in", FALSE,
-                "is-current-user", FALSE,
-                NULL);
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
 
-  menuitem = ido_user_menu_item_new ();
-  g_object_set (menuitem,
-                "label", "Bobby Fischer",
-                "icon-filename", "/usr/share/pixmaps/faces/chess.jpg",
-                "is-logged-in", FALSE,
-                "is-current-user", FALSE,
-                NULL);
+  menuitem = create_user_menu ("Bobby Fischer", "/usr/share/pixmaps/faces/chess.jpg", FALSE, FALSE);
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
 
-  menuitem = ido_user_menu_item_new ();
-  g_object_set (menuitem,
-                "label", "Linus Torvalds",
-                "icon-filename", "/usr/share/pixmaps/faces/penguin.jpg",
-                "is-logged-in", TRUE,
-                "is-current-user", FALSE,
-                NULL);
+  menuitem = create_user_menu ("Linus Torvalds", "/usr/share/pixmaps/faces/penguin.jpg", TRUE, FALSE);
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
 
-  menuitem = ido_user_menu_item_new ();
-  g_object_set (menuitem, "label", "Mark Shuttleworth",
-                          "icon-filename", "/usr/share/pixmaps/faces/astronaut.jpg",
-                          "is-logged-in", TRUE,
-                          "is-current-user", TRUE,
-                          NULL);
+  menuitem = create_user_menu ("Mark Shuttleworth", "/usr/share/pixmaps/faces/astronaut.jpg", TRUE, TRUE);
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
 
+  menuitem = gtk_separator_menu_item_new ();
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
 
   /* Add the menubar */
   gtk_menu_shell_append (GTK_MENU_SHELL (menubar), root);