Comment on attachment 233975 [details] [review]
Icon Names

review

Comment on attachment 233975 [details] [review]
Icon Names

From 1c7dc5971876d6f92823051cb1623555df4efcc0 Mon Sep 17 00:00:00 2001
From: B.Prathibha <prathibhab@cdac.in>
Date: Mon, 21 Jan 2013 06:59:11 +0530
Subject: [PATCH] GNOME Goal: Update icon names

Updated the icon names as per the icon naming specification.
---
 libempathy-gtk/empathy-avatar-chooser.c |    2 +-
 src/empathy-call-window.c               |    2 +-
 src/empathy-call-window.ui              |    2 +-
 src/empathy-preferences.c               |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c
index 9f2a5e0..aa06583 100644
--- a/libempathy-gtk/empathy-avatar-chooser.c
+++ b/libempathy-gtk/empathy-avatar-chooser.c
@@ -859,7 +859,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 43b0b91..c26b2af 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -4035,7 +4035,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 f26f33b..133f4ca 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 02b34dc..23d3212 100644
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -1033,7 +1033,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,
-- 
1.7.10.4

Created attachment 233976 [details] [review]
GNOME Goal: Update icon names

Updated the icon names as per the icon naming specification.

First patch misses bug report link but has a valid author email address.
Second patch includes bug report link but invalid author email address.

Created attachment 234013 [details] [review]
GNOME Goal: Update icon names

Corrected the icon names as per the icon naming spec.

Merged to master; thanks for the patch!

Attachment 234013 [details] pushed as f2d81bc - GNOME Goal: Update icon names