[Xfce4-commits] <xfce4-panel:devel> Be more secure with registering icon names.

[Nick Schermer]

Updating branch refs/heads/devel
         to ed2ecf13ef6e73019b14e9f8225994b8b6394e3b (commit)
       from addb00af9d7f5855d7da082a043e647ca7ee0f49 (commit)

commit ed2ecf13ef6e73019b14e9f8225994b8b6394e3b
Author: Nick Schermer <nick at xfce.org>
Date:   Mon Feb 15 21:42:27 2010 +0100

    Be more secure with registering icon names.

 plugins/directorymenu/directorymenu.c |    5 ++++-
 plugins/launcher/launcher.c           |    5 ++++-
 plugins/tasklist/tasklist-widget.c    |    8 +++++---
 plugins/windowmenu/windowmenu.c       |    5 ++++-
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/plugins/directorymenu/directorymenu.c b/plugins/directorymenu/directorymenu.c
index 0816554..f10e7bc 100644
--- a/plugins/directorymenu/directorymenu.c
+++ b/plugins/directorymenu/directorymenu.c
@@ -148,7 +148,10 @@ directory_menu_plugin_class_init (DirectoryMenuPluginClass *klass)
                                                          EXO_PARAM_READWRITE));
 
   menu_file = g_quark_from_static_string ("dir-menu-file");
-  menu_icon_size = gtk_icon_size_register ("panel-directory-menu", 16, 16);
+
+  menu_icon_size = gtk_icon_size_from_name ("panel-directory-menu");
+  if (menu_icon_size == GTK_ICON_SIZE_INVALID)
+    menu_icon_size = gtk_icon_size_register ("panel-directory-menu", 16, 16);
 }
 
 
diff --git a/plugins/launcher/launcher.c b/plugins/launcher/launcher.c
index 0586012..3a03c59 100644
--- a/plugins/launcher/launcher.c
+++ b/plugins/launcher/launcher.c
@@ -311,7 +311,10 @@ launcher_plugin_class_init (LauncherPluginClass *klass)
 
   /* initialize the quark */
   launcher_plugin_quark = g_quark_from_static_string ("xfce-launcher-plugin");
-  menu_icon_size = gtk_icon_size_register ("panel-launcher-menu", 32, 32);
+
+  menu_icon_size = gtk_icon_size_from_name ("panel-launcher-menu");
+  if (menu_icon_size == GTK_ICON_SIZE_INVALID)
+    menu_icon_size = gtk_icon_size_register ("panel-launcher-menu", 32, 32);
 }
 
 
diff --git a/plugins/tasklist/tasklist-widget.c b/plugins/tasklist/tasklist-widget.c
index 08ca394..88782d4 100644
--- a/plugins/tasklist/tasklist-widget.c
+++ b/plugins/tasklist/tasklist-widget.c
@@ -404,9 +404,11 @@ xfce_tasklist_class_init (XfceTasklistClass *klass)
                                                              DEFAULT_MENU_MAX_WIDTH_CHARS,
                                                              EXO_PARAM_READABLE));
 
-  menu_icon_size = gtk_icon_size_register ("panel-tasklist-menu",
-                                           DEFAULT_MENU_ICON_SIZE,
-                                           DEFAULT_MENU_ICON_SIZE);
+  menu_icon_size = gtk_icon_size_from_name ("panel-tasklist-menu");
+  if (menu_icon_size == GTK_ICON_SIZE_INVALID)
+    menu_icon_size = gtk_icon_size_register ("panel-tasklist-menu",
+                                             DEFAULT_MENU_ICON_SIZE,
+                                             DEFAULT_MENU_ICON_SIZE);
 }
 
 
diff --git a/plugins/windowmenu/windowmenu.c b/plugins/windowmenu/windowmenu.c
index a83000a..a4b1a70 100644
--- a/plugins/windowmenu/windowmenu.c
+++ b/plugins/windowmenu/windowmenu.c
@@ -228,7 +228,10 @@ window_menu_plugin_class_init (WindowMenuPluginClass *klass)
                                                              EXO_PARAM_READABLE));
 
   window_quark = g_quark_from_static_string ("window-list-window-quark");
-  menu_icon_size = gtk_icon_size_register ("panel-window-menu", 16, 16);
+
+  menu_icon_size = gtk_icon_size_from_name ("panel-window-menu");
+  if (menu_icon_size == GTK_ICON_SIZE_INVALID)
+    menu_icon_size = gtk_icon_size_register ("panel-window-menu", 16, 16);
 }