From dc96d892f5760b465882f8eb059349108754f715 Mon Sep 17 00:00:00 2001 From: Evangelos Ribeiro Tzaras Date: Thu, 18 Nov 2021 13:53:00 +0100 Subject: [PATCH] Remove encryption indicator Not used anymore since we switched to libcall-ui. Should've been removed as a part of !425. --- po/POTFILES.in | 2 - src/calls-application.c | 2 - src/calls-encryption-indicator.c | 138 ------------------------------- src/calls-encryption-indicator.h | 45 ---------- src/calls.gresources.xml | 1 - src/meson.build | 1 - src/ui/encryption-indicator.ui | 52 ------------ 7 files changed, 241 deletions(-) delete mode 100644 src/calls-encryption-indicator.c delete mode 100644 src/calls-encryption-indicator.h delete mode 100644 src/ui/encryption-indicator.ui diff --git a/po/POTFILES.in b/po/POTFILES.in index 000699a..b365410 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -11,7 +11,6 @@ src/calls-call-window.c src/calls-contacts-box.c src/calls-contacts-provider.c src/calls-contacts-row.c -src/calls-encryption-indicator.c src/calls-history-box.c src/calls-in-app-notification.c src/calls-main-window.c @@ -29,7 +28,6 @@ src/ui/call-record-row.ui src/ui/call-selector-item.ui src/ui/call-window.ui src/ui/contacts-box.ui -src/ui/encryption-indicator.ui src/ui/history-box.ui src/ui/history-header-bar.ui src/ui/in-app-notification.ui diff --git a/src/calls-application.c b/src/calls-application.c index 5d57c00..d27ea0c 100644 --- a/src/calls-application.c +++ b/src/calls-application.c @@ -31,7 +31,6 @@ #include "calls-dbus-manager.h" #include "calls-history-box.h" #include "calls-new-call-box.h" -#include "calls-encryption-indicator.h" #include "calls-ringer.h" #include "calls-notifier.h" #include "calls-record-store.h" @@ -652,7 +651,6 @@ calls_application_class_init (CallsApplicationClass *klass) application_class->dbus_register = calls_application_dbus_register; application_class->dbus_unregister = calls_application_dbus_unregister; - g_type_ensure (CALLS_TYPE_ENCRYPTION_INDICATOR); g_type_ensure (CALLS_TYPE_HISTORY_BOX); g_type_ensure (CALLS_TYPE_NEW_CALL_BOX); } diff --git a/src/calls-encryption-indicator.c b/src/calls-encryption-indicator.c deleted file mode 100644 index b39267f..0000000 --- a/src/calls-encryption-indicator.c +++ /dev/null @@ -1,138 +0,0 @@ -/* - * Copyright (C) 2018 Purism SPC - * - * This file is part of Calls. - * - * Calls 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 3 of the License, or - * (at your option) any later version. - * - * Calls is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Calls. If not, see . - * - * Author: Adrien Plazas - * - * SPDX-License-Identifier: GPL-3.0-or-later - * - */ - -#include "calls-encryption-indicator.h" - -#include - -struct _CallsEncryptionIndicator -{ - GtkStack parent_instance; - - GtkBox *is_not_encrypted; - GtkBox *is_encrypted; -}; - -G_DEFINE_TYPE (CallsEncryptionIndicator, calls_encryption_indicator, GTK_TYPE_STACK); - -enum { - PROP_0, - PROP_ENCRYPTED, - PROP_LAST_PROP, -}; -static GParamSpec *props[PROP_LAST_PROP]; - - -void -calls_encryption_indicator_set_encrypted (CallsEncryptionIndicator *self, - gboolean encrypted) -{ - g_return_if_fail (CALLS_IS_ENCRYPTION_INDICATOR (self)); - - encrypted = !!encrypted; - - gtk_stack_set_visible_child ( - GTK_STACK (self), - GTK_WIDGET (encrypted ? self->is_encrypted : self->is_not_encrypted)); -} - - -gboolean -calls_encryption_indicator_get_encrypted (CallsEncryptionIndicator *self) -{ - g_return_val_if_fail (CALLS_IS_ENCRYPTION_INDICATOR (self), FALSE); - - return gtk_stack_get_visible_child (GTK_STACK (self)) == GTK_WIDGET (self->is_encrypted); -} - - -static void -calls_encryption_indicator_init (CallsEncryptionIndicator *self) -{ - gtk_widget_init_template (GTK_WIDGET (self)); -} - - -static void -set_property (GObject *object, - guint property_id, - const GValue *value, - GParamSpec *pspec) -{ - CallsEncryptionIndicator *self = CALLS_ENCRYPTION_INDICATOR (object); - - switch (property_id) { - case PROP_ENCRYPTED: - calls_encryption_indicator_set_encrypted (self, g_value_get_boolean (value)); - break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); - break; - } -} - - -static void -get_property (GObject *object, - guint property_id, - GValue *value, - GParamSpec *pspec) -{ - CallsEncryptionIndicator *self = CALLS_ENCRYPTION_INDICATOR (object); - - switch (property_id) { - case PROP_ENCRYPTED: - g_value_set_boolean (value, calls_encryption_indicator_get_encrypted (self)); - break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); - break; - } -} - - -static void -calls_encryption_indicator_class_init (CallsEncryptionIndicatorClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); - - object_class->set_property = set_property; - object_class->get_property = get_property; - - props[PROP_ENCRYPTED] = - g_param_spec_boolean ("encrypted", - "Encrypted", - "The party participating in the call", - FALSE, - G_PARAM_READWRITE); - - g_object_class_install_properties (object_class, PROP_LAST_PROP, props); - gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Calls/ui/encryption-indicator.ui"); - gtk_widget_class_bind_template_child (widget_class, CallsEncryptionIndicator, is_not_encrypted); - gtk_widget_class_bind_template_child (widget_class, CallsEncryptionIndicator, is_encrypted); -} - diff --git a/src/calls-encryption-indicator.h b/src/calls-encryption-indicator.h deleted file mode 100644 index 2e891fa..0000000 --- a/src/calls-encryption-indicator.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) 2018 Purism SPC - * - * This file is part of Calls. - * - * Calls 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 3 of the License, or - * (at your option) any later version. - * - * Calls is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Calls. If not, see . - * - * Author: Adrien Plazas - * - * SPDX-License-Identifier: GPL-3.0-or-later - * - */ - -#ifndef CALLS_ENCRYPTION_INDICATOR_H__ -#define CALLS_ENCRYPTION_INDICATOR_H__ - -#include - -G_BEGIN_DECLS - -#define CALLS_TYPE_ENCRYPTION_INDICATOR (calls_encryption_indicator_get_type ()) - -G_DECLARE_FINAL_TYPE (CallsEncryptionIndicator, calls_encryption_indicator, CALLS, ENCRYPTION_INDICATOR, GtkStack); - - -void calls_encryption_indicator_set_encrypted (CallsEncryptionIndicator *self, - gboolean encrypted); -gboolean calls_encryption_indicator_get_encrypted (CallsEncryptionIndicator *self); - - -G_END_DECLS - -#endif /* CALLS_ENCRYPTION_INDICATOR_H__ */ - diff --git a/src/calls.gresources.xml b/src/calls.gresources.xml index 28158a0..6eaca66 100644 --- a/src/calls.gresources.xml +++ b/src/calls.gresources.xml @@ -4,7 +4,6 @@ main-window.ui call-selector-item.ui call-window.ui - encryption-indicator.ui history-box.ui history-header-bar.ui new-call-box.ui diff --git a/src/meson.build b/src/meson.build index 5a10cfe..75ad9ba 100644 --- a/src/meson.build +++ b/src/meson.build @@ -90,7 +90,6 @@ calls_sources = files(['calls-message-source.c', 'calls-message-source.h', 'calls-provider.c', 'calls-provider.h', 'calls-call-selector-item.c', 'calls-call-selector-item.h', 'calls-call-window.c', 'calls-call-window.h', - 'calls-encryption-indicator.c', 'calls-encryption-indicator.h', 'calls-history-box.c', 'calls-history-box.h', 'calls-new-call-box.c', 'calls-new-call-box.h', 'calls-main-window.c', 'calls-main-window.h', diff --git a/src/ui/encryption-indicator.ui b/src/ui/encryption-indicator.ui deleted file mode 100644 index 32adc20..0000000 --- a/src/ui/encryption-indicator.ui +++ /dev/null @@ -1,52 +0,0 @@ - - - - - -