From fc3949785bbe99fcae0e3af32d5108f351fc0751 Mon Sep 17 00:00:00 2001
From: Antoine Fontaine <antoine.fontaine@epfl.ch>
Date: Tue, 11 Jun 2019 00:24:42 +0200
Subject: [PATCH] Cosmetic changes
---
src/gui-resource.c | 52 ++++++++++++++++++++++++++--------------------
1 file changed, 29 insertions(+), 23 deletions(-)
diff --git a/src/gui-resource.c b/src/gui-resource.c
index 5d0af39..fb2cf75 100644
--- a/src/gui-resource.c
+++ b/src/gui-resource.c
@@ -52,10 +52,10 @@ gui_resource_new (struct Resource file_info)
// if both or none are true, there is a problem
g_assert ((file_info.filename==NULL) ^ (file_info.type==RESOURCE_FOLDERFILE));
return g_object_new (HDY_TYPE_GUI_RESOURCE,
- "resource_type", file_info.type,
- "resource_name", file_info.name,
+ "resource_type", file_info.type,
+ "resource_name", file_info.name,
"resource_textname", file_info.textname,
- "resource_id", file_info.id,
+ "resource_id", file_info.id,
"resource_filename", file_info.filename,
NULL);
}
@@ -78,6 +78,7 @@ open_folder_cb (gpointer ptr, gpointer data)
struct FolderContent *content = data;
GtkListBox *parent = GTK_LIST_BOX (gtk_widget_get_parent (GTK_WIDGET (self)));
guint start_index = gtk_list_box_row_get_index (GTK_LIST_BOX_ROW (self));
+
gtk_container_remove (GTK_CONTAINER (parent), GTK_WIDGET (self));
for (guint i=0; i<content->resource_count; i++) {
GuiResource *resource = gui_resource_new (content->resources[i]);
@@ -93,12 +94,13 @@ activated_cb (GtkListBox* unused, GuiResource *self)
gtk_list_box_row_set_activatable (GTK_LIST_BOX_ROW (self), FALSE);
switch (self->type) {
- case RESOURCE_ASSIGNMENT:
+ case RESOURCE_ASSIGNMENT: {
// just open it in the web browser
- { g_autofree gchar *url = g_strdup_printf (EPFL_ASSIGNMENT_LINK"%u", self->id);
- if (!g_app_info_launch_default_for_uri (url, NULL, NULL))
- g_error ("could not open url %s\n", url); }
+ g_autofree gchar *url = g_strdup_printf (EPFL_ASSIGNMENT_LINK"%u", self->id);
+ if (!g_app_info_launch_default_for_uri (url, NULL, NULL))
+ g_error ("could not open url %s\n", url);
break;
+ }
case RESOURCE_FILE:
moodle_provider_download_file_async (self->id, open_file_cb, self);
break;
@@ -112,30 +114,34 @@ activated_cb (GtkListBox* unused, GuiResource *self)
moodle_provider_get_folder_content_async (open_folder_cb, self->id, self);
//folder_opened_cb (self, 0, NULL);
break;
- case RESOURCE_FORUM:
+ case RESOURCE_FORUM: {
// just open it in the web browser
- { g_autofree gchar *url = g_strdup_printf (EPFL_FORUM_LINK"%u", self->id);
- if (!g_app_info_launch_default_for_uri (url, NULL, NULL))
- g_error ("could not open url %s\n", url); }
+ g_autofree gchar *url = g_strdup_printf (EPFL_FORUM_LINK"%u", self->id);
+ if (!g_app_info_launch_default_for_uri (url, NULL, NULL))
+ g_error ("could not open url %s\n", url);
break;
- case RESOURCE_PAGE:
+ }
+ case RESOURCE_PAGE: {
// just open it in the web browser
- { g_autofree gchar *url = g_strdup_printf (EPFL_PAGE_LINK"%u", self->id);
- if (!g_app_info_launch_default_for_uri (url, NULL, NULL))
- g_error ("could not open url %s\n", url); }
+ g_autofree gchar *url = g_strdup_printf (EPFL_PAGE_LINK"%u", self->id);
+ if (!g_app_info_launch_default_for_uri (url, NULL, NULL))
+ g_error ("could not open url %s\n", url);
break;
- case RESOURCE_QUIZ:
+ }
+ case RESOURCE_QUIZ: {
// just open it in the web browser
- { g_autofree gchar *url = g_strdup_printf (EPFL_QUIZ_LINK"%u", self->id);
- if (!g_app_info_launch_default_for_uri (url, NULL, NULL))
- g_error ("could not open url %s\n", url); }
+ g_autofree gchar *url = g_strdup_printf (EPFL_QUIZ_LINK"%u", self->id);
+ if (!g_app_info_launch_default_for_uri (url, NULL, NULL))
+ g_error ("could not open url %s\n", url);
break;
- case RESOURCE_URL:
+ }
+ case RESOURCE_URL: {
// just open it in the web browser, for now
- { g_autofree gchar *url = g_strdup_printf (EPFL_URL_LINK"%u", self->id);
- if (!g_app_info_launch_default_for_uri (url, NULL, NULL))
- g_error ("could not open url %s\n", url); }
+ g_autofree gchar *url = g_strdup_printf (EPFL_URL_LINK"%u", self->id);
+ if (!g_app_info_launch_default_for_uri (url, NULL, NULL))
+ g_error ("could not open url %s\n", url);
break;
+ }
default:
//g_warning ("Ressource type %i isn't supported\n", self->type);
break;
--
GitLab