Skip to content

J
jami-client-gnome
Commit f680d74c authored by Sébastien Blin's avatar Sébastien Blin
Browse files
Options

misc: remove ring references 

Change-Id: Icc9702adc6175eab4b4b3b0aceefa1004fedf11c
parent 03672b33
Expand all Show whitespace changes
Inline Side-by-side
Showing with 659 additions and 602 deletions
CMakeLists.txt
View file @ f680d74c
......@@ -26,13 +26,13 @@ ENDIF()
IF( NOT ("$ENV{SOURCE_DATE_EPOCH}" STREQUAL ""))
EXECUTE_PROCESS(
COMMAND date -u -d "1970-01-01 UTC $ENV{SOURCE_DATE_EPOCH} seconds" "+%Y-%m-%d %H:%M:%S UTC"
OUTPUT_VARIABLE RING_CLIENT_BUILD_DATE
OUTPUT_VARIABLE CLIENT_BUILD_DATE
OUTPUT_STRIP_TRAILING_WHITESPACE
)
ELSEIF( "${RING_CLIENT_BUILD_DATE}" STREQUAL "")
ELSEIF( "${CLIENT_BUILD_DATE}" STREQUAL "")
EXECUTE_PROCESS(
COMMAND date -u "+%Y-%m-%d %H:%M:%S UTC"
OUTPUT_VARIABLE RING_CLIENT_BUILD_DATE
OUTPUT_VARIABLE CLIENT_BUILD_DATE
OUTPUT_STRIP_TRAILING_WHITESPACE
)
ENDIF()
......@@ -54,9 +54,9 @@ SET(ENABLE_QT5 true)
SET(CMAKE_BUILD_TYPE Debug)
# during packaging the CMAKE_INSTALL_PREFIX is used to specify where to install the files, but it
# may not be the same as where the package will put them, use RING_INSTALL_PREFIX to let the client
# may not be the same as where the package will put them, use JAMI_INSTALL_PREFIX to let the client
# know at runtime where to expect installed files to be located
SET(RING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}
SET(JAMI_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}
CACHE PATH "prefix where the package will be installed on the user's system (eg: /usr/local); defaults to the CMAKE_INSTALL_PREFIX"
)
......@@ -235,7 +235,7 @@ ADD_CUSTOM_TARGET(
COMMAND ${CMAKE_COMMAND}
-DGIT_REVISION_INPUT_FILE=${GIT_REVISION_INPUT_FILE}
-DGIT_REVISION_OUTPUT_FILE=${GIT_REVISION_OUTPUT_FILE}
-DRING_CLIENT_BUILD_DATE=${RING_CLIENT_BUILD_DATE}
-DCLIENT_BUILD_DATE=${CLIENT_BUILD_DATE}
-P ${CMAKE_SOURCE_DIR}/cmake/GitRevision.cmake
COMMENT "generating ${GIT_REVISION_OUTPUT_FILE}"
)
......@@ -248,12 +248,12 @@ ADD_CUSTOM_COMMAND(
# source files to compile
SET( SRC_FILES
src/main.cpp
src/ring_client.h
src/ring_client.cpp
src/ring_client_options.h
src/ring_client_options.c
src/ringmainwindow.h
src/ringmainwindow.cpp
src/client.h
src/client.cpp
src/client_options.h
src/client_options.c
src/mainwindow.h
src/mainwindow.cpp
src/incomingcallview.h
src/incomingcallview.cpp
src/currentcallview.h
......@@ -289,15 +289,15 @@ SET( SRC_FILES
src/native/pixbufmanipulator.cpp
src/utils/models.h
src/utils/models.cpp
src/ringnotify.h
src/ringnotify.cpp
src/notifier.h
src/notifier.cpp
src/utils/files.h
src/utils/files.cpp
${GIT_REVISION_OUTPUT_FILE}
src/native/dbuserrorhandler.h
src/native/dbuserrorhandler.cpp
src/ringwelcomeview.h
src/ringwelcomeview.cpp
src/welcomeview.h
src/welcomeview.cpp
src/webkitchatcontainer.h
src/webkitchatcontainer.cpp
src/chatview.h
......
cmake/GitRevision.cmake
View file @ f680d74c
......@@ -21,13 +21,13 @@ FIND_PACKAGE(Git)
IF(GIT_FOUND)
EXECUTE_PROCESS(
COMMAND ${GIT_EXECUTABLE} rev-parse --verify HEAD
OUTPUT_VARIABLE RING_CLIENT_REVISION
OUTPUT_VARIABLE CLIENT_REVISION
OUTPUT_STRIP_TRAILING_WHITESPACE
)
ENDIF()
IF( "${RING_CLIENT_REVISION}" STREQUAL "")
SET(RING_CLIENT_REVISION "unknown")
IF( "${CLIENT_REVISION}" STREQUAL "")
SET(CLIENT_REVISION "unknown")
ENDIF()
MESSAGE( STATUS "GIT_REVISION_INPUT_FILE: " ${GIT_REVISION_INPUT_FILE} )
......
po/POTFILES.in
View file @ f680d74c
......@@ -17,7 +17,7 @@ ui/avatarmanipulation.ui
src/conversationsview.cpp
src/mediasettingsview.cpp
src/ring_client.cpp
src/ringnotify.cpp
src/notifier.cpp
src/marshals.cpp
src/usernameregistrationbox.cpp
src/generalsettingsview.cpp
......
po/ring-client-gnome.pot
View file @ f680d74c
......@@ -378,7 +378,7 @@ msgstr ""
#: ui/accountcreationwizard.ui:561
msgid ""
"By checking this, you will register a unique username on the Jami network. "
"People can use it to contact you instead of using your RingID, which is 40 "
"People can use it to contact you instead of using your ID, which is 40 "
"characters long."
msgstr ""
......@@ -946,22 +946,22 @@ msgstr ""
msgid "Quit"
msgstr ""
#: src/ringnotify.cpp:336
#: src/notifier.cpp:336
msgctxt ""
msgid "Open conversation"
msgstr ""
#: src/ringnotify.cpp:344 src/ringnotify.cpp:360
#: src/notifier.cpp:344 src/notifier.cpp:360
msgctxt ""
msgid "Accept"
msgstr ""
#: src/ringnotify.cpp:351
#: src/notifier.cpp:351
msgctxt ""
msgid "Refuse"
msgstr ""
#: src/ringnotify.cpp:367
#: src/notifier.cpp:367
msgctxt ""
msgid "Decline"
msgstr ""
......
src/accountcreationwizard.cpp
View file @ f680d74c
......@@ -25,7 +25,7 @@
// LRC
#include "api/newaccountmodel.h"
// Ring Client
// Jami Client
#include "utils/models.h"
#include "avatarmanipulation.h"
#include "accountcreationwizard.h"
......
src/accountmigrationview.cpp
View file @ f680d74c
......@@ -32,7 +32,7 @@
// LRC
#include <api/newaccountmodel.h>
// Ring Client
// Jami Client
#include "accountmigrationview.h"
#include "native/pixbufmanipulator.h"
......
src/avatarmanipulation.cpp
View file @ f680d74c
......@@ -406,10 +406,10 @@ choose_picture(AvatarManipulation *self)
auto preview = gtk_image_new();
GtkWidget *ring_main_window = gtk_widget_get_toplevel(GTK_WIDGET(self));
GtkWidget *main_window = gtk_widget_get_toplevel(GTK_WIDGET(self));
auto dialog = gtk_file_chooser_dialog_new (_("Open Avatar Image"),
GTK_WINDOW(ring_main_window),
GTK_WINDOW(main_window),
action,
_("_Cancel"),
GTK_RESPONSE_CANCEL,
......
src/ring_client.cpp → src/client.cpp
View file @ f680d74c
This diff is collapsed.
src/ring_client.h → src/client.h
View file @ f680d74c
......@@ -17,37 +17,37 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef RING_CLIENT_H_
#define RING_CLIENT_H_
#ifndef CLIENT_H_
#define CLIENT_H_
#include <gtk/gtk.h>
#include "config.h"
G_BEGIN_DECLS
#define RING_GSETTINGS_SCHEMA JAMI_CLIENT_APP_ID
#define GSETTINGS_SCHEMA JAMI_CLIENT_APP_ID
#define RING_CLIENT_TYPE (ring_client_get_type())
#define RING_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), RING_CLIENT_TYPE, RingClient))
#define RING_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), RING_CLIENT_TYPE, RingClientClass))
#define IS_RING_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), RING_CLIENT_TYPE))
#define IS_RING_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), RING_CLIENT_TYPE))
#define CLIENT_TYPE (client_get_type())
#define CLIENT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), CLIENT_TYPE, Client))
#define CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), CLIENT_TYPE, ClientClass))
#define IS_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), CLIENT_TYPE))
#define IS_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), CLIENT_TYPE))
typedef struct _RingClientClass RingClientClass;
typedef struct _RingClient RingClient;
typedef struct _ClientClass ClientClass;
typedef struct _Client Client;
/* Public interface */
GType ring_client_get_type (void) G_GNUC_CONST;
RingClient *ring_client_new (int argc, char *argv[]);
GtkWindow *ring_client_get_main_window(RingClient *client);
GType client_get_type (void) G_GNUC_CONST;
Client *client_new (int argc, char *argv[]);
GtkWindow *client_get_main_window(Client *client);
/**
* Sets if the client should attempt to restore the main window state (hidden or not) to what it was
* when it was last quit (stored by the "show-main-window" gsetting). This function must be
* called before the main window is created for the first time for it to have an effect.
*/
void ring_client_set_restore_main_window_state(RingClient *client, gboolean restore);
void client_set_restore_main_window_state(Client *client, gboolean restore);
G_END_DECLS
#endif /* RING_CLIENT_H_ */
#endif /* CLIENT_H_ */
src/ring_client_options.c → src/client_options.c
View file @ f680d74c
......@@ -18,11 +18,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "ring_client_options.h"
#include "client_options.h"
#include "config.h"
#include "revision.h"
#include "ring_client.h"
#include "client.h"
#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include <stdlib.h>
......@@ -33,7 +33,7 @@ option_version_cb(G_GNUC_UNUSED const gchar *option_name,
G_GNUC_UNUSED gpointer data,
G_GNUC_UNUSED GError **error)
{
g_print("%s - %s\n", RING_VERSION, RING_CLIENT_REVISION);
g_print("%s - %s\n", VERSION, CLIENT_REVISION);
exit(EXIT_SUCCESS);
}
......@@ -44,7 +44,7 @@ option_debug_cb(G_GNUC_UNUSED const gchar *option_name,
G_GNUC_UNUSED GError **error)
{
g_setenv("G_MESSAGES_DEBUG", "all", TRUE);
g_setenv("RING_CHATVIEW_DEBUG", "true", TRUE);
g_setenv("CHATVIEW_DEBUG", "true", TRUE);
g_debug("debug enabled");
return TRUE;
}
......@@ -56,8 +56,8 @@ option_restore_cb(G_GNUC_UNUSED const gchar *option_name,
G_GNUC_UNUSED GError **error)
{
GApplication *client = g_application_get_default();
if (IS_RING_CLIENT(client))
ring_client_set_restore_main_window_state(RING_CLIENT(client), TRUE);
if (IS_CLIENT(client))
client_set_restore_main_window_state(CLIENT(client), TRUE);
return TRUE;
}
......@@ -71,7 +71,7 @@ static const GOptionEntry all_options[] = {
#if GLIB_CHECK_VERSION(2,40,0)
void
ring_client_add_options(GApplication *app) {
client_add_options(GApplication *app) {
/* NOTE: using this function, the options do not get translated in glib versions <2.45 due to
* bug 750322: https://bugzilla.gnome.org/show_bug.cgi?id=750322
*/
......@@ -80,7 +80,7 @@ ring_client_add_options(GApplication *app) {
#else
GOptionContext *
ring_client_options_get_context()
client_options_get_context()
{
GOptionContext *context = g_option_context_new(_("- GNOME client for Jami"));
g_option_context_set_ignore_unknown_options(context, TRUE);
......
src/ring_client_options.h → src/client_options.h
View file @ f680d74c
......@@ -17,19 +17,19 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef RING_CLIENT_OPTIONS_H_
#define RING_CLIENT_OPTIONS_H_
#ifndef CLIENT_OPTIONS_H_
#define CLIENT_OPTIONS_H_
#include <gio/gio.h>
G_BEGIN_DECLS
#if GLIB_CHECK_VERSION(2,40,0)
void ring_client_add_options(GApplication *app);
void client_add_options(GApplication *app);
#else
GOptionContext *ring_client_options_get_context(void);
GOptionContext *client_options_get_context(void);
#endif
G_END_DECLS
#endif /* RING_CLIENT_OPTIONS_H_ */
#endif /* CLIENT_OPTIONS_H_ */
src/config.h.in
View file @ f680d74c
/* cmake will generate config.h with defines containing the values defined in cmake */
#define RING_VERSION "@PROJECT_VERSION@"
#define VERSION "@PROJECT_VERSION@"
#define USE_LIBNOTIFY @USE_LIBNOTIFY@
#define HAVE_APPINDICATOR @HAVE_APPINDICATOR@
......@@ -11,9 +11,9 @@
#define JAMI_CLIENT_NAME "Jami"
#define JAMI_CLIENT_APP_ID "net.jami.Jami"
#define JAMI_CLIENT_INSTALL "@RING_INSTALL_PREFIX@"
#define JAMI_CLIENT_INSTALL "@JAMI_INSTALL_PREFIX@"
#define JAMI_DATA_DIR "/share/jami-gnome"
#define PACKAGE_NAME "@PROJECT_NAME@"
#define LOCALEDIR "@RING_INSTALL_PREFIX@/share/locale"
#define SOUNDSDIR "@RING_INSTALL_PREFIX@/share/sounds/jami-gnome"
#define LOCALEDIR "@JAMI_INSTALL_PREFIX@/share/locale"
#define SOUNDSDIR "@JAMI_INSTALL_PREFIX@/share/sounds/jami-gnome"
src/currentcallview.cpp
View file @ f680d74c
......@@ -22,7 +22,7 @@
// Client
#include "chatview.h"
#include "native/pixbufmanipulator.h"
#include "ringnotify.h"
#include "notifier.h"
#include "utils/drawing.h"
#include "utils/files.h"
#include "video/video_widget.h"
......
src/dialogs.c
View file @ f680d74c
......@@ -26,7 +26,7 @@
#include "revision.h"
GtkWidget *
ring_dialog_working(GtkWidget *parent, const gchar *msg)
dialog_working(GtkWidget *parent, const gchar *msg)
{
GtkWidget *dialog = gtk_dialog_new();
gtk_window_set_destroy_with_parent(GTK_WINDOW(dialog), TRUE);
......@@ -66,7 +66,7 @@ ring_dialog_working(GtkWidget *parent, const gchar *msg)
}
void
ring_about_dialog(GtkWidget *parent)
about_dialog(GtkWidget *parent)
{
/* get parent window */
if (parent && GTK_IS_WIDGET(parent))
......@@ -82,7 +82,7 @@ ring_about_dialog(GtkWidget *parent)
gchar *version = g_strdup_printf(C_("Do not translate the release name nor the status (beta, final, ...)",
"\"Free as in Freedom\"\nbuilt on %.25s"),
RING_CLIENT_BUILD_DATE);
CLIENT_BUILD_DATE);
const gchar *authors[] = {
"Adrien Béraud",
......
src/dialogs.h
View file @ f680d74c
......@@ -24,8 +24,8 @@
G_BEGIN_DECLS
GtkWidget *ring_dialog_working(GtkWidget *parent, const gchar *msg);
void ring_about_dialog(GtkWidget *parent);
GtkWidget *dialog_working(GtkWidget *parent, const gchar *msg);
void about_dialog(GtkWidget *parent);
G_END_DECLS
......
src/generalsettingsview.cpp
View file @ f680d74c
......@@ -27,7 +27,7 @@
// LRC
#include <api/avmodel.h>
// Ring client
// Jami Client
#include "utils/files.h"
#include "avatarmanipulation.h"
......@@ -37,7 +37,7 @@ class CppImpl;
enum
{
PROP_RING_MAIN_WIN_PNT = 1,
PROP_MAIN_WIN_PNT = 1,
};
struct _GeneralSettingsView
......@@ -78,7 +78,7 @@ struct _GeneralSettingsViewPrivate
GtkWidget *filechooserbutton_record_path;
/* ring main window pointer */
GtkWidget* ring_main_window_pnt;
GtkWidget* main_window_pnt;
details::CppImpl* cpp; ///< Non-UI and C++ only code
};
......@@ -213,13 +213,13 @@ choose_downloads_directory(GeneralSettingsView *self)
gint res;
gchar* filename = nullptr;
if (!priv->ring_main_window_pnt) {
if (!priv->main_window_pnt) {
g_debug("Internal error: NULL main window pointer in GeneralSettingsView.");
return;
}
GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Choose download folder"),
GTK_WINDOW(priv->ring_main_window_pnt),
GTK_WINDOW(priv->main_window_pnt),
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
_("_Cancel"),
GTK_RESPONSE_CANCEL,
......@@ -363,15 +363,15 @@ general_settings_view_set_property (GObject *object,
GeneralSettingsView *self = GENERAL_SETTINGS_VIEW (object);
GeneralSettingsViewPrivate *priv = GENERAL_SETTINGS_VIEW_GET_PRIVATE(self);
if (property_id == PROP_RING_MAIN_WIN_PNT) {
GtkWidget *ring_main_window_pnt = (GtkWidget*) g_value_get_pointer(value);
if (property_id == PROP_MAIN_WIN_PNT) {
GtkWidget *main_window_pnt = (GtkWidget*) g_value_get_pointer(value);
if (!ring_main_window_pnt) {
if (!main_window_pnt) {
g_debug("Internal error: NULL main window pointer passed to set_property");
return;
}
priv->ring_main_window_pnt = ring_main_window_pnt;
priv->main_window_pnt = main_window_pnt;
}
else {
// Invalid property id passed
......@@ -388,8 +388,8 @@ general_settings_view_get_property (GObject *object,
GeneralSettingsView *self = GENERAL_SETTINGS_VIEW (object);
GeneralSettingsViewPrivate *priv = GENERAL_SETTINGS_VIEW_GET_PRIVATE(self);
if (property_id == PROP_RING_MAIN_WIN_PNT) {
g_value_set_pointer(value, priv->ring_main_window_pnt);
if (property_id == PROP_MAIN_WIN_PNT) {
g_value_set_pointer(value, priv->main_window_pnt);
}
else {
// Invalid property id passed
......@@ -447,15 +447,15 @@ general_settings_view_class_init(GeneralSettingsViewClass *klass)
object_class->get_property = general_settings_view_get_property;
GParamFlags flags = (GParamFlags) (G_PARAM_READWRITE);
g_object_class_install_property (object_class, PROP_RING_MAIN_WIN_PNT,
g_param_spec_pointer ("ring_main_window_pnt",
"RingMainWindow pointer",
"Pointer to the Ring Main Window. This property is used by modal dialogs.",
g_object_class_install_property (object_class, PROP_MAIN_WIN_PNT,
g_param_spec_pointer ("main_window_pnt",
"MainWindow pointer",
"Pointer to the Main Window. This property is used by modal dialogs.",
flags));
}
GtkWidget *
general_settings_view_new(GtkWidget* ring_main_window_pointer, lrc::api::AVModel& avModel)
general_settings_view_new(GtkWidget* main_window_pointer, lrc::api::AVModel& avModel)
{
auto self = g_object_new(GENERAL_SETTINGS_VIEW_TYPE, NULL);
auto* priv = GENERAL_SETTINGS_VIEW_GET_PRIVATE(GENERAL_SETTINGS_VIEW (self));
......@@ -466,8 +466,8 @@ general_settings_view_new(GtkWidget* ring_main_window_pointer, lrc::api::AVModel
// set_up ring main window pointer (needed by modal dialogs)
GValue val = G_VALUE_INIT;
g_value_init (&val, G_TYPE_POINTER);
g_value_set_pointer (&val, ring_main_window_pointer);
g_object_set_property (G_OBJECT (self), "ring_main_window_pnt", &val);
g_value_set_pointer (&val, main_window_pointer);
g_object_set_property (G_OBJECT (self), "main_window_pnt", &val);
g_value_unset (&val);
g_signal_connect_swapped(priv->button_choose_downloads_directory, "clicked", G_CALLBACK(choose_downloads_directory), self);
......
src/generalsettingsview.h
View file @ f680d74c
......@@ -38,7 +38,7 @@ typedef struct _GeneralSettingsView GeneralSettingsView;
typedef struct _GeneralSettingsViewClass GeneralSettingsViewClass;
GType general_settings_view_get_type (void) G_GNUC_CONST;
GtkWidget *general_settings_view_new (GtkWidget* ring_main_window_pnt, lrc::api::AVModel& avModel);
GtkWidget *general_settings_view_new (GtkWidget* main_window_pnt, lrc::api::AVModel& avModel);
G_END_DECLS
......
src/main.cpp
View file @ f680d74c
......@@ -21,7 +21,7 @@
#include <glib/gi18n.h>
#include <cstdlib>
#include "config.h"
#include "ring_client.h"
#include "client.h"
int
main(int argc, char *argv[])
......@@ -33,7 +33,7 @@ main(int argc, char *argv[])
bind_textdomain_codeset(PACKAGE_NAME, "UTF-8");
textdomain(PACKAGE_NAME);
RingClient *client = ring_client_new(argc, argv);
Client *client = client_new(argc, argv);
g_set_application_name(JAMI_CLIENT_NAME);
return g_application_run(G_APPLICATION(client), argc, argv);
}
src/ringmainwindow.h → src/mainwindow.h
View file @ f680d74c
......@@ -17,44 +17,41 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef _RINGMAINWINDOW_H
#define _RINGMAINWINDOW_H
#pragma once
#include <gtk/gtk.h>
G_BEGIN_DECLS
#define RING_MAIN_WINDOW_TYPE (ring_main_window_get_type ())
#define RING_MAIN_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RING_MAIN_WINDOW_TYPE, RingMainWindow))
#define RING_MAIN_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), RING_MAIN_WINDOW_TYPE, RingMainWindowClass))
#define IS_RING_MAIN_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), RING_MAIN_WINDOW_TYPE))
#define IS_RING_MAIN_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), RING_MAIN_WINDOW_TYPE))
typedef struct _RingMainWindow RingMainWindow;
typedef struct _RingMainWindowClass RingMainWindowClass;
GType ring_main_window_get_type (void) G_GNUC_CONST;
GtkWidget *ring_main_window_new (GtkApplication *app);
void ring_main_window_reset (RingMainWindow *win);
bool ring_main_window_can_close(RingMainWindow *win);
void ring_main_window_display_account_list(RingMainWindow *win);
void ring_main_window_search(RingMainWindow *win);
void ring_main_window_conversations_list(RingMainWindow *win);
void ring_main_window_requests_list(RingMainWindow *win);
void ring_main_window_audio_call(RingMainWindow *win);
void ring_main_window_clear_history(RingMainWindow *win);
void ring_main_window_remove_conversation(RingMainWindow *win);
void ring_main_window_block_contact(RingMainWindow *win);
void ring_main_window_unblock_contact(RingMainWindow *win);
void ring_main_window_copy_contact(RingMainWindow *win);
void ring_main_window_add_contact(RingMainWindow *win);
void ring_main_window_accept_call(RingMainWindow *win);
void ring_main_window_decline_call(RingMainWindow *win);
void ring_main_window_toggle_fullscreen(RingMainWindow *win);
#define MAIN_WINDOW_TYPE (main_window_get_type ())
#define MAIN_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MAIN_WINDOW_TYPE, MainWindow))
#define MAIN_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), MAIN_WINDOW_TYPE, MainWindowClass))
#define IS_MAIN_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), MAIN_WINDOW_TYPE))
#define IS_MAIN_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), MAIN_WINDOW_TYPE))
typedef struct _MainWindow MainWindow;
typedef struct _MainWindowClass MainWindowClass;
GType main_window_get_type (void) G_GNUC_CONST;
GtkWidget *main_window_new (GtkApplication *app);
void main_window_reset (MainWindow *win);
bool main_window_can_close(MainWindow *win);
void main_window_display_account_list(MainWindow *win);
void main_window_search(MainWindow *win);
void main_window_conversations_list(MainWindow *win);
void main_window_requests_list(MainWindow *win);
void main_window_audio_call(MainWindow *win);
void main_window_clear_history(MainWindow *win);
void main_window_remove_conversation(MainWindow *win);
void main_window_block_contact(MainWindow *win);
void main_window_unblock_contact(MainWindow *win);
void main_window_copy_contact(MainWindow *win);
void main_window_add_contact(MainWindow *win);
void main_window_accept_call(MainWindow *win);
void main_window_decline_call(MainWindow *win);
void main_window_toggle_fullscreen(MainWindow *win);
G_END_DECLS
#endif /* _RINGMAINWINDOW_H */
src/native/dbuserrorhandler.cpp
View file @ f680d74c
......@@ -20,7 +20,7 @@
#include <glib/gi18n.h>
#include <globalinstances.h>
#include "../ring_client.h"
#include "../client.h"
#include <api/lrc.h>
namespace Interfaces {
......@@ -37,7 +37,7 @@ dring_crash_dialog()
/* get the main window */
if (auto app = g_application_get_default()) {
auto win = ring_client_get_main_window(RING_CLIENT(app));
auto win = client_get_main_window(CLIENT(app));
if (win) {
gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(win));
gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER_ON_PARENT);
......@@ -70,12 +70,12 @@ dring_crash_dialog()
}
static GtkWidget*
ring_quitting_dialog()
quitting_dialog()
{
/* get the main window */
GtkWindow *win = NULL;
if (auto app = g_application_get_default()) {
win = ring_client_get_main_window(RING_CLIENT(app));
win = client_get_main_window(CLIENT(app));
} else {
g_warning("no default GApplication exists");
}
......@@ -108,7 +108,7 @@ check_connection_cb(GtkWidget *warning_dialog)
if ((!lrc::api::Lrc::isConnected()) || (!lrc::api::Lrc::dbusIsValid())) {
g_warning("could not reconnect to the daemon");
auto quit_dialog = ring_quitting_dialog();
auto quit_dialog = quitting_dialog();
/* wait for the user to exit the dialog */
gtk_dialog_run(GTK_DIALOG(quit_dialog));
......
src/native/pixbufmanipulator.cpp
View file @ f680d74c
......@@ -36,7 +36,7 @@
namespace Interfaces {
PixbufManipulator::PixbufManipulator()
: conferenceAvatar_{ring_draw_conference_avatar(FALLBACK_AVATAR_SIZE), g_object_unref}
: conferenceAvatar_{draw_conference_avatar(FALLBACK_AVATAR_SIZE), g_object_unref}
{
}
......@@ -72,7 +72,7 @@ PixbufManipulator::generateAvatar(const std::string& alias, const std::string& u
}
return std::shared_ptr<GdkPixbuf> {
ring_draw_fallback_avatar(
draw_fallback_avatar(
FALLBACK_AVATAR_SIZE,
letter,
color
......@@ -114,18 +114,18 @@ PixbufManipulator::scaleAndFrame(const GdkPixbuf *photo,
/* frame photo */
std::shared_ptr<GdkPixbuf> result {
ring_frame_avatar(scaled_photo.get()),
frame_avatar(scaled_photo.get()),
g_object_unref
};
/* draw information */
if (displayInformation) {
/* draw status */
result.reset(ring_draw_status(result.get(), status), g_object_unref);
result.reset(draw_status(result.get(), status), g_object_unref);
/* draw visual notification for unread messages */
if (unreadMessages)
result.reset(ring_draw_unread_messages(result.get(), unreadMessages), g_object_unref);
result.reset(draw_unread_messages(result.get(), unreadMessages), g_object_unref);
}
return result;
......
src/newaccountsettingsview.cpp
View file @ f680d74c
......@@ -34,7 +34,7 @@
#include <api/newaccountmodel.h>
#include <api/newcodecmodel.h>
// Ring client
// Jami Client
#include "avatarmanipulation.h"
#include "defines.h"
#include "utils/files.h"
......@@ -42,7 +42,7 @@
enum
{
PROP_RING_MAIN_WIN_PNT = 1,
PROP_MAIN_WIN_PNT = 1,
};
struct _NewAccountSettingsView
......
src/ringnotify.cpp → src/notifier.cpp
View file @ f680d74c
......@@ -18,9 +18,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "ringnotify.h"
#include "notifier.h"
#include "config.h"
#include "ring_client.h"
#include "client.h"
#if USE_CANBERRA
#include <canberra-gtk.h>
......@@ -45,26 +45,26 @@ namespace details
class CppImpl;
}
struct _RingNotifier
struct _Notifier
{
GtkBox parent;
};
struct _RingNotifierClass
struct _NotifierClass
{
GtkBoxClass parent_class;
};
typedef struct _RingNotifierPrivate RingNotifierPrivate;
typedef struct _NotifierPrivate NotifierPrivate;
struct _RingNotifierPrivate
struct _NotifierPrivate
{
details::CppImpl* cpp; ///< Non-UI and C++ only code0
};
G_DEFINE_TYPE_WITH_PRIVATE(RingNotifier, ring_notifier, GTK_TYPE_BOX);
G_DEFINE_TYPE_WITH_PRIVATE(Notifier, notifier, GTK_TYPE_BOX);
#define RING_NOTIFIER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), RING_NOTIFIER_TYPE, RingNotifierPrivate))
#define NOTIFIER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), NOTIFIER_TYPE, NotifierPrivate))
/* signals */
enum {
......@@ -76,7 +76,7 @@ enum {
LAST_SIGNAL
};
static guint ring_notifier_signals[LAST_SIGNAL] = { 0 };
static guint notifier_signals[LAST_SIGNAL] = { 0 };
namespace details
{
......@@ -84,11 +84,11 @@ namespace details
class CppImpl
{
public:
explicit CppImpl(RingNotifier& widget);
<