[Xfce4-commits] r23391 - in xarchiver/branches/xarchiver-psybsd: libxarchiver src
Stephan Arts
stephan at xfce.org
Fri Oct 13 08:37:27 UTC 2006
Author: stephan
Date: 2006-10-13 08:37:26 +0000 (Fri, 13 Oct 2006)
New Revision: 23391
Modified:
xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support-unrar.c
xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support.c
xarchiver/branches/xarchiver-psybsd/libxarchiver/archive.c
xarchiver/branches/xarchiver-psybsd/libxarchiver/archive.h
xarchiver/branches/xarchiver-psybsd/libxarchiver/mime.c
xarchiver/branches/xarchiver-psybsd/src/tool_bar.c
Log:
Some code-cleanups
Modified: xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support-unrar.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support-unrar.c 2006-10-13 07:37:28 UTC (rev 23390)
+++ xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support-unrar.c 2006-10-13 08:37:26 UTC (rev 23391)
@@ -16,8 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#define EXO_API_SUBJECT_TO_CHANGE
-
#include <glib.h>
#include <glib-object.h>
#include <thunar-vfs/thunar-vfs.h>
Modified: xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support.c 2006-10-13 07:37:28 UTC (rev 23390)
+++ xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support.c 2006-10-13 08:37:26 UTC (rev 23391)
@@ -16,8 +16,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#define EXO_API_SUBJECT_TO_CHANGE
-
#include <string.h>
#include <glib.h>
#include <glib/gstdio.h>
Modified: xarchiver/branches/xarchiver-psybsd/libxarchiver/archive.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/libxarchiver/archive.c 2006-10-13 07:37:28 UTC (rev 23390)
+++ xarchiver/branches/xarchiver-psybsd/libxarchiver/archive.c 2006-10-13 08:37:26 UTC (rev 23391)
@@ -14,8 +14,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#define EXO_API_SUBJECT_TO_CHANGE
-
#include <config.h>
#include <string.h>
#include <glib.h>
@@ -32,7 +30,9 @@
#include "internals.h"
+#ifndef LXA_ENTRY_CHILD_BUFFER_SIZE
#define LXA_ENTRY_CHILD_BUFFER_SIZE 300
+#endif
static void
@@ -112,6 +112,11 @@
archive->root_entry->children = NULL;
}
+/** static void
+ * lxa_archive_finalize(GObject *object)
+ *
+ *
+ */
static void
lxa_archive_finalize(GObject *object)
{
@@ -265,8 +270,7 @@
return 0;
}
-//TODO: why does this have a return value?
-gboolean
+void
lxa_archive_entry_add_child(LXAArchive *archive, LXAEntry *parent, LXAEntry *child)
{
parent->buffer = lxa_slist_insert_sorted_single(parent->buffer, child);
@@ -275,6 +279,8 @@
lxa_archive_entry_flush_buffer(archive, parent);
}
+/* FIXME FIXME FIXME FIXME FIXME FIXME FIXME*/
+/* these functions should not even exist */
LXAEntry *
lxa_entry_get_child(LXAEntry *entry, const gchar *filename)
{
Modified: xarchiver/branches/xarchiver-psybsd/libxarchiver/archive.h
===================================================================
--- xarchiver/branches/xarchiver-psybsd/libxarchiver/archive.h 2006-10-13 07:37:28 UTC (rev 23390)
+++ xarchiver/branches/xarchiver-psybsd/libxarchiver/archive.h 2006-10-13 08:37:26 UTC (rev 23391)
@@ -99,13 +99,13 @@
GType lxa_archive_get_type(void);
LXAArchive *lxa_archive_new(gchar *, gchar *);
-gchar *lxa_archive_discover_mime(LXAArchive *archive);
void lxa_archive_set_status(LXAArchive *archive, LXAArchiveStatus status);
gint lxa_archive_lookup_dir(gpointer entry, gconstpointer filename);
LXAEntry *lxa_archive_add_file(LXAArchive *archive, gchar *path);
+void lxa_archive_entry_add_child(LXAArchive *archive, LXAEntry *parent, LXAEntry *child);
+
GSList *lxa_archive_get_children(LXAArchive *archive, gchar *path);
LXAEntry *lxa_entry_get_child(LXAEntry *, const gchar *);
-gboolean lxa_entry_add_child(LXAEntry *parent, LXAEntry *child);
guint lxa_entry_children_length(LXAEntry *entry);
LXAEntry *lxa_entry_children_nth_data(LXAArchive *archive, LXAEntry *entry, guint n);
//gint lxa_entry_children_index(LXAEntry *entry, LXAEntry *find);
Modified: xarchiver/branches/xarchiver-psybsd/libxarchiver/mime.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/libxarchiver/mime.c 2006-10-13 07:37:28 UTC (rev 23390)
+++ xarchiver/branches/xarchiver-psybsd/libxarchiver/mime.c 2006-10-13 08:37:26 UTC (rev 23391)
@@ -97,7 +97,7 @@
if(gtk_icon_theme_has_icon(icon_theme, icon_name))
g_value_set_string(value, icon_name);
else
+ g_value_set_string(value, NULL);
#endif
- g_value_set_string(value, NULL);
/* g_free((gchar *)mime_type); */
}
Modified: xarchiver/branches/xarchiver-psybsd/src/tool_bar.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/tool_bar.c 2006-10-13 07:37:28 UTC (rev 23390)
+++ xarchiver/branches/xarchiver-psybsd/src/tool_bar.c 2006-10-13 08:37:26 UTC (rev 23391)
@@ -21,6 +21,7 @@
#include <glib.h>
#include <gtk/gtk.h>
#include <libxarchiver/libxarchiver.h>
+#include <gettext.h>
#include "archive_store.h"
#include "navigation_bar.h"
#include "tool_bar.h"
@@ -111,15 +112,20 @@
button = gtk_tool_item_new();
tool_bar->path_field = gtk_entry_new();
+ gtk_tool_item_set_expand(button, TRUE);
+ GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
- gtk_container_add(GTK_CONTAINER(button), tool_bar->path_field);
+ gtk_container_add(GTK_CONTAINER(button), hbox);
+ gtk_box_pack_start(GTK_BOX(hbox), gtk_label_new(_("Location:")), FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(hbox), tool_bar->path_field, TRUE, TRUE, 5);
g_signal_connect(G_OBJECT(tool_bar->path_field), "activate", (GCallback)cb_xa_tool_bar_path_field_activated, tool_bar);
gtk_tool_item_set_visible_horizontal(button, TRUE);
- gtk_tool_item_set_homogeneous(button, TRUE);
+ gtk_tool_item_set_homogeneous(button, FALSE);
gtk_toolbar_insert(GTK_TOOLBAR(tool_bar), button, 5);
gtk_widget_show_all(GTK_WIDGET(button));
gtk_widget_show(GTK_WIDGET(tool_bar->path_field));
+ gtk_widget_set_sensitive(GTK_WIDGET(tool_bar->path_field), 0);
}
@@ -177,6 +183,7 @@
xa_navigation_bar_history_push(XA_NAVIGATION_BAR(tool_bar), path);
xa_tool_bar_refresh(tool_bar, path);
g_free(path);
+ gtk_widget_set_sensitive(GTK_WIDGET(tool_bar->path_field), TRUE);
}
static void
More information about the Xfce4-commits
mailing list