[Xfce4-commits] r26622 - in squeeze/trunk: libsqueeze src
Stephan Arts
stephan at xfce.org
Sun Feb 17 13:47:49 CET 2008
Author: stephan
Date: 2008-02-17 12:47:49 +0000 (Sun, 17 Feb 2008)
New Revision: 26622
Modified:
squeeze/trunk/libsqueeze/archive.c
squeeze/trunk/libsqueeze/archive.h
squeeze/trunk/src/application.c
squeeze/trunk/src/main_window.c
squeeze/trunk/src/message_dialog.c
squeeze/trunk/src/notebook.c
Log:
Remove some critical warnings
Modified: squeeze/trunk/libsqueeze/archive.c
===================================================================
--- squeeze/trunk/libsqueeze/archive.c 2008-02-17 12:08:21 UTC (rev 26621)
+++ squeeze/trunk/libsqueeze/archive.c 2008-02-17 12:47:49 UTC (rev 26622)
@@ -372,11 +372,17 @@
}
const gchar *
-lsq_archive_get_status(const LSQArchive *archive)
+lsq_archive_get_state_msg(const LSQArchive *archive)
{
- return NULL;
+ return archive->priv->state_msg;
}
+LSQArchiveState
+lsq_archive_get_state(const LSQArchive *archive)
+{
+ return archive->priv->state;
+}
+
/**
* lsq_archive_get_path_info:
* @archive: the archive
@@ -395,19 +401,31 @@
return archive->priv->s_template->support_mask;
}
+/**
+ * lsq_archive_operate:
+ * @archive: the archive
+ * @type: The command-type to be executed
+ *
+ * Return value: TRUE on success
+ */
gboolean
lsq_archive_operate(LSQArchive *archive, LSQCommandType type)
{
+ g_debug("%s", __FUNCTION__);
+ LSQSupportTemplate *s_template = archive->priv->s_template;
+
switch (type)
{
case LSQ_COMMAND_TYPE_ADD:
case LSQ_COMMAND_TYPE_REMOVE:
case LSQ_COMMAND_TYPE_EXTRACT:
- case LSQ_COMMAND_TYPE_REFRESH:
case LSQ_COMMAND_TYPE_OPEN:
case LSQ_COMMAND_TYPE_TEST:
return FALSE;
break;
+ case LSQ_COMMAND_TYPE_REFRESH:
+ return FALSE;
+ break;
default:
return FALSE;
break;
Modified: squeeze/trunk/libsqueeze/archive.h
===================================================================
--- squeeze/trunk/libsqueeze/archive.h 2008-02-17 12:08:21 UTC (rev 26621)
+++ squeeze/trunk/libsqueeze/archive.h 2008-02-17 12:47:49 UTC (rev 26622)
@@ -44,6 +44,12 @@
LSQ_ARCHIVE_PROP_USER
};
+typedef enum
+{
+ LSQ_ARCHIVE_STATE_IDLE,
+ LSQ_ARCHIVE_STATE_BUSY
+} LSQArchiveState;
+
typedef struct _LSQArchivePrivate LSQArchivePrivate;
struct _LSQArchivePrivate
@@ -54,6 +60,8 @@
LSQSupportTemplate *s_template;
+ LSQArchiveState state;
+ const gchar *state_msg;
};
@@ -89,7 +97,6 @@
gchar *lsq_archive_get_path(const LSQArchive *archive);
const gchar *lsq_archive_get_filename(const LSQArchive *archive);
const gchar *lsq_archive_get_mimetype(const LSQArchive *archive);
-const gchar *lsq_archive_get_status(const LSQArchive *archive);
gboolean lsq_archive_exists(const LSQArchive *archive);
LSQSupportType lsq_archive_get_support_mask(const LSQArchive *archive);
@@ -103,7 +110,13 @@
gboolean lsq_archive_operate(LSQArchive *archive, LSQCommandType type);
+const gchar *
+lsq_archive_get_state_msg(const LSQArchive *archive);
+LSQArchiveState
+lsq_archive_get_state(const LSQArchive *archive);
+
+
G_END_DECLS
#endif /* __ARCHIVE_H__ */
Modified: squeeze/trunk/src/application.c
===================================================================
--- squeeze/trunk/src/application.c 2008-02-17 12:08:21 UTC (rev 26621)
+++ squeeze/trunk/src/application.c 2008-02-17 12:47:49 UTC (rev 26622)
@@ -42,9 +42,6 @@
static void
sq_application_dispose(GObject *object);
-static void
-cb_sq_application_archive_command_terminated(LSQArchive *archive, GError *error, gpointer userdata);
-
enum
{
SQ_APPLICATION_SIGNAL_DESTROY = 0,
@@ -179,7 +176,6 @@
lsq_close_archive(lp_archive);
return 1;
}
- g_signal_connect(G_OBJECT(lp_archive), "command-terminated", G_CALLBACK(cb_sq_application_archive_command_terminated), app);
GtkWidget *message_dialog = sq_message_dialog_new(GTK_WINDOW_TOPLEVEL, lp_archive);
gtk_widget_show(message_dialog);
if(!lsq_archive_operate(lp_archive, LSQ_COMMAND_TYPE_EXTRACT))
@@ -254,7 +250,6 @@
return 1;
}
}
- g_signal_connect(G_OBJECT(lp_archive), "command-terminated", G_CALLBACK(cb_sq_application_archive_command_terminated), app);
GtkWidget *message_dialog = sq_message_dialog_new(GTK_WINDOW_TOPLEVEL, lp_archive);
gtk_widget_show(message_dialog);
@@ -293,11 +288,3 @@
gtk_widget_show(window);
return retval;
}
-
-static void
-cb_sq_application_archive_command_terminated(LSQArchive *archive, GError *error, gpointer userdata)
-{
- SQApplication *app = userdata;
- lsq_close_archive(archive);
- g_object_unref(app);
-}
Modified: squeeze/trunk/src/main_window.c
===================================================================
--- squeeze/trunk/src/main_window.c 2008-02-17 12:08:21 UTC (rev 26621)
+++ squeeze/trunk/src/main_window.c 2008-02-17 12:47:49 UTC (rev 26622)
@@ -94,7 +94,6 @@
static void cb_sq_main_close_window(GtkWidget *widget, gpointer userdata);
-static void cb_sq_main_window_archive_command_terminated(LSQArchive *archive, GError *error, gpointer userdata);
/*static void cb_sq_main_properties(GtkWidget *widget, gpointer userdata);*/
/*static void cb_sq_main_preferences(GtkWidget *widget, gpointer userdata);*/
@@ -1136,7 +1135,7 @@
sq_main_window_new_action_menu(window, lp_archive);
guint context_id = gtk_statusbar_get_context_id(GTK_STATUSBAR(window->statusbar), "Window Statusbar");
- const gchar *message = lsq_archive_get_status(lp_archive);
+ const gchar *message = lsq_archive_get_state_msg(lp_archive);
if(!message)
{
message = _("Done");
@@ -1294,7 +1293,6 @@
gtk_widget_set_sensitive(window->menubar.menu_item_close, TRUE);
/*gtk_widget_set_sensitive(window->menubar.menu_item_properties, TRUE);*/
- g_signal_connect(G_OBJECT(archive), "command-terminated", G_CALLBACK(cb_sq_main_window_archive_command_terminated), window);
return 0;
}
else
@@ -1355,26 +1353,13 @@
}
static void
-cb_sq_main_window_archive_command_terminated(LSQArchive *archive, GError *error, gpointer userdata)
-{
- SQMainWindow *window = userdata;
-
- if(error)
- {
- GtkWidget *error_dialog = gtk_message_dialog_new(GTK_WINDOW(window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, error->message);
- gtk_dialog_run(GTK_DIALOG(error_dialog));
- gtk_widget_destroy(error_dialog);
- }
-}
-
-static void
cb_sq_main_window_notebook_state_changed(SQNotebook *notebook, LSQArchive *archive, gpointer userdata)
{
SQMainWindow *window = SQ_MAIN_WINDOW(userdata);
LSQSupportType support_mask = lsq_archive_get_support_mask(archive);
guint context_id = gtk_statusbar_get_context_id(GTK_STATUSBAR(window->statusbar), "Window Statusbar");
- const gchar *message = lsq_archive_get_status(archive);
+ const gchar *message = lsq_archive_get_state_msg(archive);
if(!message)
{
sq_throbber_set_animated(SQ_THROBBER(window->throbber), FALSE);
Modified: squeeze/trunk/src/message_dialog.c
===================================================================
--- squeeze/trunk/src/message_dialog.c 2008-02-17 12:08:21 UTC (rev 26621)
+++ squeeze/trunk/src/message_dialog.c 2008-02-17 12:47:49 UTC (rev 26622)
@@ -137,7 +137,7 @@
if(dialog->archive)
{
gtk_progress_bar_pulse(GTK_PROGRESS_BAR(dialog->progress_bar));
- gtk_progress_bar_set_text(GTK_PROGRESS_BAR(dialog->progress_bar), lsq_archive_get_status(dialog->archive));
+ gtk_progress_bar_set_text(GTK_PROGRESS_BAR(dialog->progress_bar), lsq_archive_get_state_msg(dialog->archive));
return TRUE;
}
return FALSE;
Modified: squeeze/trunk/src/notebook.c
===================================================================
--- squeeze/trunk/src/notebook.c 2008-02-17 12:08:21 UTC (rev 26621)
+++ squeeze/trunk/src/notebook.c 2008-02-17 12:47:49 UTC (rev 26622)
@@ -574,7 +574,7 @@
if(new_archive == FALSE)
{
- //lsq_archive_full_refresh(archive);
+ lsq_archive_operate(archive, LSQ_COMMAND_TYPE_REFRESH);
}
}
@@ -653,18 +653,19 @@
cb_notebook_tab_archive_state_changed(LSQArchive *archive, GtkContainer *widget)
{
GList *children = gtk_container_get_children(widget);
- if(lsq_archive_get_status(archive))
+ switch(lsq_archive_get_state(archive))
{
- gtk_widget_hide(GTK_WIDGET(children->data));
- sq_throbber_set_animated(SQ_THROBBER(gtk_bin_get_child(GTK_BIN(children->next->data))), TRUE);
- gtk_widget_show(GTK_WIDGET(children->next->data));
+ case LSQ_ARCHIVE_STATE_IDLE:
+ gtk_widget_show(GTK_WIDGET(children->data));
+ sq_throbber_set_animated(SQ_THROBBER(gtk_bin_get_child(GTK_BIN(children->next->data))), FALSE);
+ gtk_widget_hide(GTK_WIDGET(children->next->data));
+ break;
+ default:
+ gtk_widget_hide(GTK_WIDGET(children->data));
+ sq_throbber_set_animated(SQ_THROBBER(gtk_bin_get_child(GTK_BIN(children->next->data))), TRUE);
+ gtk_widget_show(GTK_WIDGET(children->next->data));
+ break;
}
- else
- {
- gtk_widget_show(GTK_WIDGET(children->data));
- sq_throbber_set_animated(SQ_THROBBER(gtk_bin_get_child(GTK_BIN(children->next->data))), FALSE);
- gtk_widget_hide(GTK_WIDGET(children->next->data));
- }
g_list_free(children);
}
More information about the Xfce4-commits
mailing list