Author: colossus
Date: 2006-11-27 07:39:46 +0000 (Mon, 27 Nov 2006)
New Revision: 23984
Added:
xarchiver/trunk/pixmaps/xarchiver-add.png
xarchiver/trunk/pixmaps/xarchiver-add_button.png
xarchiver/trunk/pixmaps/xarchiver-close.png
xarchiver/trunk/pixmaps/xarchiver-extract.png
xarchiver/trunk/pixmaps/xarchiver-extract_button.png
Removed:
xarchiver/trunk/pixmaps/add.png
xarchiver/trunk/pixmaps/add_button.png
xarchiver/trunk/pixmaps/close.png
xarchiver/trunk/pixmaps/extract.png
xarchiver/trunk/pixmaps/extract_button.png
Modified:
xarchiver/trunk/ChangeLog
xarchiver/trunk/configure.in.in
xarchiver/trunk/pixmaps/Makefile.am
xarchiver/trunk/src/add_dialog.c
xarchiver/trunk/src/extract_dialog.c
xarchiver/trunk/src/interface.c
xarchiver/trunk/src/support.c
Log:
Applied patch from J. Guillemin for fixing the missing icons when installing
Xarchiver.
Changed version number to 0.4.5 for releasing the fixed code.
Renamed png icons to make them freedesktop compliant.
Updated Changelog.
Modified: xarchiver/trunk/ChangeLog
===================================================================
--- xarchiver/trunk/ChangeLog 2006-11-27 07:29:37 UTC (rev 23983)
+++ xarchiver/trunk/ChangeLog 2006-11-27 07:39:46 UTC (rev 23984)
@@ -1,5 +1,8 @@
Xarchiver changelog:
+27/11/06 - 0.4.5:
+ - Fixed code in support.c to load the images when installing
the software.
+
23/11/06 - 0.4.4:
- G R E A T L Y improved speed and memory usage.
- Added documentation. It will be showed in the system browser
(currently supported are firefox, opera and mozilla).
Modified: xarchiver/trunk/configure.in.in
===================================================================
--- xarchiver/trunk/configure.in.in 2006-11-27 07:29:37 UTC (rev 23983)
+++ xarchiver/trunk/configure.in.in 2006-11-27 07:39:46 UTC (rev 23984)
@@ -11,10 +11,10 @@
dnl ***************************
m4_define([xarchiver_version_major], [0])
m4_define([xarchiver_version_minor], [4])
-m4_define([xarchiver_version_micro], [9])
+m4_define([xarchiver_version_micro], [5])
m4_define([xarchiver_version_nano], []) # Leave empty for no nano version
m4_define([xarchiver_version_build], [EMAIL PROTECTED]@])
-m4_define([xarchiver_version_tag], [svn]) # Leave empty for releases
+m4_define([xarchiver_version_tag], []) # Leave empty for releases
m4_define([xarchiver_version],
[xarchiver_version_major().xarchiver_version_minor().xarchiver_version_micro()ifelse(xarchiver_version_nano(),
[], [], [.xarchiver_version_nano()])ifelse(xarchiver_version_tag(), [svn],
[xarchiver_version_tag()-xarchiver_version_build()],
[xarchiver_version_tag()])])
dnl ***************************
Modified: xarchiver/trunk/pixmaps/Makefile.am
===================================================================
--- xarchiver/trunk/pixmaps/Makefile.am 2006-11-27 07:29:37 UTC (rev 23983)
+++ xarchiver/trunk/pixmaps/Makefile.am 2006-11-27 07:39:46 UTC (rev 23984)
@@ -2,6 +2,6 @@
pixmapsdir = $(datadir)/pixmaps/xarchiver
-pixmaps_DATA = add.png extract.png close.png add_button.png extract_button.png
+pixmaps_DATA = xarchiver-add.png xarchiver-extract.png xarchiver-close.png
xarchiver-add_button.png xarchiver-extract_button.png
EXTRA_DIST = $(pixmaps_DATA)
Deleted: xarchiver/trunk/pixmaps/add.png
Deleted: xarchiver/trunk/pixmaps/add_button.png
Deleted: xarchiver/trunk/pixmaps/close.png
Deleted: xarchiver/trunk/pixmaps/extract.png
Deleted: xarchiver/trunk/pixmaps/extract_button.png
Added: xarchiver/trunk/pixmaps/xarchiver-add.png
===================================================================
(Binary files differ)
Property changes on: xarchiver/trunk/pixmaps/xarchiver-add.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: xarchiver/trunk/pixmaps/xarchiver-add_button.png
===================================================================
(Binary files differ)
Property changes on: xarchiver/trunk/pixmaps/xarchiver-add_button.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: xarchiver/trunk/pixmaps/xarchiver-close.png
===================================================================
(Binary files differ)
Property changes on: xarchiver/trunk/pixmaps/xarchiver-close.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: xarchiver/trunk/pixmaps/xarchiver-extract.png
===================================================================
(Binary files differ)
Property changes on: xarchiver/trunk/pixmaps/xarchiver-extract.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: xarchiver/trunk/pixmaps/xarchiver-extract_button.png
===================================================================
(Binary files differ)
Property changes on: xarchiver/trunk/pixmaps/xarchiver-extract_button.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: xarchiver/trunk/src/add_dialog.c
===================================================================
--- xarchiver/trunk/src/add_dialog.c 2006-11-27 07:29:37 UTC (rev 23983)
+++ xarchiver/trunk/src/add_dialog.c 2006-11-27 07:39:46 UTC (rev 23984)
@@ -312,7 +312,7 @@
GTK_WIDGET_SET_FLAGS (add_dialog->cancel_button, GTK_CAN_DEFAULT);
add_dialog->add_button = gtk_button_new();
- add_dialog->add_image = xa_main_window_find_image("add_button.png",
GTK_ICON_SIZE_SMALL_TOOLBAR);
+ add_dialog->add_image =
xa_main_window_find_image("xarchiver-add_button.png",
GTK_ICON_SIZE_SMALL_TOOLBAR);
add_dialog->add_hbox = gtk_hbox_new(FALSE, 4);
add_dialog->add_label = gtk_label_new_with_mnemonic(_("_Add"));
Modified: xarchiver/trunk/src/extract_dialog.c
===================================================================
--- xarchiver/trunk/src/extract_dialog.c 2006-11-27 07:29:37 UTC (rev
23983)
+++ xarchiver/trunk/src/extract_dialog.c 2006-11-27 07:39:46 UTC (rev
23984)
@@ -250,7 +250,7 @@
GTK_WIDGET_SET_FLAGS (dialog_data->cancel_button, GTK_CAN_DEFAULT);
dialog_data->extract_button = gtk_button_new();
- dialog_data->extract_image =
xa_main_window_find_image("extract_button.png", GTK_ICON_SIZE_SMALL_TOOLBAR);
+ dialog_data->extract_image =
xa_main_window_find_image("xarchiver-extract_button.png",
GTK_ICON_SIZE_SMALL_TOOLBAR);
dialog_data->extract_hbox = gtk_hbox_new(FALSE, 4);
dialog_data->extract_label = gtk_label_new_with_mnemonic(_("_Extract"));
Modified: xarchiver/trunk/src/interface.c
===================================================================
--- xarchiver/trunk/src/interface.c 2006-11-27 07:29:37 UTC (rev 23983)
+++ xarchiver/trunk/src/interface.c 2006-11-27 07:39:46 UTC (rev 23984)
@@ -134,7 +134,7 @@
gtk_container_add (GTK_CONTAINER (menuitem2_menu), addfile);
gtk_widget_add_accelerator (addfile, "activate",accel_group,GDK_c,
GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
- image2 = xa_main_window_find_image ("add_button.png", GTK_ICON_SIZE_MENU);
+ image2 = xa_main_window_find_image ("xarchiver-add_button.png",
GTK_ICON_SIZE_MENU);
gtk_widget_show (image2);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (addfile), image2);
@@ -144,7 +144,7 @@
gtk_container_add (GTK_CONTAINER (menuitem2_menu), extract_menu);
gtk_widget_add_accelerator (extract_menu, "activate",accel_group,GDK_e,
GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
- image2 = xa_main_window_find_image ("extract_button.png",
GTK_ICON_SIZE_MENU);
+ image2 = xa_main_window_find_image ("xarchiver-extract_button.png",
GTK_ICON_SIZE_MENU);
gtk_widget_show (image2);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (extract_menu), image2);
@@ -274,7 +274,7 @@
gtk_widget_show (separatortoolitem1);
gtk_container_add (GTK_CONTAINER (toolbar1), separatortoolitem1);
- tmp_image = xa_main_window_find_image("add.png",
GTK_ICON_SIZE_LARGE_TOOLBAR);
+ tmp_image = xa_main_window_find_image("xarchiver-add.png",
GTK_ICON_SIZE_LARGE_TOOLBAR);
gtk_widget_show (tmp_image);
AddFile_button = (GtkWidget*) gtk_tool_button_new (tmp_image, _("Add"));
gtk_widget_set_sensitive (AddFile_button,FALSE);
@@ -283,7 +283,7 @@
gtk_container_add (GTK_CONTAINER (toolbar1), AddFile_button);
gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (AddFile_button), tooltips,
_("Add files and directories to the current archive"), NULL);
- tmp_image = xa_main_window_find_image("extract.png",
GTK_ICON_SIZE_LARGE_TOOLBAR);
+ tmp_image = xa_main_window_find_image("xarchiver-extract.png",
GTK_ICON_SIZE_LARGE_TOOLBAR);
gtk_widget_show (tmp_image);
Extract_button = (GtkWidget*) gtk_tool_button_new (tmp_image,
_("Extract"));
gtk_widget_set_sensitive (Extract_button,FALSE);
Modified: xarchiver/trunk/src/support.c
===================================================================
--- xarchiver/trunk/src/support.c 2006-11-27 07:29:37 UTC (rev 23983)
+++ xarchiver/trunk/src/support.c 2006-11-27 07:39:46 UTC (rev 23984)
@@ -31,8 +31,8 @@
GtkWidget *file_image;
gchar *path;
GdkPixbuf *file_pixbuf = NULL;
-
- path = g_strconcat("/pixmaps/xarchiver/", filename, NULL);
+ path = g_strconcat(DATADIR, "/pixmaps/xarchiver/", NULL);
+ path = g_strconcat(path, 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
