Author: colossus
Date: 2006-11-22 13:38:24 +0000 (Wed, 22 Nov 2006)
New Revision: 23932
Modified:
xarchiver/trunk/pixmaps/Makefile.am
xarchiver/trunk/src/callbacks.c
xarchiver/trunk/src/support.c
Log:
Workaround for finding the xarchiver window icon; still to be fixed.
Fixed missed deletion of socket file when closing xarchiver.
Modified: xarchiver/trunk/pixmaps/Makefile.am
===================================================================
--- xarchiver/trunk/pixmaps/Makefile.am 2006-11-22 13:15:06 UTC (rev 23931)
+++ xarchiver/trunk/pixmaps/Makefile.am 2006-11-22 13:38:24 UTC (rev 23932)
@@ -1,10 +1,7 @@
-pixmapdir = $(pkgdatadir)/pixmaps
-pixmap_DATA = \
- add.png \
- add_button.png \
- extract.png \
- extract_button.png \
- close.png
+# Inspired by Makefile.am from the Thunar file-manager
-EXTRA_DIST = \
- $(pixmap_DATA)
+pixmapsdir = $(datadir)/pixmaps/xarchiver
+
+pixmaps_DATA = add.png extract.png close.png add_button.png extract_button.png
+
+EXTRA_DIST = $(pixmaps_DATA)
Modified: xarchiver/trunk/src/callbacks.c
===================================================================
--- xarchiver/trunk/src/callbacks.c 2006-11-22 13:15:06 UTC (rev 23931)
+++ xarchiver/trunk/src/callbacks.c 2006-11-22 13:38:24 UTC (rev 23932)
@@ -551,6 +551,9 @@
if (current_open_directory != NULL)
g_free (current_open_directory);
+#ifdef HAVE_SOCKET
+ socket_finalize();
+#endif
gtk_main_quit();
}
Modified: xarchiver/trunk/src/support.c
===================================================================
--- xarchiver/trunk/src/support.c 2006-11-22 13:15:06 UTC (rev 23931)
+++ xarchiver/trunk/src/support.c 2006-11-22 13:38:24 UTC (rev 23932)
@@ -32,7 +32,7 @@
gchar *path;
GdkPixbuf *file_pixbuf = NULL;
- path = g_strconcat("/usr/share/", "/xarchiver/pixmaps/", filename,
NULL);
+ path = g_strconcat("/usr/share/icons/48x48/", filename, NULL);
file_pixbuf = gdk_pixbuf_new_from_file (path, &error);
g_free (path);
if ( file_pixbuf == NULL )
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
