X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=libview%2Fev-stock-icons.c;h=47b3943e13337e525c029f396396175514cb7cba;hb=e769474337c9a6ffdaed2327056e8de2f7ca9ee4;hp=09aa89ea95516e1ea5683fc20d371949b2302ffb;hpb=bc8fd91eed538ddb9a3fdd3b7e05c9ac16a61c97;p=evince.git

diff --git a/libview/ev-stock-icons.c b/libview/ev-stock-icons.c
index 09aa89ea..47b3943e 100644
--- a/libview/ev-stock-icons.c
+++ b/libview/ev-stock-icons.c
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include <config.h>
@@ -35,14 +35,19 @@ typedef struct {
 /* Evince stock icons */
 static const EvStockIcon stock_icons [] = {
 	{ EV_STOCK_ZOOM,	     "zoom" },
-	{ EV_STOCK_ZOOM_PAGE,        "zoom-fit-page" },
+	{ EV_STOCK_ZOOM_PAGE,        "zoom-fit-height" },
 	{ EV_STOCK_ZOOM_WIDTH,       "zoom-fit-width" },
 	{ EV_STOCK_VIEW_DUAL,        "view-page-facing" },
 	{ EV_STOCK_VIEW_CONTINUOUS,  "view-page-continuous" },
 	{ EV_STOCK_ROTATE_LEFT,      "object-rotate-left"},
 	{ EV_STOCK_ROTATE_RIGHT,     "object-rotate-right"},
 	{ EV_STOCK_RUN_PRESENTATION, "x-office-presentation"},
-	{ EV_STOCK_VISIBLE,          "eye"}
+	{ EV_STOCK_VISIBLE,          "eye"},
+	{ EV_STOCK_RESIZE_SE,        "resize-se"},
+	{ EV_STOCK_RESIZE_SW,        "resize-sw"},
+	{ EV_STOCK_CLOSE,            "close"},
+	{ EV_STOCK_INVERTED_COLORS,  "stock_filters-invert"},
+	{ EV_STOCK_ATTACHMENT,       "mail-attachment"}
 };
 
 static gchar *ev_icons_path;
@@ -88,8 +93,15 @@ ev_stock_icons_init (void)
 	GtkIconFactory *factory;
 	GtkIconSource *source;
 	gint i;
+#ifdef G_OS_WIN32
+	gchar *dir;
 
-	ev_icons_path = g_build_filename (DATADIR, "icons", NULL);
+	dir = g_win32_get_package_installation_directory_of_module (NULL);
+	ev_icons_path = g_build_filename (dir, "share", "evince", "icons", NULL);
+	g_free (dir);
+#else
+	ev_icons_path = g_build_filename (EVINCEDATADIR, "icons", NULL);
+#endif
 
         factory = gtk_icon_factory_new ();
         gtk_icon_factory_add_default (factory);
@@ -129,8 +141,3 @@ ev_stock_icons_shutdown (void)
 	g_free (ev_icons_path);
 }
 
-void
-ev_stock_icons_add_icons_path (void)
-{
-	ev_stock_icons_add_icons_path_for_screen (gdk_screen_get_default ());
-}