GNOME.org
 

[gimp] libgimpwidgets: rename gimpstock.[ch] to gimpicons.[ch]

commit 71894bd787649bbfcea75cf277a41afb1bc52f8f
Author: Michael Natterer <mitch gimp org>
Date:   Sat Dec 12 20:44:46 2015 +0100

    libgimpwidgets: rename gimpstock.[ch] to gimpicons.[ch]
    
    because stock is on its way out, so we better start renaming and
    deprecating stuff sooner than later.

 app/gui/icon-themes.c                              |    4 +-
 devel-docs/libgimpwidgets/libgimpwidgets-docs.sgml |    2 +-
 .../libgimpwidgets/libgimpwidgets-sections.txt     |    6 +++-
 libgimp/gimpui.c                                   |    2 +-
 libgimpwidgets/Makefile.am                         |    6 ++--
 libgimpwidgets/gimpchainbutton.c                   |    2 +-
 libgimpwidgets/gimpcolorbutton.c                   |    2 +-
 libgimpwidgets/gimpcolordisplay.c                  |    2 +-
 libgimpwidgets/gimpcolorselect.c                   |    2 +-
 libgimpwidgets/gimpcolorselection.c                |    2 +-
 libgimpwidgets/gimpcontroller.c                    |    2 +-
 libgimpwidgets/{gimpstock.c => gimpicons.c}        |   28 +++++++++++++++----
 libgimpwidgets/{gimpstock.h => gimpicons.h}        |   15 ++++++----
 libgimpwidgets/gimppageselector.c                  |    2 +-
 libgimpwidgets/gimppickbutton-default.c            |    2 +-
 libgimpwidgets/gimppickbutton.c                    |    2 +-
 libgimpwidgets/gimpscrolledpreview.c               |    2 +-
 libgimpwidgets/gimpwidgets-private.c               |    4 +-
 libgimpwidgets/gimpwidgets.def                     |    3 +-
 libgimpwidgets/gimpwidgets.h                       |    2 +-
 po-libgimp/POTFILES.in                             |    2 +-
 21 files changed, 58 insertions(+), 36 deletions(-)
---
diff --git a/app/gui/icon-themes.c b/app/gui/icon-themes.c
index 33cb5f4..2e3bc4f 100644
--- a/app/gui/icon-themes.c
+++ b/app/gui/icon-themes.c
@@ -216,7 +216,7 @@ icons_apply_theme (Gimp        *gimp,
   if (gimp->be_verbose)
     g_print ("Loading icon theme '%s'\n", icon_theme_name);
 
-  gimp_stock_set_icon_theme (icon_themes_get_theme_dir (gimp, icon_theme_name));
+  gimp_icons_set_icon_theme (icon_themes_get_theme_dir (gimp, icon_theme_name));
 }
 
 static void
@@ -233,7 +233,7 @@ icons_list_icons_foreach (gpointer key,
 
 static gint
 icons_name_compare (const void *p1,
-                     const void *p2)
+                    const void *p2)
 {
   return strcmp (* (char **) p1, * (char **) p2);
 }
diff --git a/devel-docs/libgimpwidgets/libgimpwidgets-docs.sgml 
b/devel-docs/libgimpwidgets/libgimpwidgets-docs.sgml
index cb80c7b..ed13183 100644
--- a/devel-docs/libgimpwidgets/libgimpwidgets-docs.sgml
+++ b/devel-docs/libgimpwidgets/libgimpwidgets-docs.sgml
@@ -94,7 +94,7 @@
     <xi:include href="xml/gimpcairo-utils.xml" />
     <xi:include href="xml/gimphelpui.xml" />
     <xi:include href="xml/gimpquerybox.xml" />
-    <xi:include href="xml/gimpstock.xml" />
+    <xi:include href="xml/gimpicons.xml" />
     <xi:include href="xml/gimpenumwidgets.xml" />
     <xi:include href="xml/gimppropwidgets.xml" />
     <xi:include href="xml/gimpwidgets.xml" />
diff --git a/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt 
b/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt
index 86d19ee..ba9c1a0 100644
--- a/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt
+++ b/devel-docs/libgimpwidgets/libgimpwidgets-sections.txt
@@ -762,9 +762,11 @@ GIMP_QUERY_BOX_VBOX
 </SECTION>
 
 <SECTION>
