[dualscreen] fix crash on ctrl+w and fix control window closing

[evince.git] / libview / ev-stock-icons.c

diff --git a/libview/ev-stock-icons.c b/libview/ev-stock-icons.c
index fa3df964f324fbe8653dfb7c6a8356e28ca1ca25..47b3943e13337e525c029f396396175514cb7cba 100644 (file)
--- 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,7 +35,7 @@ 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" },
@@ -45,7 +45,9 @@ static const EvStockIcon stock_icons [] = {
        { EV_STOCK_VISIBLE,          "eye"},
        { EV_STOCK_RESIZE_SE,        "resize-se"},
        { EV_STOCK_RESIZE_SW,        "resize-sw"},
-       { EV_STOCK_CLOSE,            "close"}
+       { EV_STOCK_CLOSE,            "close"},
+       { EV_STOCK_INVERTED_COLORS,  "stock_filters-invert"},
+       { EV_STOCK_ATTACHMENT,       "mail-attachment"}
 };
 
 static gchar *ev_icons_path;
@@ -91,8 +93,15 @@ ev_stock_icons_init (void)
        GtkIconFactory *factory;
        GtkIconSource *source;
        gint i;
-
-       ev_icons_path = g_build_filename (DATADIR, "icons", NULL);
+#ifdef G_OS_WIN32
+       gchar *dir;
+
+       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);