Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package otpclient for openSUSE:Factory checked in at 2021-04-15 16:57:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/otpclient (Old) and /work/SRC/openSUSE:Factory/.otpclient.new.12324 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "otpclient" Thu Apr 15 16:57:19 2021 rev:8 rq:884641 version:2.4.4 Changes: -------- --- /work/SRC/openSUSE:Factory/otpclient/otpclient.changes 2021-03-28 11:57:35.292289082 +0200 +++ /work/SRC/openSUSE:Factory/.otpclient.new.12324/otpclient.changes 2021-04-15 16:57:53.838719869 +0200 @@ -1,0 +2,8 @@ +Tue Mar 30 13:24:42 UTC 2021 - Paolo Stivanin <i...@paolostivanin.com> + +- Update to 2.4.4 + * Remove sorting feature, as it's bugged due to an issue with + GtkTreeView. This feature will come back with v3.0, because + GtkColumnView will replace GtkTreeView + +------------------------------------------------------------------- Old: ---- v2.4.3.tar.gz v2.4.3.tar.gz.asc New: ---- v2.4.4.tar.gz v2.4.4.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ otpclient.spec ++++++ --- /var/tmp/diff_new_pack.52XAEn/_old 2021-04-15 16:57:54.362720698 +0200 +++ /var/tmp/diff_new_pack.52XAEn/_new 2021-04-15 16:57:54.366720705 +0200 @@ -18,7 +18,7 @@ %define uclname OTPClient Name: otpclient -Version: 2.4.3 +Version: 2.4.4 Release: 0 Summary: Simple GTK+ client for managing TOTP and HOTP License: GPL-3.0-or-later ++++++ v2.4.3.tar.gz -> v2.4.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OTPClient-2.4.3/.gitignore new/OTPClient-2.4.4/.gitignore --- old/OTPClient-2.4.3/.gitignore 2021-03-25 16:06:10.000000000 +0100 +++ new/OTPClient-2.4.4/.gitignore 2021-03-30 15:49:00.000000000 +0200 @@ -3,7 +3,7 @@ tests/ .flatpak-builder/ flatpak/repo/ -TODO +TODO* .idea/ # Object files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OTPClient-2.4.3/CMakeLists.txt new/OTPClient-2.4.4/CMakeLists.txt --- old/OTPClient-2.4.3/CMakeLists.txt 2021-03-25 16:06:10.000000000 +0100 +++ new/OTPClient-2.4.4/CMakeLists.txt 2021-03-30 15:49:00.000000000 +0200 @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.5) -project(OTPClient VERSION "2.4.3" LANGUAGES "C") +project(OTPClient VERSION "2.4.4" LANGUAGES "C") configure_file("src/common/version.h.in" "version.h") include_directories(${PROJECT_BINARY_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OTPClient-2.4.3/SECURITY.md new/OTPClient-2.4.4/SECURITY.md --- old/OTPClient-2.4.3/SECURITY.md 2021-03-25 16:06:10.000000000 +0100 +++ new/OTPClient-2.4.4/SECURITY.md 2021-03-30 15:49:00.000000000 +0200 @@ -6,8 +6,8 @@ | Version | Supported | EOL | | ------- | ------------------ |------| -| 2.4.x | :heavy_check_mark: | TBD | -| 2.3.x | :heavy_check_mark: | 28-Feb-2021 | +| 2.4.x | :heavy_check_mark: | 3.0.0 + 1 year | +| 2.3.x | :x: | 28-Feb-2021 | | 2.2.x | :x: | 27-May-2020 | | 2.1.x | :x: | 20-Apr-2020 | | 2.0.x | :x: | 08-Mar-2020 | diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OTPClient-2.4.3/TODO.txt new/OTPClient-2.4.4/TODO.txt --- old/OTPClient-2.4.3/TODO.txt 2021-03-25 16:06:10.000000000 +0100 +++ new/OTPClient-2.4.4/TODO.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -* add "border-width: 5" to: - newdb_pwd_diag_id - decpwd_diag_id - changepwd_diag_id - unlock_pwd_diag_id - diag_webcam_id - diag_qr_clipboard_id - diag_webcam_id - manual_add_diag_id - dialog_rcdb_id - edit_diag_id - warning_diag_id - settings_diag_id - -* change all paths to UI file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OTPClient-2.4.3/data/com.github.paolostivanin.OTPClient.appdata.xml new/OTPClient-2.4.4/data/com.github.paolostivanin.OTPClient.appdata.xml --- old/OTPClient-2.4.3/data/com.github.paolostivanin.OTPClient.appdata.xml 2021-03-25 16:06:10.000000000 +0100 +++ new/OTPClient-2.4.4/data/com.github.paolostivanin.OTPClient.appdata.xml 2021-03-30 15:49:00.000000000 +0200 @@ -83,6 +83,14 @@ </content_rating> <releases> + <release version="2.4.4" date="2021-03-30"> + <description> + <p>OTPClient 2.4.4 disabled a broken feature</p> + <ul> + <li>remove possibility to sort columns by either account or issuer due to GtkTreeView issues. This feature will come back with 3.0.0</li> + </ul> + </description> + </release> <release version="2.4.3" date="2021-03-25"> <description> <p>OTPClient 2.4.3 contains some small fixes</p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OTPClient-2.4.3/src/app.c new/OTPClient-2.4.4/src/app.c --- old/OTPClient-2.4.3/src/app.c 2021-03-25 16:06:10.000000000 +0100 +++ new/OTPClient-2.4.4/src/app.c 2021-03-30 15:49:00.000000000 +0200 @@ -405,8 +405,7 @@ { .name = "change_pwd", .activate = change_password_cb }, { .name = "edit_row", .activate = edit_selected_row_cb }, { .name = "settings", .activate = settings_dialog_cb }, - { .name = "shortcuts", .activate = shortcuts_window_cb }, - { .name = "reset_sort", .activate = reset_column_sorting_cb } + { .name = "shortcuts", .activate = shortcuts_window_cb } }; static GActionEntry add_menu_entries[] = { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OTPClient-2.4.3/src/treeview.c new/OTPClient-2.4.4/src/treeview.c --- old/OTPClient-2.4.3/src/treeview.c 2021-03-25 16:06:10.000000000 +0100 +++ new/OTPClient-2.4.4/src/treeview.c 2021-03-30 15:49:00.000000000 +0200 @@ -31,8 +31,6 @@ static void free_pjd (ParsedData *pjd); -static void get_sort_data (gint *column_id, GtkSortType *sort_order); - void create_treeview (AppData *app_data) @@ -53,13 +51,6 @@ gtk_tree_view_set_model (app_data->tree_view, GTK_TREE_MODEL(list_store)); - gint column_id = -1; - GtkSortType sort_order = -1; - get_sort_data (&column_id, &sort_order); - if (column_id >= 0 && sort_order >= 0) { - gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(list_store), column_id, sort_order); - } - // model has id 0 for type, 1 for label, 2 for issuer, etc while ui file has 0 label and 1 issuer. That's why the "+1" gtk_tree_view_set_search_column (GTK_TREE_VIEW(app_data->tree_view), app_data->search_column + 1); @@ -173,61 +164,6 @@ } -void -reset_column_sorting_cb (GSimpleAction *simple __attribute__((unused)), - GVariant *parameter __attribute__((unused)), - gpointer user_data) -{ - AppData *app_data = (AppData *)user_data; - GError *err = NULL; - gchar *err_msg; - GKeyFile *kf = g_key_file_new (); - gchar *cfg_file_path; -#ifndef USE_FLATPAK_APP_FOLDER - cfg_file_path = g_build_filename (g_get_user_config_dir (), "otpclient.cfg", NULL); -#else - cfg_file_path = g_build_filename (g_get_user_data_dir (), "otpclient.cfg", NULL); -#endif - if (g_file_test (cfg_file_path, G_FILE_TEST_EXISTS)) { - if (!g_key_file_load_from_file (kf, cfg_file_path, G_KEY_FILE_NONE, &err)) { - g_printerr ("%s\n", err->message); - } else { - if (g_key_file_has_key (kf, "config", "column_id", NULL)) { - if (!g_key_file_remove_key (kf, "config", "column_id", &err) && err != NULL) { - err_msg = g_strconcat ("Couldn't reset the column id: ", err->message, NULL); - show_message_dialog (app_data->main_window, err_msg, GTK_MESSAGE_ERROR); - g_free (err_msg); - g_clear_error (&err); - } - } - if (g_key_file_has_key (kf, "config", "sort_order", NULL)) { - if (!g_key_file_remove_key (kf, "config", "sort_order", &err) && err != NULL) { - err_msg = g_strconcat ("Couldn't reset the sorting order: ", err->message, NULL); - show_message_dialog (app_data->main_window, err_msg, GTK_MESSAGE_ERROR); - g_free (err_msg); - g_clear_error (&err); - } - } - if (!g_key_file_save_to_file (kf, cfg_file_path, &err) && err != NULL) { - err_msg = g_strconcat ("Couldn't save the configuration file: ", err->message, NULL); - show_message_dialog (app_data->main_window, err_msg, GTK_MESSAGE_ERROR); - g_free (err_msg); - g_clear_error (&err); - } - } - } - g_key_file_free (kf); - g_free (cfg_file_path); - - // set default sorting value - gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(GTK_LIST_STORE(gtk_tree_view_get_model (app_data->tree_view))), -2, 0); - - update_model (app_data); - - show_message_dialog (app_data->main_window, "Sorting order has been correctly reset.", GTK_MESSAGE_INFO); -} - - static void hide_all_otps_cb (GtkTreeView *tree_view, gpointer user_data) @@ -316,13 +252,11 @@ renderer = gtk_cell_renderer_text_new (); column = gtk_tree_view_column_new_with_attributes ("Account", renderer, "text", COLUMN_ACC_LABEL, NULL); gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN(column), GTK_TREE_VIEW_COLUMN_AUTOSIZE); - gtk_tree_view_column_set_sort_column_id (GTK_TREE_VIEW_COLUMN(column), 1); // 1 is the account column gtk_tree_view_append_column (tree_view, column); renderer = gtk_cell_renderer_text_new (); column = gtk_tree_view_column_new_with_attributes ("Issuer", renderer, "text", COLUMN_ACC_ISSUER, NULL); gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN(column), GTK_TREE_VIEW_COLUMN_AUTOSIZE); - gtk_tree_view_column_set_sort_column_id (GTK_TREE_VIEW_COLUMN(column), 2); // 2 is the issuer column gtk_tree_view_append_column (tree_view, column); renderer = gtk_cell_renderer_text_new (); @@ -366,37 +300,3 @@ g_array_free (pjd->periods, TRUE); g_free (pjd); } - - -static void -get_sort_data (gint *column_id, - GtkSortType *sort_order) -{ - GError *err = NULL; - GKeyFile *kf = g_key_file_new (); - gchar *cfg_file_path; -#ifndef USE_FLATPAK_APP_FOLDER - cfg_file_path = g_build_filename (g_get_user_config_dir (), "otpclient.cfg", NULL); -#else - cfg_file_path = g_build_filename (g_get_user_data_dir (), "otpclient.cfg", NULL); -#endif - if (g_file_test (cfg_file_path, G_FILE_TEST_EXISTS)) { - if (!g_key_file_load_from_file (kf, cfg_file_path, G_KEY_FILE_NONE, &err)) { - g_printerr ("%s\n", err->message); - } else { - *column_id = g_key_file_get_integer (kf, "config", "column_id", &err); - if (err != NULL && (err->code == G_KEY_FILE_ERROR_KEY_NOT_FOUND || err->code == G_KEY_FILE_ERROR_INVALID_VALUE)) { - *column_id = -1; - *sort_order = -1; - } else { - *sort_order = g_key_file_get_integer (kf, "config", "sort_order", &err); - if (err != NULL && (err->code == G_KEY_FILE_ERROR_KEY_NOT_FOUND || err->code == G_KEY_FILE_ERROR_INVALID_VALUE)) { - *column_id = -1; - *sort_order = -1; - } - } - } - } - g_key_file_free (kf); - g_free (cfg_file_path); -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OTPClient-2.4.3/src/treeview.h new/OTPClient-2.4.4/src/treeview.h --- old/OTPClient-2.4.3/src/treeview.h 2021-03-25 16:06:10.000000000 +0100 +++ new/OTPClient-2.4.4/src/treeview.h 2021-03-30 15:49:00.000000000 +0200 @@ -31,8 +31,4 @@ GtkTreeViewColumn *column, gpointer user_data); -void reset_column_sorting_cb (GSimpleAction *simple , - GVariant *parameter, - gpointer user_data); - G_END_DECLS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OTPClient-2.4.3/src/ui/otpclient.ui new/OTPClient-2.4.4/src/ui/otpclient.ui --- old/OTPClient-2.4.3/src/ui/otpclient.ui 2021-03-25 16:06:10.000000000 +0100 +++ new/OTPClient-2.4.4/src/ui/otpclient.ui 2021-03-30 15:49:00.000000000 +0200 @@ -1,33 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.2 - -Copyright (C) 2020 - -This file is part of OTPClient. - -OTPClient 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. - -OTPClient 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 OTPClient. If not, see <http://www.gnu.org/licenses/>. - -Author: Paolo Stivanin - ---> <interface> <requires lib="gtk+" version="3.18"/> - <!-- interface-license-type gplv3 --> - <!-- interface-name OTPClient --> - <!-- interface-description Highly secure and easy to use GTK+ OTP client --> - <!-- interface-copyright 2019 --> - <!-- interface-authors Paolo Stivanin --> <object class="GtkPopoverMenu" id="add_pop_id"> <property name="can_focus">False</property> <child> @@ -1644,20 +1617,6 @@ <property name="position">5</property> </packing> </child> - <child> - <object class="GtkModelButton" id="resetsort_model_btn_id"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">settings_menu.reset_sort</property> - <property name="text" translatable="yes">Reset column sorting</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">6</property> - </packing> - </child> </object> <packing> <property name="submenu">main</property>