From: B.Prathibha <prathibhab@cdac.in>
Date: Mon, 21 Jan 2013 15:13:42 +0000 (+0530)
Subject: GNOME Goal: Update icon names
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=f2d81bc778ae11d5518d9b054ce230fc90d37c82;hp=285452f0b9b234879a1b690398b8967095f716dc;ds=sidebyside

GNOME Goal: Update icon names

Corrected the icon names as per the icon naming spec.

https://bugzilla.gnome.org/show_bug.cgi?id=692160
---

diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c
index 19314fe5..4c58a1aa 100644
--- a/libempathy-gtk/empathy-avatar-chooser.c
+++ b/libempathy-gtk/empathy-avatar-chooser.c
@@ -853,7 +853,7 @@ avatar_chooser_update_preview_cb (GtkFileChooser *file_chooser,
       else
         {
           gtk_image_set_from_stock (GTK_IMAGE (image),
-                  "gtk-dialog-question",
+                  "dialog-question",
                   GTK_ICON_SIZE_DIALOG);
         }
 
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 042bc83d..eb39855b 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -4015,7 +4015,7 @@ empathy_call_window_state_event_cb (GtkWidget *widget,
       show_controls (window, set_fullscreen);
       show_borders (window, set_fullscreen);
       gtk_action_set_stock_id (priv->menu_fullscreen,
-          (set_fullscreen ? "gtk-leave-fullscreen" : "gtk-fullscreen"));
+          (set_fullscreen ? "view-restore" : "view-fullscreen"));
       priv->is_fullscreen = set_fullscreen;
   }
 
diff --git a/src/empathy-call-window.ui b/src/empathy-call-window.ui
index f26f33b4..133f4ca4 100644
--- a/src/empathy-call-window.ui
+++ b/src/empathy-call-window.ui
@@ -39,7 +39,7 @@
         </child>
         <child>
           <object class="GtkAction" id="menusettings">
-            <property name="stock_id">gtk-preferences</property>
+            <property name="stock_id">preferences-desktop</property>
             <property name="name">menusettings</property>
             <property name="label" translatable="yes">_Settings</property>
           </object>
diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
index c2be935b..6901aa9c 100644
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -1024,7 +1024,7 @@ empathy_preferences_init (EmpathyPreferences *preferences)
 	gtk_window_set_role (GTK_WINDOW (preferences), "preferences");
 	gtk_window_set_position (GTK_WINDOW (preferences),
 				 GTK_WIN_POS_CENTER_ON_PARENT);
-	gtk_window_set_icon_name (GTK_WINDOW (preferences), "gtk-preferences");
+	gtk_window_set_icon_name (GTK_WINDOW (preferences), "preferences-desktop");
 
 	filename = empathy_file_lookup ("empathy-preferences.ui", "src");
 	gui = empathy_builder_get_file (filename,