diff options
author | Antenore Gatta <antenore@simbiosi.org> | 2020-05-20 13:32:44 +0300 |
---|---|---|
committer | Antenore Gatta <antenore@simbiosi.org> | 2020-05-20 13:32:44 +0300 |
commit | cc52d09668b01c99229d8869e9694a8be363a2f9 (patch) | |
tree | 55c23370183d09f67aceaddffc91a5d05da16a2a | |
parent | 4d75647cad0c5b48ca8c2153fbb2060e8bcfa210 (diff) | |
parent | 2f0cfca89f94d99c52489ff65fb7df0c67efe610 (diff) |
Merge branch 'v1.4.4' into 'master'v1.4.4
Preparing for release v1.4.4
Closes #2198, #810, #2181, and #2153
See merge request Remmina/Remmina!2057
-rw-r--r-- | .gitlab-ci.yml | 14 | ||||
-rw-r--r-- | CHANGELOG.md | 4 | ||||
-rw-r--r-- | flatpak/org.remmina.Remmina.json | 6 | ||||
-rw-r--r-- | src/rcw.c | 18 | ||||
-rw-r--r-- | src/rmnews.c | 15 |
5 files changed, 30 insertions, 27 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0f171d70e..3838e919e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -105,20 +105,20 @@ flatpak:test: script: - /bin/sh -xe ./flatpak/flatpak-build.sh artifacts: - name: "$CI_MERGE_REQUEST_ID-flatpak" + expose_as: 'Testing flatpak package' paths: - flatpak/${BUNDLE} expire_in: 10 days - expose_as: 'Testing flatpak download' cache: paths: - flatpak/.flatpak-builder/cache + - flatpak/.flatpak-builder/downloads + - flatpak/.flatpak-builder/git only: - refs: - - tags - - merge_requests - - web - - schedules + - merge_requests + - tags + - web + - schedules snap:build: image: ubuntudesktop/gnome-3-28-1804 diff --git a/CHANGELOG.md b/CHANGELOG.md index fa6a90283..c1bc7a992 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,9 +17,11 @@ * Extract subtitle for translation [!2051](https://gitlab.com/Remmina/Remmina/merge_requests/2051) *@yurchor* * [SSH] Connection pre/post command not replacing SSH tunnel parameters [!2053](https://gitlab.com/Remmina/Remmina/merge_requests/2053) *@antenore* * SNAP: Remove libssh, available in distro [!2052](https://gitlab.com/Remmina/Remmina/merge_requests/2052) *@ed10vi* -* remmina shortcuts not working if fullscreen toolbar is set to off [!2054](https://gitlab.com/Remmina/Remmina/merge_requests/2054) *@giox069* +* 2189 [!2054](https://gitlab.com/Remmina/Remmina/merge_requests/2054) *@giox069* * Adding remmina_debug function to simplify log reporting [!2055](https://gitlab.com/Remmina/Remmina/merge_requests/2055) *@antenore* * Removing OnlyShowIn as deprecated in the latest freedesktop spec. Closes #2198 [!2056](https://gitlab.com/Remmina/Remmina/merge_requests/2056) *@antenore* +* Cleaning up glib deprecations [!2058](https://gitlab.com/Remmina/Remmina/merge_requests/2058) *@antenore* + ## 1.4.3 [full changelog](https://gitlab.com/Remmina/Remmina/compare/v1.4.2...1.4.3) diff --git a/flatpak/org.remmina.Remmina.json b/flatpak/org.remmina.Remmina.json index fbb6759ee..2ae66d033 100644 --- a/flatpak/org.remmina.Remmina.json +++ b/flatpak/org.remmina.Remmina.json @@ -164,7 +164,7 @@ "type": "git", "url": "https://github.com/FreeRDP/FreeRDP.git", "tag": "2.1.0", - "commit": "2d5ce618bf1db4bae83fd17fbb7e4eccbd715d9c" + "commit": "11b9b1ca6be433f1da5bbf5e152d554d3eb67ac6" } ], "modules": [ @@ -311,8 +311,8 @@ "sources": [ { "type": "archive", - "url": "https://www.libssh.org/files/0.9/libssh-0.9.3.tar.xz", - "sha256": "2c8b5f894dced58b3d629f16f3afa6562c20b4bdc894639163cf657833688f0c" + "url": "https://www.libssh.org/files/0.9/libssh-0.9.4.tar.xz", + "sha256": "150897a569852ac05aac831dc417a7ba8e610c86ca2e0154a99c6ade2486226b" } ], "modules": [ @@ -1954,7 +1954,7 @@ static void rcw_toolbar_screenshot(GtkWidget *widget, RemminaConnectionWindow *c gp = REMMINA_PROTOCOL_WIDGET(cnnobj->proto); gchar *denyclip = remmina_pref_get_value("deny_screenshot_clipboard"); - g_debug ("deny_screenshot_clipboard is set to %s", denyclip); + remmina_debug ("deny_screenshot_clipboard is set to %s", denyclip); GtkClipboard *c = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD); // Ask the plugin if it can give us a screenshot @@ -3724,7 +3724,7 @@ void rco_on_connect(RemminaProtocolWidget *gp, RemminaConnectionObject *cnnobj) gchar *last_success; - g_debug("Connect signal emitted"); + remmina_debug("Connect signal emitted"); GDateTime *date = g_date_time_new_now_utc(); /* This signal handler is called by a plugin when it’s correctly connected @@ -3746,12 +3746,12 @@ void rco_on_connect(RemminaProtocolWidget *gp, RemminaConnectionObject *cnnobj) remmina_pref_add_recent(remmina_file_get_string(cnnobj->remmina_file, "protocol"), remmina_file_get_string(cnnobj->remmina_file, "server")); if (remmina_pref.periodic_usage_stats_permitted) { - g_debug("Stats are allowed, we save the last successful connection date"); + remmina_debug("Stats are allowed, we save the last successful connection date"); remmina_file_set_string(cnnobj->remmina_file, "last_success", last_success); - g_debug("Last connection was made on %s.", last_success); + remmina_debug("Last connection was made on %s.", last_success); } - g_debug("Saving credentials"); + remmina_debug("Saving credentials"); /* Save credentials */ remmina_file_save(cnnobj->remmina_file); @@ -3760,7 +3760,7 @@ void rco_on_connect(RemminaProtocolWidget *gp, RemminaConnectionObject *cnnobj) rco_update_toolbar(cnnobj); - g_debug("Trying to present the window"); + remmina_debug("Trying to present the window"); /* Try to present window */ cnnobj->cnnwin->priv->dwp_eventsourceid = g_timeout_add(200, rcw_delayed_window_present, (gpointer)cnnobj->cnnwin); } @@ -3778,7 +3778,7 @@ void rco_on_disconnect(RemminaProtocolWidget *gp, gpointer data) RemminaConnectionWindowPriv *priv = cnnobj->cnnwin->priv; GtkWidget *pparent; - g_debug("Disconnect signal received on RemminaProtocolWidget"); + remmina_debug("Disconnect signal received on RemminaProtocolWidget"); /* Detach the protocol widget from the notebook now, or we risk that a * window delete will destroy cnnobj->proto before we complete disconnection. */ @@ -3814,10 +3814,10 @@ void rco_on_disconnect(RemminaProtocolWidget *gp, gpointer data) mp = remmina_message_panel_new(); remmina_message_panel_setup_message(mp, remmina_protocol_widget_get_error_message(gp), cb_lasterror_confirmed, gp); rco_show_message_panel(gp->cnnobj, mp); - g_debug("Could not disconnect"); + remmina_debug("Could not disconnect"); } else { rco_closewin(gp); - g_debug("Disconnected"); + remmina_debug("Disconnected"); } } diff --git a/src/rmnews.c b/src/rmnews.c index 29b9b6288..117ed2679 100644 --- a/src/rmnews.c +++ b/src/rmnews.c @@ -50,6 +50,7 @@ #include "remmina.h" #include "remmina_main.h" +#include "remmina_log.h" #include "remmina_pref.h" #include "remmina_public.h" #include "remmina_utils.h" @@ -133,7 +134,7 @@ void rmnews_defaultcl_on_click() g_warning ("Failed to set '%s' as the default application for secondary content type '%s': %s", g_app_info_get_name (info), supported_mime_types[i], error->message); else - g_debug ("Set '%s' as the default application for '%s'", + remmina_debug ("Set '%s' as the default application for '%s'", g_app_info_get_name (info), supported_mime_types[i]); } @@ -397,7 +398,7 @@ void rmnews_get_url(const char *url) msg = soup_message_new("GET", url); soup_message_set_flags(msg, SOUP_MESSAGE_NO_REDIRECT); - g_debug("Fetching %s", url); + remmina_debug("Fetching %s", url); g_object_ref(msg); soup_session_queue_message(session, msg, rmnews_get_url_cb, NULL); @@ -431,10 +432,10 @@ void rmnews_get_news() } fd = g_open (output_file_path, O_RDWR|O_CREAT, S_IRUSR|S_IWUSR); - g_debug ("Returned %d while creating %s", fd, output_file_path); + remmina_debug ("Returned %d while creating %s", fd, output_file_path); /* If we cannot create the remmina_news file, we avoid connections */ if (fd < 0) { - g_debug ("Cannot store the remmina news file"); + remmina_debug ("Cannot store the remmina news file"); return; } g_close(fd, NULL); @@ -459,7 +460,7 @@ void rmnews_get_news() g_object_unref(logger); gchar *lang = remmina_utils_get_lang(); - g_debug("Language %s", lang); + remmina_debug("Language %s", lang); uid = rmnews_get_uid(); @@ -514,10 +515,10 @@ static gboolean rmnews_periodic_check(gpointer user_data) gint randidx = rand() % 7; /* We randmoly set periodic_rmnews_last_get to a a day between today * and 7 days ago */ - g_debug ("Setting a random periodic_rmnews_last_get"); + remmina_debug ("Setting a random periodic_rmnews_last_get"); remmina_pref.periodic_rmnews_last_get = unixts - eweekdays[randidx]; } - g_debug ("periodic_rmnews_last_get is %ld", remmina_pref.periodic_rmnews_last_get); + remmina_debug ("periodic_rmnews_last_get is %ld", remmina_pref.periodic_rmnews_last_get); next = remmina_pref.periodic_rmnews_last_get + RMNEWS_INTERVAL_SEC; if (unixts > next || (unixts < remmina_pref.periodic_rmnews_last_get && unixts > 1514764800)) |