-<FILE>gimpstock</FILE>
-<TITLE>GimpStock</TITLE>
+<FILE>gimpicons</FILE>
+<TITLE>GimpIcons</TITLE>
 gimp_stock_init
+gimp_icons_init
+gimp_icons_set_icon_theme
 <SUBSECTION Stock IDs>
 GIMP_STOCK_ANCHOR
 GIMP_STOCK_CENTER
diff --git a/libgimp/gimpui.c b/libgimp/gimpui.c
index 1533f86..870c6df 100644
--- a/libgimp/gimpui.c
+++ b/libgimp/gimpui.c
@@ -139,7 +139,7 @@ gimp_ui_init (const gchar *prog_name,
   gtk_widget_set_default_colormap (gdk_screen_get_rgb_colormap (screen));
 
   icon_theme = g_file_new_for_path (gimp_get_icon_theme_dir ());
-  gimp_stock_set_icon_theme (icon_theme);
+  gimp_icons_set_icon_theme (icon_theme);
   g_object_unref (icon_theme);
 
   gimp_widgets_init (gimp_ui_help_func,
diff --git a/libgimpwidgets/Makefile.am b/libgimpwidgets/Makefile.am
index 39f6770..3ace066 100644
--- a/libgimpwidgets/Makefile.am
+++ b/libgimpwidgets/Makefile.am
@@ -125,6 +125,8 @@ libgimpwidgets_sources = \
        gimphelpui.h                    \
        gimphintbox.c                   \
        gimphintbox.h                   \
+       gimpicons.c                     \
+       gimpicons.h                     \
        gimpintcombobox.c               \
        gimpintcombobox.h               \
        gimpintstore.c                  \
@@ -161,8 +163,6 @@ libgimpwidgets_sources = \
        gimpscrolledpreview.h           \
        gimpsizeentry.c                 \
        gimpsizeentry.h                 \
-       gimpstock.c                     \
-       gimpstock.h                     \
        gimpstringcombobox.c            \
        gimpstringcombobox.h            \
        gimpunitcombobox.c              \
@@ -229,6 +229,7 @@ libgimpwidgetsinclude_HEADERS = \
        gimpframe.h                     \
        gimphelpui.h                    \
        gimphintbox.h                   \
+       gimpicons.h                     \
        gimpintcombobox.h               \
        gimpintstore.h                  \
        gimpmemsizeentry.h              \
@@ -247,7 +248,6 @@ libgimpwidgetsinclude_HEADERS = \
        gimpscaleentry.h                \
        gimpscrolledpreview.h           \
        gimpsizeentry.h                 \
-       gimpstock.h                     \
        gimpstringcombobox.h            \
        gimpunitcombobox.h              \
        gimpunitmenu.h                  \
diff --git a/libgimpwidgets/gimpchainbutton.c b/libgimpwidgets/gimpchainbutton.c
index c141d91..aedd36c 100644
--- a/libgimpwidgets/gimpchainbutton.c
+++ b/libgimpwidgets/gimpchainbutton.c
@@ -26,7 +26,7 @@
 #include "gimpwidgetstypes.h"
 
 #include "gimpchainbutton.h"
-#include "gimpstock.h"
+#include "gimpicons.h"
 
 
 /**
diff --git a/libgimpwidgets/gimpcolorbutton.c b/libgimpwidgets/gimpcolorbutton.c
index a947d2d..12a2f46 100644
--- a/libgimpwidgets/gimpcolorbutton.c
+++ b/libgimpwidgets/gimpcolorbutton.c
@@ -36,7 +36,7 @@
 #include "gimpcolorselection.h"
 #include "gimpdialog.h"
 #include "gimphelpui.h"
-#include "gimpstock.h"
+#include "gimpicons.h"
 #include "gimpwidgets-private.h"
 #include "gimp3migration.h"
 
diff --git a/libgimpwidgets/gimpcolordisplay.c b/libgimpwidgets/gimpcolordisplay.c
index 0009a76..69f5796 100644
--- a/libgimpwidgets/gimpcolordisplay.c
+++ b/libgimpwidgets/gimpcolordisplay.c
@@ -32,8 +32,8 @@
 
 #include "gimpwidgetstypes.h"
 
-#include "gimpstock.h"
 #include "gimpcolordisplay.h"
+#include "gimpicons.h"
 
 
 /**
diff --git a/libgimpwidgets/gimpcolorselect.c b/libgimpwidgets/gimpcolorselect.c
index 3b1f70b..3eb8581 100644
--- a/libgimpwidgets/gimpcolorselect.c
+++ b/libgimpwidgets/gimpcolorselect.c
@@ -36,8 +36,8 @@
 #include "gimpcolorselector.h"
 #include "gimpcolorselect.h"
 #include "gimphelpui.h"
+#include "gimpicons.h"
 #include "gimppreviewarea.h"
-#include "gimpstock.h"
 #include "gimp3migration.h"
 
 #include "libgimp/libgimp-intl.h"
diff --git a/libgimpwidgets/gimpcolorselection.c b/libgimpwidgets/gimpcolorselection.c
index 1e799b9..d730c4a 100644
--- a/libgimpwidgets/gimpcolorselection.c
+++ b/libgimpwidgets/gimpcolorselection.c
@@ -35,7 +35,7 @@
 #include "gimpcolorselect.h"
 #include "gimpcolorselection.h"
 #include "gimphelpui.h"
-#include "gimpstock.h"
+#include "gimpicons.h"
 #include "gimpwidgets.h"
 #include "gimpwidgets-private.h"
 
diff --git a/libgimpwidgets/gimpcontroller.c b/libgimpwidgets/gimpcontroller.c
index 4e2ce95..b519d7b 100644
--- a/libgimpwidgets/gimpcontroller.c
+++ b/libgimpwidgets/gimpcontroller.c
@@ -33,7 +33,7 @@
 
 #define GIMP_ENABLE_CONTROLLER_UNDER_CONSTRUCTION
 #include "gimpcontroller.h"
-#include "gimpstock.h"
+#include "gimpicons.h"
 
 
 /**
diff --git a/libgimpwidgets/gimpstock.c b/libgimpwidgets/gimpicons.c
similarity index 98%
rename from libgimpwidgets/gimpstock.c
rename to libgimpwidgets/gimpicons.c
index 625699e..2153d3b 100644
--- a/libgimpwidgets/gimpstock.c
+++ b/libgimpwidgets/gimpicons.c
@@ -1,8 +1,8 @@
 /* LIBGIMP - The GIMP Library
  * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
  *
- * gimpstock.c
- * Copyright (C) 2001 Michael Natterer <mitch gimp org>
+ * gimpicons.c
+ * Copyright (C) 2001-2015 Michael Natterer <mitch gimp org>
  *
  * This library is free software: you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -25,7 +25,7 @@
 
 #include "libgimpbase/gimpbase.h"
 
-#include "gimpstock.h"
+#include "gimpicons.h"
 
 #include "icons/Default/gimp-icon-pixbufs.c"
 
@@ -351,7 +351,7 @@ static GFile *default_icon_theme_path = NULL;
 
 
 static void
-gimp_stock_change_icon_theme (GFile *path)
+gimp_icons_change_icon_theme (GFile *path)
 {
   if (! default_icon_theme_path)
     default_icon_theme_path = gimp_data_directory_file ("icons", "Default",
@@ -413,7 +413,7 @@ gimp_stock_change_icon_theme (GFile *path)
 }
 
 void
-gimp_stock_set_icon_theme (GFile *path)
+gimp_icons_set_icon_theme (GFile *path)
 {
   g_return_if_fail (path == NULL || G_IS_FILE (path));
 
@@ -453,7 +453,7 @@ gimp_stock_set_icon_theme (GFile *path)
               if (icon_theme_path)
                 {
                   /*  this is an icon theme change  */
-                  gimp_stock_change_icon_theme (path);
+                  gimp_icons_change_icon_theme (path);
                 }
               else
                 {
@@ -478,10 +478,26 @@ gimp_stock_set_icon_theme (GFile *path)
  *
  * You don't need to call this function as gimp_ui_init() already does
  * this for you.
+ *
+ * Deprecated: 2.10: USe gimp_icons_init() instead.
  */
 void
 gimp_stock_init (void)
 {
+  gimp_icons_init ();
+}
+
+/**
+ * gimp_icons_init:
+ *
+ * Initializes the GIMP stock icon factory.
+ *
+ * You don't need to call this function as gimp_ui_init() already does
+ * this for you.
+ */
+void
+gimp_icons_init (void)
+{
   static gboolean initialized = FALSE;
 
   GdkPixbuf *pixbuf;
diff --git a/libgimpwidgets/gimpstock.h b/libgimpwidgets/gimpicons.h
similarity index 98%
rename from libgimpwidgets/gimpstock.h
rename to libgimpwidgets/gimpicons.h
index 1d48021..1a0a285 100644
--- a/libgimpwidgets/gimpstock.h
+++ b/libgimpwidgets/gimpicons.h
@@ -1,8 +1,8 @@
 /* LIBGIMP - The GIMP Library
  * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
  *
- * gimpstock.h
- * Copyright (C) 2001 Michael Natterer <mitch gimp org>
+ * gimpicons.h
+ * Copyright (C) 2001-2015 Michael Natterer <mitch gimp org>
  *
  * This library is free software: you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -23,8 +23,8 @@
 #error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
 #endif
 
-#ifndef __GIMP_STOCK_H__
-#define __GIMP_STOCK_H__
+#ifndef __GIMP_ICONS_H__
+#define __GIMP_ICONS_H__
 
 G_BEGIN_DECLS
 
@@ -296,11 +296,14 @@ G_BEGIN_DECLS
 #define GIMP_STOCK_CONVERT_PRECISION        GIMP_STOCK_CONVERT_RGB
 
 
+GIMP_DEPRECATED_FOR(gimp_icons_init)
 void   gimp_stock_init           (void);
 
-void   gimp_stock_set_icon_theme (GFile *path);
+void   gimp_icons_init           (void);
+
+void   gimp_icons_set_icon_theme (GFile *path);
 
 
 G_END_DECLS
 
-#endif /* __GIMP_STOCK_H__ */
+#endif /* __GIMP_ICONS_H__ */
diff --git a/libgimpwidgets/gimppageselector.c b/libgimpwidgets/gimppageselector.c
index 99e4017..1724ee6 100644
--- a/libgimpwidgets/gimppageselector.c
+++ b/libgimpwidgets/gimppageselector.c
@@ -29,9 +29,9 @@
 
 #include "gimpwidgetstypes.h"
 
+#include "gimpicons.h"
 #include "gimppageselector.h"
 #include "gimppropwidgets.h"
-#include "gimpstock.h"
 #include "gimpwidgets.h"
 #include "gimp3migration.h"
 
diff --git a/libgimpwidgets/gimppickbutton-default.c b/libgimpwidgets/gimppickbutton-default.c
index c59c144..07404f0 100644
--- a/libgimpwidgets/gimppickbutton-default.c
+++ b/libgimpwidgets/gimppickbutton-default.c
@@ -28,8 +28,8 @@
 
 #include "gimpcairo-utils.h"
 #include "gimphelpui.h"
+#include "gimpicons.h"
 #include "gimppickbutton.h"
-#include "gimpstock.h"
 
 #include "cursors/gimp-color-picker-cursors.c"
 
diff --git a/libgimpwidgets/gimppickbutton.c b/libgimpwidgets/gimppickbutton.c
index a76b18a..3807f55 100644
--- a/libgimpwidgets/gimppickbutton.c
+++ b/libgimpwidgets/gimppickbutton.c
@@ -28,8 +28,8 @@
 
 #include "gimpcairo-utils.h"
 #include "gimphelpui.h"
+#include "gimpicons.h"
 #include "gimppickbutton.h"
-#include "gimpstock.h"
 
 #include "libgimp/libgimp-intl.h"
 
diff --git a/libgimpwidgets/gimpscrolledpreview.c b/libgimpwidgets/gimpscrolledpreview.c
index 4eef084..5924527 100644
--- a/libgimpwidgets/gimpscrolledpreview.c
+++ b/libgimpwidgets/gimpscrolledpreview.c
@@ -26,9 +26,9 @@
 
 #include "gimpwidgetstypes.h"
 
+#include "gimpicons.h"
 #include "gimppreviewarea.h"
 #include "gimpscrolledpreview.h"
-#include "gimpstock.h"
 #include "gimp3migration.h"
 
 #include "libgimp/libgimp-intl.h"
diff --git a/libgimpwidgets/gimpwidgets-private.c b/libgimpwidgets/gimpwidgets-private.c
index e9f19d4..8fab8b6 100644
--- a/libgimpwidgets/gimpwidgets-private.c
+++ b/libgimpwidgets/gimpwidgets-private.c
@@ -27,7 +27,7 @@
 
 #include "gimpwidgetstypes.h"
 
-#include "gimpstock.h"
+#include "gimpicons.h"
 #include "gimpwidgets-private.h"
 
 #include "libgimp/libgimp-intl.h"
@@ -74,7 +74,7 @@ gimp_widgets_init (GimpHelpFunc          standard_help_func,
   _gimp_get_background_func = get_background_func;
   _gimp_ensure_modules_func = ensure_modules_func;
 
-  gimp_stock_init ();
+  gimp_icons_init ();
 
   gtk_window_set_default_icon_name (GIMP_STOCK_WILBER);
 
diff --git a/libgimpwidgets/gimpwidgets.def b/libgimpwidgets/gimpwidgets.def
index e356879..c7832e2 100644
--- a/libgimpwidgets/gimpwidgets.def
+++ b/libgimpwidgets/gimpwidgets.def
@@ -181,6 +181,8 @@ EXPORTS
        gimp_hint_box_get_type
        gimp_hint_box_new
        gimp_icon_pixbufs_get_resource
+       gimp_icons_init
+       gimp_icons_set_icon_theme
        gimp_int_adjustment_update
        gimp_int_combo_box_append
        gimp_int_combo_box_connect
@@ -373,7 +375,6 @@ EXPORTS
        gimp_spin_button_new
        gimp_standard_help_func
        gimp_stock_init
-       gimp_stock_set_icon_theme
        gimp_string_combo_box_get_active
        gimp_string_combo_box_get_type
        gimp_string_combo_box_new
diff --git a/libgimpwidgets/gimpwidgets.h b/libgimpwidgets/gimpwidgets.h
index 686be9e..58a4a02 100644
--- a/libgimpwidgets/gimpwidgets.h
+++ b/libgimpwidgets/gimpwidgets.h
@@ -56,6 +56,7 @@
 #include <libgimpwidgets/gimpframe.h>
 #include <libgimpwidgets/gimphelpui.h>
 #include <libgimpwidgets/gimphintbox.h>
+#include <libgimpwidgets/gimpicons.h>
 #include <libgimpwidgets/gimpintcombobox.h>
 #include <libgimpwidgets/gimpintstore.h>
 #include <libgimpwidgets/gimpmemsizeentry.h>
@@ -73,7 +74,6 @@
 #include <libgimpwidgets/gimpscaleentry.h>
 #include <libgimpwidgets/gimpscrolledpreview.h>
 #include <libgimpwidgets/gimpsizeentry.h>
-#include <libgimpwidgets/gimpstock.h>
 #include <libgimpwidgets/gimpstringcombobox.h>
 #include <libgimpwidgets/gimpunitcombobox.h>
 #include <libgimpwidgets/gimpunitmenu.h>
diff --git a/po-libgimp/POTFILES.in b/po-libgimp/POTFILES.in
index 4957b42..2ca6385 100644
--- a/po-libgimp/POTFILES.in
+++ b/po-libgimp/POTFILES.in
@@ -51,6 +51,7 @@ libgimpwidgets/gimpcolorselect.c
 libgimpwidgets/gimpcolorselection.c
 libgimpwidgets/gimpfileentry.c
 libgimpwidgets/gimphelpui.c
+libgimpwidgets/gimpicons.c
 libgimpwidgets/gimpintstore.c
 libgimpwidgets/gimpmemsizeentry.c
 libgimpwidgets/gimppageselector.c
@@ -60,7 +61,6 @@ libgimpwidgets/gimppreview.c
 libgimpwidgets/gimppreviewarea.c
 libgimpwidgets/gimppropwidgets.c
 libgimpwidgets/gimpquerybox.c
-libgimpwidgets/gimpstock.c
 libgimpwidgets/gimpunitmenu.c
 libgimpwidgets/gimpwidgets.c
 libgimpwidgets/gimpwidgets-private.c
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]