GNOME.org
 

[ekiga] Icons: Moved more icons to the theme.

commit ecf7a2048338756345914b788d05a709d8a1e548
Author: Damien Sandras <dsandras beip be>
Date:   Sat May 19 18:58:19 2012 +0200

    Icons: Moved more icons to the theme.

 lib/engine/addressbook/contact-core.cpp            |    2 +-
 .../components/call-history/history-book.cpp       |    2 +-
 .../components/local-roster/local-cluster.cpp      |    2 +-
 lib/engine/components/local-roster/local-heap.cpp  |    4 +-
 .../components/local-roster/local-presentity.cpp   |    4 +-
 .../local-roster/local-roster-bridge.cpp           |    2 +-
 lib/engine/components/opal/h323-endpoint.cpp       |    2 +-
 lib/engine/components/opal/opal-account.cpp        |    6 +-
 lib/engine/components/opal/opal-bank.cpp           |    8 ++--
 lib/engine/components/opal/sip-endpoint.cpp        |    4 +-
 lib/engine/gui/gtk-core/gtk-core.cpp               |   47 --------------------
 lib/engine/gui/gtk-core/menu-builder-gtk.cpp       |    2 +-
 .../gui/gtk-frontend/call-history-view-gtk.cpp     |    2 +-
 lib/engine/gui/gtk-frontend/call-window.cpp        |   22 ++++-----
 lib/engine/gui/gtk-frontend/statusicon.cpp         |   17 ++-----
 lib/gui/gmstockicons.c                             |   47 +++----------------
 lib/gui/gmstockicons.h                             |    9 ----
 .../{audio-volume-high.png => audio-volume.png}    |  Bin 685 -> 685 bytes
 pixmaps/16x16/im-message-new.png                   |  Bin 0 -> 693 bytes
 pixmaps/16x16/im-message.png                       |  Bin 0 -> 510 bytes
 pixmaps/Makefile.am                                |   23 +++++-----
 plugins/evolution/evolution-book.cpp               |    2 +-
 plugins/evolution/evolution-contact.cpp            |    4 +-
 plugins/ldap/ldap-book.cpp                         |    6 +-
 plugins/ldap/ldap-source.cpp                       |    4 +-
 src/gui/main_window.cpp                            |    8 ++--
 26 files changed, 65 insertions(+), 164 deletions(-)
