[gnome-builder: 42/139] transfers: remove legacy transfers code
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder: 42/139] transfers: remove legacy transfers code
- Date: Thu, 10 Jan 2019 04:20:51 +0000 (UTC)
commit 2535d1b32cd938715feab5a187a2c4b95bfea75c
Author: Christian Hergert <chergert redhat com>
Date: Wed Jan 9 16:28:11 2019 -0800
transfers: remove legacy transfers code
This also moves some transfers code to the new libide-gui library.
.../{transfers => gui}/ide-transfer-button.c | 10 +-
.../{transfers => gui}/ide-transfer-button.h | 14 +-
src/libide/transfers/ide-pkcon-transfer.c | 283 -------------
src/libide/transfers/ide-pkcon-transfer.h | 37 --
src/libide/transfers/ide-transfer-manager.c | 467 --------------------
src/libide/transfers/ide-transfer-manager.h | 55 ---
src/libide/transfers/ide-transfer-row.c | 224 ----------
src/libide/transfers/ide-transfer-row.h | 42 --
src/libide/transfers/ide-transfer-row.ui | 86 ----
src/libide/transfers/ide-transfer.c | 470 ---------------------
src/libide/transfers/ide-transfer.h | 102 -----
src/libide/transfers/ide-transfers-button.c | 188 ---------
src/libide/transfers/ide-transfers-button.h | 37 --
src/libide/transfers/ide-transfers-button.ui | 54 ---
src/libide/transfers/ide-transfers-progress-icon.c | 186 --------
src/libide/transfers/ide-transfers-progress-icon.h | 42 --
src/libide/transfers/meson.build | 24 --
17 files changed, 9 insertions(+), 2312 deletions(-)
---
diff --git a/src/libide/transfers/ide-transfer-button.c b/src/libide/gui/ide-transfer-button.c
similarity index 96%
rename from src/libide/transfers/ide-transfer-button.c
rename to src/libide/gui/ide-transfer-button.c
index ac71457d4..e977587da 100644
--- a/src/libide/transfers/ide-transfer-button.c
+++ b/src/libide/gui/ide-transfer-button.c
@@ -24,12 +24,8 @@
#include <glib/gi18n.h>
-#include "ide-debug.h"
-
-#include "application/ide-application.h"
-#include "transfers/ide-transfer-button.h"
-#include "transfers/ide-transfer-manager.h"
-#include "util/ide-gtk.h"
+#include "ide-gui-global.h"
+#include "ide-transfer-button.h"
typedef struct
{
@@ -157,7 +153,7 @@ ide_transfer_button_clicked (GtkButton *button)
dzl_progress_button_set_show_progress (DZL_PROGRESS_BUTTON (self), TRUE);
gtk_widget_set_sensitive (GTK_WIDGET (self), FALSE);
- transfer_manager = ide_application_get_transfer_manager (IDE_APPLICATION_DEFAULT);
+ transfer_manager = ide_transfer_manager_get_default ();
/* TODO: Cancellable state */
g_clear_object (&priv->cancellable);
diff --git a/src/libide/transfers/ide-transfer-button.h b/src/libide/gui/ide-transfer-button.h
similarity index 87%
rename from src/libide/transfers/ide-transfer-button.h
rename to src/libide/gui/ide-transfer-button.h
index 807f4bc67..b208d4c3d 100644
--- a/src/libide/transfers/ide-transfer-button.h
+++ b/src/libide/gui/ide-transfer-button.h
@@ -20,11 +20,12 @@
#pragma once
-#include <dazzle.h>
-
-#include "ide-version-macros.h"
+#if !defined (IDE_GUI_INSIDE) && !defined (IDE_GUI_COMPILATION)
+# error "Only <libide-gui.h> can be included directly."
+#endif
-#include "transfers/ide-transfer.h"
+#include <dazzle.h>
+#include <libide-core.h>
G_BEGIN_DECLS
@@ -38,10 +39,7 @@ struct _IdeTransferButtonClass
DzlProgressButtonClass parent_class;
/*< private >*/
- gpointer _reserved1;
- gpointer _reserved2;
- gpointer _reserved3;
- gpointer _reserved4;
+ gpointer _reserved[8];
};
IDE_AVAILABLE_IN_3_32
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]