Author: colossus
Date: 2008-07-05 20:40:34 +0000 (Sat, 05 Jul 2008)
New Revision: 27212
Modified:
xarchiver/trunk/configure.in.in
xarchiver/trunk/src/archive.c
xarchiver/trunk/src/archive.h
xarchiver/trunk/src/bzip2.c
xarchiver/trunk/src/gzip.c
xarchiver/trunk/src/interface.c
xarchiver/trunk/src/main.c
xarchiver/trunk/src/pref_dialog.c
Log:
Applied patch from Diengo Ongaro that introduces *_func typedefs to fix more
build errors
and getting rid of number 15 in the function prototypes.
Modified again configure.in.in. Now use g_find_program_in_path to detect
xdg-open.
Get rid of frames and alignments in the pref dialog.
Modified pref dialog to detect xdg-open.
Modified: xarchiver/trunk/configure.in.in
===================================================================
--- xarchiver/trunk/configure.in.in 2008-07-05 05:23:11 UTC (rev 27211)
+++ xarchiver/trunk/configure.in.in 2008-07-05 20:40:34 UTC (rev 27212)
@@ -57,8 +57,6 @@
AC_DISABLE_STATIC()
AC_PROG_LIBTOOL()
-xdg_open=yes
-
dnl ***********************************
dnl *** Enable new features provided by libmime-type ***
dnl ***********************************
@@ -77,8 +75,7 @@
dnl *** Check for xdg-open ***
dnl **************************
AC_CHECK_FILE("/usr/bin/xdg-open",
- AC_DEFINE([XDG_OPEN], [1], [Define to 1 if xdg-open is available.]),
- xdg_open="no")
+ xdg_open=yes,xdg_open="no")
dnl ***********************************************
dnl *** Work-around system-specific limitations ***
@@ -133,6 +130,7 @@
------------------------
Binary : $PACKAGE_TARNAME $PACKAGE_VERSION
+ Install in : ${prefix}/bin
GTK version : ${GTK_VERSION}
Use xdg-open: ${xdg_open}
Modified: xarchiver/trunk/src/archive.c
===================================================================
--- xarchiver/trunk/src/archive.c 2008-07-05 05:23:11 UTC (rev 27211)
+++ xarchiver/trunk/src/archive.c 2008-07-05 20:40:34 UTC (rev 27212)
@@ -24,10 +24,10 @@
#include "support.h"
#include "window.h"
-extern int delete [15];
-extern int add [15];
-extern int extract [15];
-extern int test [15];
+extern delete_func delete [XARCHIVETYPE_COUNT];
+extern add_func add [XARCHIVETYPE_COUNT];
+extern extract_func extract [XARCHIVETYPE_COUNT];
+extern test_func test [XARCHIVETYPE_COUNT];
extern Prefs_dialog_data *prefs_window;
extern gboolean batch_mode;
@@ -44,10 +44,10 @@
entry = g_new0(XEntry,1);
entry->filename = "";
archive->root_entry = entry;
- archive->delete = (void *)delete[type];
- archive->add = (void *)add[type];
- archive->extract = (void *)extract[type];
- archive->test = (void *)test[type];
+ archive->delete = delete[type];
+ archive->add = add[type];
+ archive->extract = extract[type];
+ archive->test = test[type];
return archive;
}
Modified: xarchiver/trunk/src/archive.h
===================================================================
--- xarchiver/trunk/src/archive.h 2008-07-05 05:23:11 UTC (rev 27211)
+++ xarchiver/trunk/src/archive.h 2008-07-05 20:40:34 UTC (rev 27212)
@@ -36,7 +36,8 @@
XARCHIVETYPE_TAR_GZ,
XARCHIVETYPE_TAR_LZMA,
XARCHIVETYPE_ZIP,
- XARCHIVETYPE_LHA
+ XARCHIVETYPE_LHA,
+ XARCHIVETYPE_COUNT
} XArchiveType;
typedef enum
@@ -66,6 +67,12 @@
typedef struct _XArchive XArchive;
+typedef void (*parse_output_func) (gchar *line, gpointer);
+typedef void (*delete_func) (XArchive *,GString *);
+typedef void (*add_func) (XArchive *,GString *,gchar *);
+typedef void (*extract_func) (XArchive *,GString *);
+typedef void (*test_func) (XArchive *);
+
struct _XArchive
{
XArchiveType type;
@@ -114,11 +121,11 @@
guint pb_source;
GPid child_pid;
unsigned long long int dummy_size;
- void (*parse_output) (gchar *line, gpointer);
- void (*delete) (XArchive *archive,GString *);
- void (*add) (XArchive *,GString *,gchar *);
- void (*extract) (XArchive *,GString *);
- void (*test) (XArchive *);
+ parse_output_func parse_output;
+ delete_func delete;
+ add_func add;
+ extract_func extract;
+ test_func test;
};
gboolean xa_spawn_sync_process (gchar *command);
Modified: xarchiver/trunk/src/bzip2.c
===================================================================
--- xarchiver/trunk/src/bzip2.c 2008-07-05 05:23:11 UTC (rev 27211)
+++ xarchiver/trunk/src/bzip2.c 2008-07-05 20:40:34 UTC (rev 27212)
@@ -21,9 +21,9 @@
#include "extract_dialog.h"
#include "string_utils.h"
-extern int delete [15];
-extern int add [15];
-extern int extract [15];
+extern delete_func delete [XARCHIVETYPE_COUNT];
+extern add_func add [XARCHIVETYPE_COUNT];
+extern extract_func extract [XARCHIVETYPE_COUNT];
short int l;
void xa_open_bzip2_lzma (XArchive *archive,GString *dummy)
@@ -41,18 +41,18 @@
{
archive->type = XARCHIVETYPE_TAR_BZ2;
archive->format = "TAR.BZIP2";
- archive->delete = (void *)delete[archive->type];
- archive->add = (void *)add[archive->type];
- archive->extract = (void *)extract[archive->type];
+ archive->delete = delete[archive->type];
+ archive->add = add[archive->type];
+ archive->extract = extract[archive->type];
xa_open_tar_compressed_file(archive);
}
else if (g_str_has_suffix(archive->escaped_path,".tar.lzma") ||
g_str_has_suffix (archive->escaped_path,".tlz"))
{
archive->type = XARCHIVETYPE_TAR_LZMA;
archive->format = "TAR.LZMA";
- archive->delete = (void *)delete[archive->type];
- archive->add = (void *)add[archive->type];
- archive->extract = (void *)extract[archive->type];
+ archive->delete = delete[archive->type];
+ archive->add = add[archive->type];
+ archive->extract = extract[archive->type];
xa_open_tar_compressed_file(archive);
}
else
Modified: xarchiver/trunk/src/gzip.c
===================================================================
--- xarchiver/trunk/src/gzip.c 2008-07-05 05:23:11 UTC (rev 27211)
+++ xarchiver/trunk/src/gzip.c 2008-07-05 20:40:34 UTC (rev 27212)
@@ -20,9 +20,9 @@
#include "gzip.h"
#include "bzip2.h"
-extern int delete [15];
-extern int add [15];
-extern int extract [15];
+extern delete_func delete [XARCHIVETYPE_COUNT];
+extern add_func add [XARCHIVETYPE_COUNT];
+extern extract_func extract [XARCHIVETYPE_COUNT];
/* GString here is used only to respect the prototype of the
* extract function so to make life easier to the coder :)*/
@@ -36,9 +36,9 @@
if (g_str_has_suffix (archive->escaped_path,".tar.gz") ||
g_str_has_suffix (archive->escaped_path,".tgz"))
{
archive->type = XARCHIVETYPE_TAR_GZ;
- archive->delete = (void *)delete[archive->type];
- archive->add = (void *)add[archive->type];
- archive->extract = (void *)extract[archive->type];
+ archive->delete = delete[archive->type];
+ archive->add = add[archive->type];
+ archive->extract = extract[archive->type];
command = g_strconcat (tar, " tzvf " , archive->escaped_path,
NULL );
archive->has_properties = archive->can_add =
archive->can_extract = TRUE;
Modified: xarchiver/trunk/src/interface.c
===================================================================
--- xarchiver/trunk/src/interface.c 2008-07-05 05:23:11 UTC (rev 27211)
+++ xarchiver/trunk/src/interface.c 2008-07-05 20:40:34 UTC (rev 27212)
@@ -666,7 +666,7 @@
gtk_widget_show (vbox2);
gtk_box_pack_start (GTK_BOX (hbox2), vbox2, TRUE, TRUE, 0);
- label_pwd_required = gtk_label_new (_("<span weight=\"bold\"
size=\"larger\">Password required for</span>"));
+ label_pwd_required = gtk_label_new (_("<span weight='bold'
size='larger'>Password required for</span>"));
gtk_widget_show (label_pwd_required);
gtk_box_pack_start (GTK_BOX (vbox2), label_pwd_required, FALSE, FALSE,
0);
gtk_label_set_use_markup (GTK_LABEL (label_pwd_required), TRUE);
Modified: xarchiver/trunk/src/main.c
===================================================================
--- xarchiver/trunk/src/main.c 2008-07-05 05:23:11 UTC (rev 27211)
+++ xarchiver/trunk/src/main.c 2008-07-05 20:40:34 UTC (rev 27212)
@@ -18,6 +18,7 @@
#include "config.h"
#include "main.h"
+#include "archive.h"
#include "string_utils.h"
#include "mime.h"
@@ -33,21 +34,16 @@
gboolean error_output, file_to_open, ask_and_extract, ask_and_add;
gboolean batch_mode = FALSE;
gboolean unrar = FALSE;
-gboolean sevenzr = FALSE, sevenza = FALSE;
+gboolean sevenzr = FALSE, sevenza = FALSE, xdg_open = FALSE;
extern gchar *current_open_directory;
extern int status;
Prefs_dialog_data *prefs_window = NULL;
-typedef void (*_delete) (XArchive *,GString *);
-typedef void (*_add) (XArchive *,GString *,gchar *);
-typedef void (*_extract)(XArchive *,GString *);
-typedef void (*_test) (XArchive *);
+delete_func delete[XARCHIVETYPE_COUNT] = {NULL};
+add_func add[XARCHIVETYPE_COUNT] = {NULL};
+extract_func extract[XARCHIVETYPE_COUNT] = {NULL};
+test_func test[XARCHIVETYPE_COUNT] = {NULL};
-_delete delete[15] = {NULL};
-_add add[15] = {NULL};
-_extract extract[15] = {NULL};
-_test test[15] = {NULL};
-
static GOptionEntry entries[] =
{
{ "extract-to", 'x', G_OPTION_FLAG_IN_MAIN,
G_OPTION_ARG_FILENAME, &extract_path,
@@ -454,6 +450,9 @@
ArchiveSuffix = g_list_append(ArchiveSuffix, "*.7z");
g_free (absolute_path);
}
+ absolute_path = g_find_program_in_path("xdg-open");
+ if (absolute_path != NULL)
+ xdg_open = TRUE;
}
XArchive *xa_init_structure_from_cmd_line (char *filename)
Modified: xarchiver/trunk/src/pref_dialog.c
===================================================================
--- xarchiver/trunk/src/pref_dialog.c 2008-07-05 05:23:11 UTC (rev 27211)
+++ xarchiver/trunk/src/pref_dialog.c 2008-07-05 20:40:34 UTC (rev 27212)
@@ -24,11 +24,11 @@
#include "support.h"
extern gboolean unrar;
+extern gboolean xdg_open;
Prefs_dialog_data *xa_create_prefs_dialog()
{
- GtkWidget *vbox1, *vbox4, *hbox1, *scrolledwindow1, *prefs_iconview;
- GtkWidget *label1, *label2, *label3, *label4, *frame1, *frame2,
*frame3, *alignment1, *alignment2, *alignment3;
- GtkWidget *label6, *label7, *label8, *label9, *table1, *table2;
+ GtkWidget *vbox1, *vbox3,*vbox4, *hbox1, *scrolledwindow1,
*prefs_iconview;
+ GtkWidget *label1, *label2, *label3, *label4, *label5,*label6, *label7,
*label8, *label9, *table1, *table2;
GtkTreeIter iter;
GList *archive_type;
GdkPixbuf *icon_pixbuf;
@@ -86,16 +86,8 @@
g_signal_connect (G_OBJECT (prefs_iconview),
"selection-changed",G_CALLBACK (xa_prefs_iconview_changed), prefs_data);
/* Archive page*/
- frame1 = gtk_frame_new (NULL);
- gtk_container_add (GTK_CONTAINER (prefs_data->prefs_notebook), frame1);
- gtk_frame_set_shadow_type (GTK_FRAME (frame1), GTK_SHADOW_NONE);
-
- alignment1 = gtk_alignment_new (0.5, 0.5, 1, 1);
- gtk_container_add (GTK_CONTAINER (frame1), alignment1);
- gtk_alignment_set_padding (GTK_ALIGNMENT (alignment1), 0, 0, 12, 0);
-
vbox4 = gtk_vbox_new (FALSE, 2);
- gtk_container_add (GTK_CONTAINER (alignment1), vbox4);
+ gtk_container_add (GTK_CONTAINER (prefs_data->prefs_notebook), vbox4);
hbox1 = gtk_hbox_new (FALSE, 5);
gtk_box_pack_start (GTK_BOX (vbox4), hbox1, FALSE, TRUE, 0);
@@ -136,16 +128,8 @@
gtk_notebook_set_tab_label (GTK_NOTEBOOK (prefs_data->prefs_notebook),
gtk_notebook_get_nth_page (GTK_NOTEBOOK (prefs_data->prefs_notebook), 0),
label1);
/* Window page*/
- frame2 = gtk_frame_new (NULL);
- gtk_container_add (GTK_CONTAINER (prefs_data->prefs_notebook), frame2);
- gtk_frame_set_shadow_type (GTK_FRAME (frame2), GTK_SHADOW_NONE);
-
- alignment2 = gtk_alignment_new (0.5, 0.5, 1, 1);
- gtk_container_add (GTK_CONTAINER (frame2), alignment2);
- gtk_alignment_set_padding (GTK_ALIGNMENT (alignment2), 0, 0, 12, 0);
-
- table1 = gtk_table_new (6, 2,FALSE);
- gtk_container_add (GTK_CONTAINER (alignment2), table1);
+ table1 = gtk_table_new (4, 2,FALSE);
+ gtk_container_add (GTK_CONTAINER (prefs_data->prefs_notebook), table1);
gtk_table_set_row_spacings (GTK_TABLE (table1), 2);
gtk_table_set_col_spacings (GTK_TABLE (table1), 4);
@@ -195,77 +179,101 @@
gtk_notebook_set_tab_label (GTK_NOTEBOOK (prefs_data->prefs_notebook),
gtk_notebook_get_nth_page (GTK_NOTEBOOK (prefs_data->prefs_notebook), 1),
label2);
/* Advanced page*/
- frame3 = gtk_frame_new (NULL);
- gtk_container_add (GTK_CONTAINER (prefs_data->prefs_notebook), frame3);
- gtk_frame_set_shadow_type (GTK_FRAME (frame3), GTK_SHADOW_NONE);
+ vbox3 = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox3);
+ gtk_container_add (GTK_CONTAINER (prefs_data->prefs_notebook), vbox3);
- alignment3 = gtk_alignment_new (0.5, 0.5, 1, 1);
- gtk_container_add (GTK_CONTAINER (frame3), alignment3);
- gtk_alignment_set_padding (GTK_ALIGNMENT (alignment3), 0, 0, 12, 0);
table2 = gtk_table_new (5, 2,FALSE);
- gtk_container_add (GTK_CONTAINER (alignment3), table2);
- gtk_table_set_row_spacings (GTK_TABLE (table2), 2);
+ gtk_box_pack_start (GTK_BOX (vbox3), table2, TRUE, TRUE, 0);
+ gtk_table_set_row_spacings (GTK_TABLE (table2), 1);
gtk_table_set_col_spacings (GTK_TABLE (table2), 4);
- label6 = gtk_label_new (_("Web browser to use:"));
- gtk_table_attach (GTK_TABLE (table2), label6, 0, 1, 0, 1,
+ if (xdg_open)
+ {
+ label9 = gtk_label_new (_("Preferred temp directory:"));
+ gtk_table_attach (GTK_TABLE (table2), label9, 0, 1, 3, 4,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (GTK_SHRINK), 0, 0);
- gtk_misc_set_alignment (GTK_MISC (label6), 0, 0.5);
- prefs_data->combo_prefered_web_browser = gtk_combo_box_new_text();
- gtk_combo_box_append_text (GTK_COMBO_BOX
(prefs_data->combo_prefered_web_browser), "" );
- gtk_combo_box_append_text (GTK_COMBO_BOX
(prefs_data->combo_prefered_web_browser), _("choose...") );
- g_signal_connect
(prefs_data->combo_prefered_web_browser,"changed",G_CALLBACK
(xa_prefs_combo_changed),NULL);
- gtk_table_attach (GTK_TABLE (table2),
prefs_data->combo_prefered_web_browser, 1, 2, 0, 1,
+ gtk_misc_set_alignment (GTK_MISC (label9), 0, 0.5);
+ prefs_data->combo_prefered_temp_dir = gtk_combo_box_new_text();
+ gtk_combo_box_append_text (GTK_COMBO_BOX
(prefs_data->combo_prefered_temp_dir), _("/tmp") );
+ gtk_combo_box_append_text (GTK_COMBO_BOX
(prefs_data->combo_prefered_temp_dir), _("choose...") );
+ g_signal_connect
(prefs_data->combo_prefered_temp_dir,"changed",G_CALLBACK
(xa_prefs_combo_changed),(gpointer) 1);
+ gtk_table_attach (GTK_TABLE (table2),
prefs_data->combo_prefered_temp_dir, 1, 2, 3, 4,
(GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (GTK_FILL), 0, 0);
+
+ prefs_data->check_save_geometry =
gtk_check_button_new_with_mnemonic (_("Save window geometry"));
+ gtk_table_attach (GTK_TABLE (table2),
prefs_data->check_save_geometry, 0, 2, 4, 5,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (GTK_FILL), 0, 0);
+ }
+ else
+ {
+ label6 = gtk_label_new (_("Web browser to use:"));
+ gtk_table_attach (GTK_TABLE (table2), label6, 0, 1, 0, 1,
+ (GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (GTK_SHRINK), 0, 0);
+ gtk_misc_set_alignment (GTK_MISC (label6), 0, 0.5);
+ prefs_data->combo_prefered_web_browser =
gtk_combo_box_new_text();
+ gtk_combo_box_append_text (GTK_COMBO_BOX
(prefs_data->combo_prefered_web_browser), "" );
+ gtk_combo_box_append_text (GTK_COMBO_BOX
(prefs_data->combo_prefered_web_browser), _("choose...") );
+ g_signal_connect
(prefs_data->combo_prefered_web_browser,"changed",G_CALLBACK
(xa_prefs_combo_changed),NULL);
+ gtk_table_attach (GTK_TABLE (table2),
prefs_data->combo_prefered_web_browser, 1, 2, 0, 1,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
- label7 = gtk_label_new (_("Open text files with:"));
- gtk_table_attach (GTK_TABLE (table2), label7, 0, 1, 1, 2,
+ label7 = gtk_label_new (_("Open text files with:"));
+ gtk_table_attach (GTK_TABLE (table2), label7, 0, 1, 1, 2,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (GTK_SHRINK), 0, 0);
- gtk_misc_set_alignment (GTK_MISC (label7), 0, 0.5);
- prefs_data->combo_prefered_editor = gtk_combo_box_new_text();
- gtk_combo_box_append_text (GTK_COMBO_BOX
(prefs_data->combo_prefered_editor), "" );
- gtk_combo_box_append_text (GTK_COMBO_BOX
(prefs_data->combo_prefered_editor), _("choose...") );
- g_signal_connect
(prefs_data->combo_prefered_editor,"changed",G_CALLBACK
(xa_prefs_combo_changed),NULL);
- gtk_table_attach (GTK_TABLE (table2),
prefs_data->combo_prefered_editor, 1, 2, 1, 2,
+ gtk_misc_set_alignment (GTK_MISC (label7), 0, 0.5);
+ prefs_data->combo_prefered_editor = gtk_combo_box_new_text();
+ gtk_combo_box_append_text (GTK_COMBO_BOX
(prefs_data->combo_prefered_editor), "" );
+ gtk_combo_box_append_text (GTK_COMBO_BOX
(prefs_data->combo_prefered_editor), _("choose...") );
+ g_signal_connect
(prefs_data->combo_prefered_editor,"changed",G_CALLBACK
(xa_prefs_combo_changed),NULL);
+ gtk_table_attach (GTK_TABLE (table2),
prefs_data->combo_prefered_editor, 1, 2, 1, 2,
(GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (GTK_SHRINK), 0, 0);
+ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
- label8 = gtk_label_new (_("Open image files with:"));
- gtk_table_attach (GTK_TABLE (table2), label8, 0, 1, 2, 3,
+ label8 = gtk_label_new (_("Open image files with:"));
+ gtk_table_attach (GTK_TABLE (table2), label8, 0, 1, 2, 3,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (GTK_SHRINK), 0, 0);
- gtk_misc_set_alignment (GTK_MISC (label8), 0, 0.5);
- prefs_data->combo_prefered_viewer = gtk_combo_box_new_text();
- gtk_combo_box_append_text (GTK_COMBO_BOX
(prefs_data->combo_prefered_viewer), "" );
- gtk_combo_box_append_text (GTK_COMBO_BOX
(prefs_data->combo_prefered_viewer), _("choose...") );
- g_signal_connect
(prefs_data->combo_prefered_viewer,"changed",G_CALLBACK
(xa_prefs_combo_changed),NULL);
- gtk_table_attach (GTK_TABLE (table2),
prefs_data->combo_prefered_viewer, 1, 2, 2, 3,
+ gtk_misc_set_alignment (GTK_MISC (label8), 0, 0.5);
+ prefs_data->combo_prefered_viewer = gtk_combo_box_new_text();
+ gtk_combo_box_append_text (GTK_COMBO_BOX
(prefs_data->combo_prefered_viewer), "" );
+ gtk_combo_box_append_text (GTK_COMBO_BOX
(prefs_data->combo_prefered_viewer), _("choose...") );
+ g_signal_connect
(prefs_data->combo_prefered_viewer,"changed",G_CALLBACK
(xa_prefs_combo_changed),NULL);
+ gtk_table_attach (GTK_TABLE (table2),
prefs_data->combo_prefered_viewer, 1, 2, 2, 3,
(GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (GTK_SHRINK), 0, 0);
+ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
- label9 = gtk_label_new (_("Preferred temp directory:"));
- gtk_table_attach (GTK_TABLE (table2), label9, 0, 1, 3, 4,
+ label9 = gtk_label_new (_("Preferred temp directory:"));
+ gtk_table_attach (GTK_TABLE (table2), label9, 0, 1, 3, 4,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (GTK_SHRINK), 0, 0);
- gtk_misc_set_alignment (GTK_MISC (label9), 0, 0.5);
- prefs_data->combo_prefered_temp_dir = gtk_combo_box_new_text();
- gtk_combo_box_append_text (GTK_COMBO_BOX
(prefs_data->combo_prefered_temp_dir), _("/tmp") );
- gtk_combo_box_append_text (GTK_COMBO_BOX
(prefs_data->combo_prefered_temp_dir), _("choose...") );
- g_signal_connect
(prefs_data->combo_prefered_temp_dir,"changed",G_CALLBACK
(xa_prefs_combo_changed),(gpointer) 1);
- gtk_table_attach (GTK_TABLE (table2),
prefs_data->combo_prefered_temp_dir, 1, 2, 3, 4,
+ gtk_misc_set_alignment (GTK_MISC (label9), 0, 0.5);
+ prefs_data->combo_prefered_temp_dir = gtk_combo_box_new_text();
+ gtk_combo_box_append_text (GTK_COMBO_BOX
(prefs_data->combo_prefered_temp_dir), _("/tmp") );
+ gtk_combo_box_append_text (GTK_COMBO_BOX
(prefs_data->combo_prefered_temp_dir), _("choose...") );
+ g_signal_connect
(prefs_data->combo_prefered_temp_dir,"changed",G_CALLBACK
(xa_prefs_combo_changed),(gpointer) 1);
+ gtk_table_attach (GTK_TABLE (table2),
prefs_data->combo_prefered_temp_dir, 1, 2, 3, 4,
(GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (GTK_SHRINK), 0, 0);
+ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
- prefs_data->check_save_geometry = gtk_check_button_new_with_mnemonic
(_("Save window geometry"));
- gtk_table_attach (GTK_TABLE (table2), prefs_data->check_save_geometry,
0, 2, 4, 5,
+ prefs_data->check_save_geometry =
gtk_check_button_new_with_mnemonic (_("Save window geometry"));
+ gtk_table_attach (GTK_TABLE (table2),
prefs_data->check_save_geometry, 0, 2, 4, 5,
(GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (GTK_SHRINK), 0, 0);
+ (GtkAttachOptions) (0), 0, 0);
+
+ label5 = gtk_label_new(_("<span color='red'
style='italic'>Please install xdg-utils package so that\nXarchiver can
recognize more file types.</span>"));
+ gtk_label_set_use_markup (GTK_LABEL (label5), TRUE);
+ gtk_box_pack_start (GTK_BOX (vbox3), label5, FALSE, FALSE, 0);
+ }
gtk_button_set_focus_on_click (GTK_BUTTON
(prefs_data->check_save_geometry), FALSE);
-
+
label3 = gtk_label_new ("");
gtk_notebook_set_tab_label (GTK_NOTEBOOK (prefs_data->prefs_notebook),
gtk_notebook_get_nth_page (GTK_NOTEBOOK (prefs_data->prefs_notebook), 2),
label3);
return prefs_data;
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