---
diff --git a/lib/engine/addressbook/contact-core.cpp b/lib/engine/addressbook/contact-core.cpp
index 09347bd..558bbb4 100644
--- a/lib/engine/addressbook/contact-core.cpp
+++ b/lib/engine/addressbook/contact-core.cpp
@@ -57,7 +57,7 @@ Ekiga::ContactCore::populate_menu (MenuBuilder &builder)
 {
   bool populated = false;
 
-  builder.add_action ("search", _("_Find"), &on_search);
+  builder.add_action ("gtk-search", _("_Find"), &on_search);
   populated = true;
 
   for (std::list<SourcePtr >::const_iterator iter = sources.begin ();
diff --git a/lib/engine/components/call-history/history-book.cpp b/lib/engine/components/call-history/history-book.cpp
index 40752e5..be2fbef 100644
--- a/lib/engine/components/call-history/history-book.cpp
+++ b/lib/engine/components/call-history/history-book.cpp
@@ -133,7 +133,7 @@ History::Book::add (const std::string & name,
 bool
 History::Book::populate_menu (Ekiga::MenuBuilder &builder)
 {
-  builder.add_action ("clear",
+  builder.add_action ("gtk-clear",
 		      _("Clear List"), boost::bind (&History::Book::clear, this));
   return true;
 }
diff --git a/lib/engine/components/local-roster/local-cluster.cpp b/lib/engine/components/local-roster/local-cluster.cpp
index a331847..c19b2ab 100644
--- a/lib/engine/components/local-roster/local-cluster.cpp
+++ b/lib/engine/components/local-roster/local-cluster.cpp
@@ -79,7 +79,7 @@ Local::Cluster::existing_groups () const
 bool
 Local::Cluster::populate_menu (Ekiga::MenuBuilder& builder)
 {
-  builder.add_action ("new", _("New contact"),
+  builder.add_action ("gtk-new", _("New contact"),
 		      boost::bind (&Local::Cluster::on_new_presentity, this));
 
   return true;
diff --git a/lib/engine/components/local-roster/local-heap.cpp b/lib/engine/components/local-roster/local-heap.cpp
index 571c40c..30a9528 100644
--- a/lib/engine/components/local-roster/local-heap.cpp
+++ b/lib/engine/components/local-roster/local-heap.cpp
@@ -115,7 +115,7 @@ Local::Heap::get_name () const
 bool
 Local::Heap::populate_menu (Ekiga::MenuBuilder &builder)
 {
-  builder.add_action ("new", _("New contact"),
+  builder.add_action ("gtk-new", _("New contact"),
 		      boost::bind (&Local::Heap::new_presentity, this, "", ""));
   return true;
 }
@@ -125,7 +125,7 @@ bool
 Local::Heap::populate_menu_for_group (const std::string name,
 				      Ekiga::MenuBuilder& builder)
 {
-  builder.add_action ("rename_group", _("Rename"),
+  builder.add_action ("gtk-edit", _("Rename"),
 		      boost::bind (&Local::Heap::on_rename_group, this, name));
   return true;
 }
diff --git a/lib/engine/components/local-roster/local-presentity.cpp b/lib/engine/components/local-roster/local-presentity.cpp
index b154b11..403b4b2 100644
--- a/lib/engine/components/local-roster/local-presentity.cpp
+++ b/lib/engine/components/local-roster/local-presentity.cpp
@@ -237,9 +237,9 @@ Local::Presentity::populate_menu (Ekiga::MenuBuilder &builder)
   if (populated)
     builder.add_separator ();
 
-  builder.add_action ("edit", _("_Edit"),
+  builder.add_action ("gtk-edit", _("_Edit"),
 		      boost::bind (&Local::Presentity::edit_presentity, this));
-  builder.add_action ("remove", _("_Remove"),
+  builder.add_action ("gtk-remove", _("_Remove"),
 		      boost::bind (&Local::Presentity::remove, this));
 
   return true;
diff --git a/lib/engine/components/local-roster/local-roster-bridge.cpp b/lib/engine/components/local-roster/local-roster-bridge.cpp
index 1517f61..963b045 100644
--- a/lib/engine/components/local-roster/local-roster-bridge.cpp
+++ b/lib/engine/components/local-roster/local-roster-bridge.cpp
@@ -90,7 +90,7 @@ Local::ContactDecorator::populate_menu (Ekiga::ContactPtr contact,
 
     if (!heap->has_presentity_with_uri (uri)) {
 
-      builder.add_action ("add", _("Add to local roster"),
+      builder.add_action ("gtk-add", _("Add to local roster"),
 			  boost::bind (&Local::Heap::new_presentity, heap.get (),
 			  contact->get_name (), uri));
       populated = true;
diff --git a/lib/engine/components/opal/h323-endpoint.cpp b/lib/engine/components/opal/h323-endpoint.cpp
index 5b9dfa9..76619ba 100644
--- a/lib/engine/components/opal/h323-endpoint.cpp
+++ b/lib/engine/components/opal/h323-endpoint.cpp
@@ -132,7 +132,7 @@ Opal::H323::EndPoint::menu_builder_add_actions (const std::string & /*fullname*/
   if (uri.find ("h323:") == 0) {
 
     if (0 == GetConnectionCount ())
-      builder.add_action ("call", _("Call"),
+      builder.add_action ("phone-pick-up", _("Call"),
                           boost::bind (&Opal::H323::EndPoint::on_dial, this, uri));
     else
       builder.add_action ("call-transfer", _("Transfer"),
diff --git a/lib/engine/components/opal/opal-account.cpp b/lib/engine/components/opal/opal-account.cpp
index b8486b8..970a00a 100644
--- a/lib/engine/components/opal/opal-account.cpp
+++ b/lib/engine/components/opal/opal-account.cpp
@@ -391,14 +391,14 @@ bool Opal::Account::populate_menu (Ekiga::MenuBuilder &builder)
     builder.add_action ("disable", _("_Disable"),
                         boost::bind (&Opal::Account::disable, this));
   else
-    builder.add_action ("enable", _("_Enable"),
+    builder.add_action ("gtk-apply", _("_Enable"),
                         boost::bind (&Opal::Account::enable, this));
 
   builder.add_separator ();
 
-  builder.add_action ("edit", _("_Edit"),
+  builder.add_action ("gtk-edit", _("_Edit"),
 		      boost::bind (&Opal::Account::edit, this));
-  builder.add_action ("remove", _("_Remove"),
+  builder.add_action ("gtk-remove", _("_Remove"),
 		      boost::bind (&Opal::Account::remove, this));
 
   if (type == DiamondCard) {
diff --git a/lib/engine/components/opal/opal-bank.cpp b/lib/engine/components/opal/opal-bank.cpp
index b74efdc..f2b11e5 100644
--- a/lib/engine/components/opal/opal-bank.cpp
+++ b/lib/engine/components/opal/opal-bank.cpp
@@ -73,13 +73,13 @@ Opal::Bank::Bank (Ekiga::ServiceCore &_core): core(_core)
 bool
 Opal::Bank::populate_menu (Ekiga::MenuBuilder & builder)
 {
-  builder.add_action ("add", _("_Add an Ekiga.net Account"),
+  builder.add_action ("gtk-add", _("_Add an Ekiga.net Account"),
 		      boost::bind (&Opal::Bank::new_account, this, Opal::Account::Ekiga, "", ""));
-  builder.add_action ("add", _("_Add an Ekiga Call Out Account"),
+  builder.add_action ("gtk-add", _("_Add an Ekiga Call Out Account"),
 		      boost::bind (&Opal::Bank::new_account, this, Opal::Account::DiamondCard, "", ""));
-  builder.add_action ("add", _("_Add a SIP Account"),
+  builder.add_action ("gtk-add", _("_Add a SIP Account"),
 		      boost::bind (&Opal::Bank::new_account, this, Opal::Account::SIP, "", ""));
-  builder.add_action ("add", _("_Add an H.323 Account"),
+  builder.add_action ("gtk-add", _("_Add an H.323 Account"),
 		      boost::bind (&Opal::Bank::new_account, this, Opal::Account::H323, "", ""));
 
   return true;
diff --git a/lib/engine/components/opal/sip-endpoint.cpp b/lib/engine/components/opal/sip-endpoint.cpp
index c71da5e..71d61e5 100644
--- a/lib/engine/components/opal/sip-endpoint.cpp
+++ b/lib/engine/components/opal/sip-endpoint.cpp
@@ -257,7 +257,7 @@ Opal::Sip::EndPoint::menu_builder_add_actions (const std::string& fullname,
     }
 
     if (0 == GetConnectionCount ())
-      builder.add_action ("call", call_action.str (),
+      builder.add_action ("phone-pick-up", call_action.str (),
                           boost::bind (&Opal::Sip::EndPoint::on_dial, this, (*it)));
     else
       builder.add_action ("call-transfer", transfer_action.str (),
@@ -277,7 +277,7 @@ Opal::Sip::EndPoint::menu_builder_add_actions (const std::string& fullname,
     else
       msg_action << _("Message");
 
-    builder.add_action ("message", msg_action.str (),
+    builder.add_action ("im-message-new", msg_action.str (),
                         boost::bind (&Opal::Sip::EndPoint::on_message, this, (*it), fullname));
 
     ita++;
diff --git a/lib/engine/gui/gtk-core/gtk-core.cpp b/lib/engine/gui/gtk-core/gtk-core.cpp
index fe686d9..ddf7770 100644
--- a/lib/engine/gui/gtk-core/gtk-core.cpp
+++ b/lib/engine/gui/gtk-core/gtk-core.cpp
@@ -41,52 +41,5 @@
 
 Gtk::Core::Core ()
 {
-  // set the basic known icons
-  GtkIconFactory *factory = gtk_icon_factory_new ();
-  GtkIconSet *icon_set = NULL;
-
   gnomemeeting_stock_icons_init ();
-
-  icon_set = gtk_icon_factory_lookup_default (GTK_STOCK_ADD);
-  gtk_icon_factory_add (factory, "add", icon_set);
-  gtk_icon_set_unref (icon_set);
-
-  icon_set = gtk_icon_factory_lookup_default (GTK_STOCK_NEW);
-  gtk_icon_factory_add (factory, "new", icon_set);
-  gtk_icon_set_unref (icon_set);
-
-  icon_set = gtk_icon_factory_lookup_default (GTK_STOCK_EDIT);
-  gtk_icon_factory_add (factory, "edit", icon_set);
-  gtk_icon_set_unref (icon_set);
-
-  icon_set = gtk_icon_factory_lookup_default (GTK_STOCK_REMOVE);
-  gtk_icon_factory_add (factory, "remove", icon_set);
-  gtk_icon_set_unref (icon_set);
-
-  icon_set = gtk_icon_factory_lookup_default (GM_STOCK_MESSAGE);
-  gtk_icon_factory_add (factory, "message", icon_set);
-  gtk_icon_set_unref (icon_set);
-
-  icon_set = gtk_icon_factory_lookup_default (GM_STOCK_PHONE_PICK_UP_16);
-  gtk_icon_factory_add (factory, "call", icon_set);
-  gtk_icon_set_unref (icon_set);
-
-  icon_set = gtk_icon_factory_lookup_default (GTK_STOCK_FIND);
-  gtk_icon_factory_add (factory, "search", icon_set);
-  gtk_icon_set_unref (icon_set);
-
-  icon_set = gtk_icon_factory_lookup_default (GTK_STOCK_REFRESH);
-  gtk_icon_factory_add (factory, "refresh", icon_set);
-  gtk_icon_set_unref (icon_set);
-
-  icon_set = gtk_icon_factory_lookup_default (GTK_STOCK_PROPERTIES);
-  gtk_icon_factory_add (factory, "properties", icon_set);
-  gtk_icon_set_unref (icon_set);
-
-  icon_set = gtk_icon_factory_lookup_default (GTK_STOCK_CLEAR);
-  gtk_icon_factory_add (factory, "clear", icon_set);
-  gtk_icon_set_unref (icon_set);
-
-  gtk_icon_factory_add_default (factory);
-  g_object_unref (factory);
 }
diff --git a/lib/engine/gui/gtk-core/menu-builder-gtk.cpp b/lib/engine/gui/gtk-core/menu-builder-gtk.cpp
index 934a3fa..eb47758 100644
--- a/lib/engine/gui/gtk-core/menu-builder-gtk.cpp
+++ b/lib/engine/gui/gtk-core/menu-builder-gtk.cpp
@@ -84,7 +84,7 @@ MenuBuilderGtk::add_action (const std::string icon,
   last_was_separator = false;
 
   item = gtk_image_menu_item_new_with_mnemonic (label.c_str ());
-  image = gtk_image_new_from_stock (icon.c_str (), GTK_ICON_SIZE_MENU);
+  image = gtk_image_new_from_icon_name (icon.c_str (), GTK_ICON_SIZE_MENU);
   if (image)
     gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
 
diff --git a/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp b/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
index f7b685e..56d8042 100644
--- a/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
+++ b/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
@@ -178,7 +178,7 @@ on_clicked (GtkWidget *tree,
 	  contact->populate_menu (builder);
 	if (!builder.empty())
 	  builder.add_separator ();
-	builder.add_action ("clear", _("Clear List"),
+	builder.add_action ("gtk-clear", _("Clear List"),
 			    boost::bind (&History::Book::clear, book));
 	gtk_widget_show_all (builder.menu);
 	gtk_menu_popup (GTK_MENU (builder.menu), NULL, NULL,
diff --git a/lib/engine/gui/gtk-frontend/call-window.cpp b/lib/engine/gui/gtk-frontend/call-window.cpp
index 8ab5a05..11ec934 100644
--- a/lib/engine/gui/gtk-frontend/call-window.cpp
+++ b/lib/engine/gui/gtk-frontend/call-window.cpp
@@ -1857,8 +1857,7 @@ gm_cw_audio_settings_window_new (EkigaCallWindow *cw)
   /* Output volume */
   hbox = gtk_hbox_new (false, 0);
   gtk_box_pack_start (GTK_BOX (hbox),
-		      gtk_image_new_from_icon_name (GM_ICON_AUDIO_VOLUME_HIGH,
-						    GTK_ICON_SIZE_SMALL_TOOLBAR),
+		      gtk_image_new_from_icon_name ("audio-volume", GTK_ICON_SIZE_SMALL_TOOLBAR),
 		      false, false, 0);
 
   small_vbox = gtk_vbox_new (false, 0);
@@ -1946,13 +1945,13 @@ ekiga_call_window_init_menu (EkigaCallWindow *cw)
     {
       GTK_MENU_NEW (_("_Call")),
 
-      GTK_MENU_ENTRY("connect", _("_Pick up"), _("Pick up the current call"),
-		     GM_STOCK_PHONE_PICK_UP_16, 'd',
-		     G_CALLBACK (pickup_call_cb), cw, false),
+      GTK_MENU_THEME_ENTRY("connect", _("_Pick up"), _("Pick up the current call"),
+                           "phone-pick-up", 'd',
+                           G_CALLBACK (pickup_call_cb), cw, false),
 
-      GTK_MENU_ENTRY("disconnect", _("_Hangup"), _("Hangup the current call"),
-		     GM_STOCK_PHONE_HANG_UP_16, 'd',
-		     G_CALLBACK (hangup_call_cb), cw, false),
+      GTK_MENU_THEME_ENTRY("disconnect", _("_Hangup"), _("Hangup the current call"),
+                           "phone-hang-up", 'd',
+                           G_CALLBACK (hangup_call_cb), cw, false),
 
       GTK_MENU_SEPARATOR,
 
@@ -2335,7 +2334,7 @@ ekiga_call_window_init_gui (EkigaCallWindow *cw)
   /* Pick-up */
   item = gtk_tool_item_new ();
   cw->priv->pickup_button = gtk_button_new ();
-  image = gtk_image_new_from_stock (GM_STOCK_PHONE_PICK_UP_24, GTK_ICON_SIZE_LARGE_TOOLBAR);
+  image = gtk_image_new_from_icon_name ("phone-pick-up", GTK_ICON_SIZE_LARGE_TOOLBAR);
   gtk_container_add (GTK_CONTAINER (cw->priv->pickup_button), image);
   gtk_container_add (GTK_CONTAINER (item), cw->priv->pickup_button);
   gtk_button_set_relief (GTK_BUTTON (cw->priv->pickup_button), GTK_RELIEF_NONE);
@@ -2350,7 +2349,7 @@ ekiga_call_window_init_gui (EkigaCallWindow *cw)
 
   item = gtk_tool_item_new ();
   cw->priv->hangup_button = gtk_button_new ();
-  image = gtk_image_new_from_stock (GM_STOCK_PHONE_HANG_UP_24, GTK_ICON_SIZE_LARGE_TOOLBAR);
+  image = gtk_image_new_from_icon_name ("phone-hang-up", GTK_ICON_SIZE_LARGE_TOOLBAR);
   gtk_container_add (GTK_CONTAINER (cw->priv->hangup_button), image);
   gtk_container_add (GTK_CONTAINER (item), cw->priv->hangup_button);
   gtk_button_set_relief (GTK_BUTTON (cw->priv->hangup_button), GTK_RELIEF_NONE);
@@ -2377,8 +2376,7 @@ ekiga_call_window_init_gui (EkigaCallWindow *cw)
     item = gtk_tool_item_new ();
     cw->priv->audio_settings_button = gtk_button_new ();
     gtk_button_set_relief (GTK_BUTTON (cw->priv->audio_settings_button), GTK_RELIEF_NONE);
-    image = gtk_image_new_from_icon_name (GM_ICON_AUDIO_VOLUME_HIGH,
-                                          GTK_ICON_SIZE_MENU);
+    image = gtk_image_new_from_icon_name ("audio-volume", GTK_ICON_SIZE_MENU);
     gtk_container_add (GTK_CONTAINER (cw->priv->audio_settings_button), image);
     gtk_container_add (GTK_CONTAINER (item), cw->priv->audio_settings_button);
     gtk_tool_item_set_expand (GTK_TOOL_ITEM (item), false);
diff --git a/lib/engine/gui/gtk-frontend/statusicon.cpp b/lib/engine/gui/gtk-frontend/statusicon.cpp
index a80bfc8..982bc6d 100644
--- a/lib/engine/gui/gtk-frontend/statusicon.cpp
+++ b/lib/engine/gui/gtk-frontend/statusicon.cpp
@@ -301,7 +301,7 @@ unread_count_cb (G_GNUC_UNUSED GtkWidget *widget,
   gchar *message = NULL;
 
   if (messages > 0)
-    statusicon_start_blinking (self, GM_STOCK_MESSAGE);
+    statusicon_start_blinking (self, "im-message");
   else
     statusicon_stop_blinking (self);
 
@@ -325,19 +325,10 @@ statusicon_blink_cb (gpointer data)
 {
   StatusIcon *statusicon = STATUSICON (data);
 
-  GtkWidget *chat_window = NULL;
-  GdkPixbuf *pixbuf = NULL;
-
   g_return_val_if_fail (data != NULL, false);
 
-  boost::shared_ptr<GtkFrontend> frontend = statusicon->priv->core.get<GtkFrontend> ("gtk-frontend");
-  chat_window = GTK_WIDGET (frontend->get_chat_window ());
-
-  pixbuf = gtk_widget_render_icon (chat_window, STATUSICON (data)->priv->blink_image,
-                                   GTK_ICON_SIZE_MENU, NULL);
-
   if (statusicon->priv->blinking)
-    gtk_status_icon_set_from_pixbuf (GTK_STATUS_ICON (statusicon), pixbuf);
+    gtk_status_icon_set_from_icon_name (GTK_STATUS_ICON (statusicon), "im-message");
   else
     statusicon_set_status (statusicon, statusicon->priv->status);
 
@@ -411,11 +402,11 @@ statusicon_build_menu (Ekiga::ServiceCore& services)
 
 static void
 statusicon_start_blinking (StatusIcon *icon,
-                           const char *stock_id)
+                           const char *icon_name)
 {
   g_return_if_fail (icon != NULL);
 
-  icon->priv->blink_image = g_strdup (stock_id);
+  icon->priv->blink_image = g_strdup (icon_name);
   if (icon->priv->blink_id == -1)
     icon->priv->blink_id = g_timeout_add_seconds (1, statusicon_blink_cb, icon);
 }
diff --git a/lib/gui/gmstockicons.c b/lib/gui/gmstockicons.c
index 4887a81..db61dfd 100644
--- a/lib/gui/gmstockicons.c
+++ b/lib/gui/gmstockicons.c
@@ -39,41 +39,24 @@
 /**
  * gnomemeeting_stock_icons_init:
  *
- * Initializes the GnomeMeeting stock icons 
+ * Initializes the GnomeMeeting stock icons
  *
  **/
 void
 gnomemeeting_stock_icons_init (void)
 {
-	GtkIconFactory *factory;
 	int i;
 
         typedef struct
         {
                 char *id;
-                const guint8 *data;
-        } GmStockIcon;
-
-	static const GmStockIcon items[] =
-	{
-
-		{ GM_STOCK_MESSAGE, gm_message_stock_data},
-		{ GM_STOCK_PHONE_HANG_UP_16, gm_phone_hang_up_stock_data_16},
-		{ GM_STOCK_PHONE_PICK_UP_16, gm_phone_pick_up_stock_data_16},
-		{ GM_STOCK_PHONE_HANG_UP_24, gm_phone_hang_up_stock_data_24},
-		{ GM_STOCK_PHONE_PICK_UP_24, gm_phone_pick_up_stock_data_24},
-	};
-
-        typedef struct
-        {
-                char *id;
                 gint size;
                 const guint8 *data;
         } GmThemeIcon;
 
 	static const GmThemeIcon theme_builtins[] =
 	{
-	        { GM_ICON_AUDIO_VOLUME_HIGH, 16, gm_audio_volume_high_16_stock_data },
+	        { "audio-volume", 16, gm_audio_volume_16 },
 		{ "brightness", 16, gm_brightness_16},
 		{ "call-placed", 16, gm_call_placed_16},
 		{ "call-missed", 16, gm_call_missed_16},
@@ -81,6 +64,8 @@ gnomemeeting_stock_icons_init (void)
 		{ "call-transfer", 16, gm_call_transfer_16},
 		{ "color", 16, gm_color_16},
 		{ "contrast", 16, gm_contrast_16},
+		{ "im-message", 16, gm_im_message_16},
+		{ "im-message-new", 16, gm_im_message_new_16},
 		{ "whiteness", 16, gm_whiteness_16},
 	        { "video-settings", 16, gm_video_settings_16 },
 	        { GM_ICON_LOGO, 16, gm_logo_16_stock_data },
@@ -88,31 +73,15 @@ gnomemeeting_stock_icons_init (void)
 	        { GM_ICON_LOGO, 32, gm_logo_32_stock_data },
 	        { GM_ICON_LOGO, 48, gm_logo_48_stock_data },
 	        { GM_ICON_LOGO, 72, gm_logo_72_stock_data },
+		{ "phone-hang-up", 16, gm_phone_hang_up_16 },
+		{ "phone-pick-up", 16, gm_phone_pick_up_16 },
+		{ "phone-hang-up", 24, gm_phone_hang_up_24 },
+		{ "phone-pick-up", 24, gm_phone_pick_up_24 },
 		{ "user-inacall", 16, gm_user_inacall_16 },
 		{ "user-ringing", 16, gm_user_ringing_16 },
 
 	};
 
-	/* First, register honest-to-goodness custom stock icons */
-	factory = gtk_icon_factory_new ();
-	gtk_icon_factory_add_default (factory);
-
-	for (i = 0; i < (int) G_N_ELEMENTS (items); i++)
-	{
-		GtkIconSet *icon_set;
-		GdkPixbuf *pixbuf;
-
-                pixbuf = gdk_pixbuf_new_from_inline (-1, items[i].data, FALSE, NULL);
-
-		icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
-
-		gtk_icon_factory_add (factory, items[i].id, icon_set);
-		gtk_icon_set_unref (icon_set);
-
-		g_object_unref (G_OBJECT (pixbuf));
-	}
-	g_object_unref (G_OBJECT (factory));
-
 	/* Now install theme builtins */
 	for (i = 0; i < (int) G_N_ELEMENTS (theme_builtins); i++)
 	{
diff --git a/lib/gui/gmstockicons.h b/lib/gui/gmstockicons.h
index 014ed74..1231e05 100644
--- a/lib/gui/gmstockicons.h
+++ b/lib/gui/gmstockicons.h
@@ -40,18 +40,9 @@
 G_BEGIN_DECLS
 
 /* Icon theme builtins */
-#define GM_ICON_AUDIO_VOLUME_HIGH          "audio-volume-high"
 #define GM_ICON_LOGO                       PACKAGE_NAME
 #define GM_ICON_ADDRESSBOOK                "stock_addressbook"
 
-/* True stock icons */
-#define GM_STOCK_MESSAGE          "gm_message_stock"
-
-#define GM_STOCK_PHONE_HANG_UP_16    "gm_phone_hang_up_stock_16"
-#define GM_STOCK_PHONE_PICK_UP_16    "gm_phone_pick_up_stock_16"
-#define GM_STOCK_PHONE_HANG_UP_24    "gm_phone_up_stock_24"
-#define GM_STOCK_PHONE_PICK_UP_24    "gm_phone_pick_up_stock_24"
-
 void gnomemeeting_stock_icons_init (void);
 
 G_END_DECLS
diff --git a/pixmaps/16x16/audio-volume-high.png b/pixmaps/16x16/audio-volume.png
similarity index 100%
rename from pixmaps/16x16/audio-volume-high.png
rename to pixmaps/16x16/audio-volume.png
diff --git a/pixmaps/16x16/im-message-new.png b/pixmaps/16x16/im-message-new.png
new file mode 100644
index 0000000..da01aff
Binary files /dev/null and b/pixmaps/16x16/im-message-new.png differ
diff --git a/pixmaps/16x16/im-message.png b/pixmaps/16x16/im-message.png
new file mode 100644
index 0000000..be0e2e1
Binary files /dev/null and b/pixmaps/16x16/im-message.png differ
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index 3a5f61d..be95136 100644
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -34,19 +34,17 @@ IMAGES_FILES= \
 	16x16/call-transfer.png \
 	16x16/color.png \
 	16x16/contrast.png \
+	16x16/im-message.png \
+	16x16/im-message-new.png \
+	16x16/phone-hang-up.png \
+	16x16/phone-pick-up.png \
 	16x16/user-inacall.png \
 	16x16/user-ringing.png \
 	16x16/video-settings.png \
 	16x16/whiteness.png \
 	24x24/contact-new.png \
-	local_contact.png \
-	remote_contact.png \
-	message.png \
-	ekiga-logo.png \
 	24x24/phone-hang-up.png \
 	24x24/phone-pick-up.png \
-	16x16/phone-hang-up.png \
-	16x16/phone-pick-up.png \
 	gm_powermeter_default_00.xpm \
 	gm_powermeter_default_01.xpm \
 	gm_powermeter_default_02.xpm \
@@ -56,7 +54,7 @@ IMAGES_FILES= \
 
 
 IMAGES= \
-	gm_audio_volume_high_16_stock_data $(srcdir)/16x16/audio-volume-high.png \
+	gm_audio_volume_16 $(srcdir)/16x16/audio-volume.png \
 	gm_brightness_16 $(srcdir)/16x16/brightness.png \
 	gm_call_placed_16 $(srcdir)/16x16/call-placed.png \
 	gm_call_missed_16 $(srcdir)/16x16/call-missed.png \
@@ -64,6 +62,8 @@ IMAGES= \
 	gm_call_transfer_16 $(srcdir)/16x16/call-transfer.png \
 	gm_color_16 $(srcdir)/16x16/color.png \
 	gm_contrast_16 $(srcdir)/16x16/contrast.png \
+	gm_im_message_16 $(srcdir)/16x16/im-message.png \
+	gm_im_message_new_16 $(srcdir)/16x16/im-message-new.png \
 	gm_video_settings_16 $(srcdir)/16x16/video-settings.png \
 	gm_whiteness_16 $(srcdir)/16x16/whiteness.png \
 	gm_logo_16_stock_data $(srcdir)/16x16/apps/@PACKAGE_NAME  png \
@@ -72,13 +72,12 @@ IMAGES= \
 	gm_logo_32_stock_data $(srcdir)/32x32/apps/@PACKAGE_NAME  png \
 	gm_logo_48_stock_data $(srcdir)/48x48/apps/@PACKAGE_NAME  png \
 	gm_logo_72_stock_data $(srcdir)/72x72/apps/@PACKAGE_NAME  png \
-	gm_message_stock_data $(srcdir)/message.png \
 	gm_user_inacall_16 $(srcdir)/16x16/user-inacall.png \
 	gm_user_ringing_16 $(srcdir)/16x16/user-ringing.png \
-	gm_phone_hang_up_stock_data_24 $(srcdir)/24x24/phone-hang-up.png \
-	gm_phone_pick_up_stock_data_24 $(srcdir)/24x24/phone-pick-up.png \
-	gm_phone_hang_up_stock_data_16 $(srcdir)/16x16/phone-hang-up.png \
-	gm_phone_pick_up_stock_data_16 $(srcdir)/16x16/phone-pick-up.png
+	gm_phone_hang_up_24 $(srcdir)/24x24/phone-hang-up.png \
+	gm_phone_pick_up_24 $(srcdir)/24x24/phone-pick-up.png \
+	gm_phone_hang_up_16 $(srcdir)/16x16/phone-hang-up.png \
+	gm_phone_pick_up_16 $(srcdir)/16x16/phone-pick-up.png
 
 
 noinst_DATA = inlines.h
diff --git a/plugins/evolution/evolution-book.cpp b/plugins/evolution/evolution-book.cpp
index 31890eb..ad3cc18 100644
--- a/plugins/evolution/evolution-book.cpp
+++ b/plugins/evolution/evolution-book.cpp
@@ -294,7 +294,7 @@ Evolution::Book::get_ebook () const
 bool
 Evolution::Book::populate_menu (Ekiga::MenuBuilder &builder)
 {
-  builder.add_action ("new", _("New _Contact"),
+  builder.add_action ("gtk-new", _("New _Contact"),
 		      boost::bind (&Evolution::Book::new_contact_action, this));
   return true;
 }
diff --git a/plugins/evolution/evolution-contact.cpp b/plugins/evolution/evolution-contact.cpp
index a7f482c..cee0cb7 100644
--- a/plugins/evolution/evolution-contact.cpp
+++ b/plugins/evolution/evolution-contact.cpp
@@ -225,9 +225,9 @@ Evolution::Contact::populate_menu (Ekiga::MenuBuilder &builder)
   if (populated)
     builder.add_separator ();
 
-  builder.add_action ("edit", _("_Edit"),
+  builder.add_action ("gtk-edit", _("_Edit"),
 		      boost::bind (&Evolution::Contact::edit_action, this));
-  builder.add_action ("remove", _("_Remove"),
+  builder.add_action ("gtk-remove", _("_Remove"),
 		      boost::bind (&Evolution::Contact::remove_action, this));
   populated = true;
 
diff --git a/plugins/ldap/ldap-book.cpp b/plugins/ldap/ldap-book.cpp
index c6adc10..162bc29 100644
--- a/plugins/ldap/ldap-book.cpp
+++ b/plugins/ldap/ldap-book.cpp
@@ -424,12 +424,12 @@ OPENLDAP::Book::get_name () const
 bool
 OPENLDAP::Book::populate_menu (Ekiga::MenuBuilder &builder)
 {
-  builder.add_action ("refresh", _("_Refresh"),
+  builder.add_action ("gtk-refresh", _("_Refresh"),
 		      boost::bind (&OPENLDAP::Book::refresh, this));
   builder.add_separator ();
-  builder.add_action ("remove", _("_Remove addressbook"),
+  builder.add_action ("gtk-remove", _("_Remove addressbook"),
 		      boost::bind (&OPENLDAP::Book::remove, this));
-  builder.add_action ("properties", _("Addressbook _properties"),
+  builder.add_action ("gtk-properties", _("Addressbook _properties"),
 		      boost::bind (&OPENLDAP::Book::edit, this));
 
   return true;
diff --git a/plugins/ldap/ldap-source.cpp b/plugins/ldap/ldap-source.cpp
index 8a7923a..14d66f2 100644
--- a/plugins/ldap/ldap-source.cpp
+++ b/plugins/ldap/ldap-source.cpp
@@ -127,11 +127,11 @@ OPENLDAP::Source::common_add (BookPtr book)
 bool
 OPENLDAP::Source::populate_menu (Ekiga::MenuBuilder &builder)
 {
-  builder.add_action ("add", _("Add an LDAP Address Book"),
+  builder.add_action ("gtk-add", _("Add an LDAP Address Book"),
 		      boost::bind (&OPENLDAP::Source::new_book, this));
   if (!has_ekiga_net_book ()) {
 
-    builder.add_action ("add", _("Add the Ekiga.net Directory"),
+    builder.add_action ("gtk-add", _("Add the Ekiga.net Directory"),
 			boost::bind (&OPENLDAP::Source::new_ekiga_net_book, this));
   }
   return true;
diff --git a/src/gui/main_window.cpp b/src/gui/main_window.cpp
index 3ed9a52..c6a75f9 100644
--- a/src/gui/main_window.cpp
+++ b/src/gui/main_window.cpp
@@ -1154,7 +1154,7 @@ ekiga_main_window_init_uri_toolbar (EkigaMainWindow *mw)
   /* The call button */
   item = gtk_tool_item_new ();
   call_button = gtk_button_new ();
-  image = gtk_image_new_from_stock (GM_STOCK_PHONE_PICK_UP_24, GTK_ICON_SIZE_LARGE_TOOLBAR);
+  image = gtk_image_new_from_icon_name ("phone-pick-up", GTK_ICON_SIZE_LARGE_TOOLBAR);
   gtk_button_set_image (GTK_BUTTON (call_button), image);
   gtk_button_set_relief (GTK_BUTTON (call_button), GTK_RELIEF_NONE);
   gtk_container_add (GTK_CONTAINER (item), call_button);
@@ -1278,9 +1278,9 @@ ekiga_main_window_init_menu (EkigaMainWindow *mw)
 		      GTK_STOCK_EXECUTE, 0,
 		      NULL, NULL, FALSE),
 
-      GTK_MENU_ENTRY("connect", _("Ca_ll a number"), _("Place a new call"),
-		     GM_STOCK_PHONE_PICK_UP_16, 'o',
-		     G_CALLBACK (show_dialpad_cb), mw, TRUE),
+      GTK_MENU_THEME_ENTRY("connect", _("Ca_ll a number"), _("Place a new call"),
+                           "phone-pick-up", 'o',
+                           G_CALLBACK (show_dialpad_cb), mw, TRUE),
 
       GTK_MENU_SEPARATOR,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]