Author: stephan
Date: 2006-12-11 22:11:30 +0000 (Mon, 11 Dec 2006)
New Revision: 24081
Modified:
squeeze/trunk/libsqueeze/archive-support-gnu-tar.c
squeeze/trunk/libsqueeze/internals.c
squeeze/trunk/src/add_dialog.c
squeeze/trunk/src/add_dialog.h
squeeze/trunk/src/application.c
squeeze/trunk/src/application.h
squeeze/trunk/src/archive_store.c
squeeze/trunk/src/archive_store.h
squeeze/trunk/src/extract_dialog.c
squeeze/trunk/src/extract_dialog.h
squeeze/trunk/src/main.c
squeeze/trunk/src/main_window.c
squeeze/trunk/src/main_window.h
squeeze/trunk/src/navigation_bar.c
squeeze/trunk/src/navigation_bar.h
squeeze/trunk/src/new_dialog.c
squeeze/trunk/src/new_dialog.h
squeeze/trunk/src/notebook.c
squeeze/trunk/src/notebook.h
squeeze/trunk/src/path_bar.c
squeeze/trunk/src/path_bar.h
squeeze/trunk/src/preferences_dialog.c
squeeze/trunk/src/preferences_dialog.h
squeeze/trunk/src/settings.c
squeeze/trunk/src/settings.h
squeeze/trunk/src/tool_bar.c
squeeze/trunk/src/tool_bar.h
squeeze/trunk/src/widget_factory.c
squeeze/trunk/src/widget_factory.h
Log:
Changed email-adress
Changed Settings-file to ~/.config/squeeze/squeezerc
Fixed some other stuff...
Modified: squeeze/trunk/libsqueeze/archive-support-gnu-tar.c
===================================================================
--- squeeze/trunk/libsqueeze/archive-support-gnu-tar.c 2006-12-11 21:45:26 UTC
(rev 24080)
+++ squeeze/trunk/libsqueeze/archive-support-gnu-tar.c 2006-12-11 22:11:30 UTC
(rev 24081)
@@ -306,7 +306,7 @@
g_free(command);
return 0;
}
- archive->tmp_file = g_strconcat(lsq_tmp_dir,
"/xarchiver-XXXXXX" , NULL);
+ archive->tmp_file = g_strconcat(lsq_tmp_dir,
"/squeeze-XXXXXX" , NULL);
g_mkstemp(archive->tmp_file);
g_unlink(archive->tmp_file);
if(!g_strcasecmp(lsq_mime_info_get_name(archive->mime_info),
"application/x-tarz"))
@@ -428,7 +428,7 @@
g_free(command);
return 0;
}
- archive->tmp_file = g_strconcat(lsq_tmp_dir,
"/xarchiver-XXXXXX" , NULL);
+ archive->tmp_file = g_strconcat(lsq_tmp_dir,
"/squeeze-XXXXXX" , NULL);
g_mkstemp(archive->tmp_file);
g_unlink(archive->tmp_file);
if(!g_strcasecmp(lsq_mime_info_get_name(archive->mime_info),
"application/x-tarz"))
Modified: squeeze/trunk/libsqueeze/internals.c
===================================================================
--- squeeze/trunk/libsqueeze/internals.c 2006-12-11 21:45:26 UTC (rev
24080)
+++ squeeze/trunk/libsqueeze/internals.c 2006-12-11 22:11:30 UTC (rev
24081)
@@ -18,6 +18,7 @@
*/
#include <config.h>
+#include <stdlib.h>
#include <glib.h>
#include <glib-object.h>
@@ -27,44 +28,14 @@
#include "internals.h"
-#ifdef LSQ_TRACE_ALLOCATION
-
#define __USE_GNU
#include <unistd.h>
#include <stdio.h>
#include <string.h>
+#include <sys/types.h>
+#include <sys/wait.h>
-static gchar lsq_allocation_file[128];
-
-void lsq_trace_init()
-{
- snprintf(lsq_allocation_file, 127, "lsq_trace.%d", getpid());
- fclose( fopen(lsq_allocation_file, "w") );
-}
-
-gpointer lsq_trace_add(const gchar *methode, guint size, gpointer pointer,
const gchar *function, const gchar *file, guint line)
-{
- FILE *fp = fopen(lsq_allocation_file, "a");
-
- fprintf(fp, "%s:%d %s{ %s(%d) = %p }\n", file, line, function, methode,
size, pointer);
-
- fclose(fp);
-
- return pointer;
-}
-
-void lsq_trace_del(const gchar *methode, gpointer pointer, const gchar
*function, const gchar *file, guint line)
-{
- FILE *fp = fopen(lsq_allocation_file, "a");
-
- fprintf(fp, "%s:%d %s{ %s(%p) }\n", file, line, function, methode,
pointer);
-
- fclose(fp);
-}
-
-#endif /* LSQ_TRACE_ALLOCATION */
-
void
lsq_default_child_watch_func(GPid pid, gint status, gpointer data)
{
@@ -74,7 +45,15 @@
g_object_unref(archive);
else
{
- if(archive->status != LSQ_ARCHIVESTATUS_REFRESH)
+ g_spawn_close_pid(pid);
+ if(WIFEXITED(status))
+ {
+ if(WEXITSTATUS(status))
+ {
+ lsq_archive_set_status(archive,
LSQ_ARCHIVESTATUS_ERROR);
+ }
+ }
+ else
lsq_archive_set_status(archive, LSQ_ARCHIVESTATUS_IDLE);
}
}
Modified: squeeze/trunk/src/add_dialog.c
===================================================================
--- squeeze/trunk/src/add_dialog.c 2006-12-11 21:45:26 UTC (rev 24080)
+++ squeeze/trunk/src/add_dialog.c 2006-12-11 22:11:30 UTC (rev 24081)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
+ * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by *
the Free Software Foundation; either version 2 of the License, or
Modified: squeeze/trunk/src/add_dialog.h
===================================================================
--- squeeze/trunk/src/add_dialog.h 2006-12-11 21:45:26 UTC (rev 24080)
+++ squeeze/trunk/src/add_dialog.h 2006-12-11 22:11:30 UTC (rev 24081)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
+ * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: squeeze/trunk/src/application.c
===================================================================
--- squeeze/trunk/src/application.c 2006-12-11 21:45:26 UTC (rev 24080)
+++ squeeze/trunk/src/application.c 2006-12-11 22:11:30 UTC (rev 24081)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
+ * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: squeeze/trunk/src/application.h
===================================================================
--- squeeze/trunk/src/application.h 2006-12-11 21:45:26 UTC (rev 24080)
+++ squeeze/trunk/src/application.h 2006-12-11 22:11:30 UTC (rev 24081)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
+ * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: squeeze/trunk/src/archive_store.c
===================================================================
--- squeeze/trunk/src/archive_store.c 2006-12-11 21:45:26 UTC (rev 24080)
+++ squeeze/trunk/src/archive_store.c 2006-12-11 22:11:30 UTC (rev 24081)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
+ * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -1704,7 +1704,9 @@
static void
sq_archive_store_finalize(GObject *object)
{
+#ifdef DEBUG
g_debug("%s", __FUNCTION__);
+#endif
SQArchiveStore *store = SQ_ARCHIVE_STORE(object);
if(store->archive)
g_object_unref(store->archive);
Modified: squeeze/trunk/src/archive_store.h
===================================================================
--- squeeze/trunk/src/archive_store.h 2006-12-11 21:45:26 UTC (rev 24080)
+++ squeeze/trunk/src/archive_store.h 2006-12-11 22:11:30 UTC (rev 24081)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
+ * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: squeeze/trunk/src/extract_dialog.c
===================================================================
--- squeeze/trunk/src/extract_dialog.c 2006-12-11 21:45:26 UTC (rev 24080)
+++ squeeze/trunk/src/extract_dialog.c 2006-12-11 22:11:30 UTC (rev 24081)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
+ * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: squeeze/trunk/src/extract_dialog.h
===================================================================
--- squeeze/trunk/src/extract_dialog.h 2006-12-11 21:45:26 UTC (rev 24080)
+++ squeeze/trunk/src/extract_dialog.h 2006-12-11 22:11:30 UTC (rev 24081)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
+ * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: squeeze/trunk/src/main.c
===================================================================
--- squeeze/trunk/src/main.c 2006-12-11 21:45:26 UTC (rev 24080)
+++ squeeze/trunk/src/main.c 2006-12-11 22:11:30 UTC (rev 24081)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
+ * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: squeeze/trunk/src/main_window.c
===================================================================
--- squeeze/trunk/src/main_window.c 2006-12-11 21:45:26 UTC (rev 24080)
+++ squeeze/trunk/src/main_window.c 2006-12-11 22:11:30 UTC (rev 24081)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
+ * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: squeeze/trunk/src/main_window.h
===================================================================
--- squeeze/trunk/src/main_window.h 2006-12-11 21:45:26 UTC (rev 24080)
+++ squeeze/trunk/src/main_window.h 2006-12-11 22:11:30 UTC (rev 24081)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
+ * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: squeeze/trunk/src/navigation_bar.c
===================================================================
--- squeeze/trunk/src/navigation_bar.c 2006-12-11 21:45:26 UTC (rev 24080)
+++ squeeze/trunk/src/navigation_bar.c 2006-12-11 22:11:30 UTC (rev 24081)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
+ * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: squeeze/trunk/src/navigation_bar.h
===================================================================
--- squeeze/trunk/src/navigation_bar.h 2006-12-11 21:45:26 UTC (rev 24080)
+++ squeeze/trunk/src/navigation_bar.h 2006-12-11 22:11:30 UTC (rev 24081)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
+ * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: squeeze/trunk/src/new_dialog.c
===================================================================
--- squeeze/trunk/src/new_dialog.c 2006-12-11 21:45:26 UTC (rev 24080)
+++ squeeze/trunk/src/new_dialog.c 2006-12-11 22:11:30 UTC (rev 24081)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
+ * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: squeeze/trunk/src/new_dialog.h
===================================================================
--- squeeze/trunk/src/new_dialog.h 2006-12-11 21:45:26 UTC (rev 24080)
+++ squeeze/trunk/src/new_dialog.h 2006-12-11 22:11:30 UTC (rev 24081)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
+ * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: squeeze/trunk/src/notebook.c
===================================================================
--- squeeze/trunk/src/notebook.c 2006-12-11 21:45:26 UTC (rev 24080)
+++ squeeze/trunk/src/notebook.c 2006-12-11 22:11:30 UTC (rev 24081)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
+ * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -308,6 +308,12 @@
#ifdef DEBUG
g_debug("NOTEBOOK: Archive status changed");
#endif /* DEBUG */
+ if(lsq_archive_get_status(archive) == LSQ_ARCHIVESTATUS_ERROR)
+ {
+ GtkWidget *dialog = gtk_message_dialog_new(NULL, 0,
GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "Failed to open archive '%s'.",
archive->path);
+ gtk_dialog_run((GtkDialog *)dialog);
+ gtk_widget_destroy(dialog);
+ }
}
static void
Modified: squeeze/trunk/src/notebook.h
===================================================================
--- squeeze/trunk/src/notebook.h 2006-12-11 21:45:26 UTC (rev 24080)
+++ squeeze/trunk/src/notebook.h 2006-12-11 22:11:30 UTC (rev 24081)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
+ * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: squeeze/trunk/src/path_bar.c
===================================================================
--- squeeze/trunk/src/path_bar.c 2006-12-11 21:45:26 UTC (rev 24080)
+++ squeeze/trunk/src/path_bar.c 2006-12-11 22:11:30 UTC (rev 24081)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
+ * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: squeeze/trunk/src/path_bar.h
===================================================================
--- squeeze/trunk/src/path_bar.h 2006-12-11 21:45:26 UTC (rev 24080)
+++ squeeze/trunk/src/path_bar.h 2006-12-11 22:11:30 UTC (rev 24081)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
+ * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: squeeze/trunk/src/preferences_dialog.c
===================================================================
--- squeeze/trunk/src/preferences_dialog.c 2006-12-11 21:45:26 UTC (rev
24080)
+++ squeeze/trunk/src/preferences_dialog.c 2006-12-11 22:11:30 UTC (rev
24081)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
+ * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: squeeze/trunk/src/preferences_dialog.h
===================================================================
--- squeeze/trunk/src/preferences_dialog.h 2006-12-11 21:45:26 UTC (rev
24080)
+++ squeeze/trunk/src/preferences_dialog.h 2006-12-11 22:11:30 UTC (rev
24081)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
+ * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: squeeze/trunk/src/settings.c
===================================================================
--- squeeze/trunk/src/settings.c 2006-12-11 21:45:26 UTC (rev 24080)
+++ squeeze/trunk/src/settings.c 2006-12-11 22:11:30 UTC (rev 24081)
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
+/* Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -62,7 +62,7 @@
sq_settings_init(SQSettings *object)
{
#ifdef HAVE_LIBXFCE4UTIL
- object->xfce_rc = (GObject *)xfce_rc_config_open(XFCE_RESOURCE_CONFIG,
"xarchiver/xarchiverrc", FALSE);
+ object->xfce_rc = (GObject *)xfce_rc_config_open(XFCE_RESOURCE_CONFIG,
"squeeze/squeezerc", FALSE);
#else
#endif /* HAVE_LIBXFCE4UTIL */
Modified: squeeze/trunk/src/settings.h
===================================================================
--- squeeze/trunk/src/settings.h 2006-12-11 21:45:26 UTC (rev 24080)
+++ squeeze/trunk/src/settings.h 2006-12-11 22:11:30 UTC (rev 24081)
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
+/* Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: squeeze/trunk/src/tool_bar.c
===================================================================
--- squeeze/trunk/src/tool_bar.c 2006-12-11 21:45:26 UTC (rev 24080)
+++ squeeze/trunk/src/tool_bar.c 2006-12-11 22:11:30 UTC (rev 24081)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
+ * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: squeeze/trunk/src/tool_bar.h
===================================================================
--- squeeze/trunk/src/tool_bar.h 2006-12-11 21:45:26 UTC (rev 24080)
+++ squeeze/trunk/src/tool_bar.h 2006-12-11 22:11:30 UTC (rev 24081)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
+ * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: squeeze/trunk/src/widget_factory.c
===================================================================
--- squeeze/trunk/src/widget_factory.c 2006-12-11 21:45:26 UTC (rev 24080)
+++ squeeze/trunk/src/widget_factory.c 2006-12-11 22:11:30 UTC (rev 24081)
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
+/* Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Modified: squeeze/trunk/src/widget_factory.h
===================================================================
--- squeeze/trunk/src/widget_factory.h 2006-12-11 21:45:26 UTC (rev 24080)
+++ squeeze/trunk/src/widget_factory.h 2006-12-11 22:11:30 UTC (rev 24081)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
+ * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
