Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xfce4-taskmanager for openSUSE:Factory checked in at 2021-02-09 21:16:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfce4-taskmanager (Old) and /work/SRC/openSUSE:Factory/.xfce4-taskmanager.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce4-taskmanager" Tue Feb 9 21:16:30 2021 rev:33 rq:870277 version:1.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/xfce4-taskmanager/xfce4-taskmanager.changes 2021-01-12 10:29:09.565237769 +0100 +++ /work/SRC/openSUSE:Factory/.xfce4-taskmanager.new.28504/xfce4-taskmanager.changes 2021-02-09 21:16:31.630791730 +0100 @@ -1,0 +2,12 @@ +Mon Feb 8 09:58:59 UTC 2021 - Marcel Kuehlhorn <[email protected]> + +- Update to version 1.4.1 + * Replace AC_PROG_LIBTOOL with IT_PROG_INTLTOOL + * Simplify "query-tooltip" signal handler + * statusbar: Use better color that works well with both light + and dark themes (gxo#apps/xfce4-taskmanager!17) + * Fix tooltip markdown issue + * Create notification area icon only if needed + (gxo#apps/xfce4-taskmanager#25) + +------------------------------------------------------------------- Old: ---- xfce4-taskmanager-1.4.0.tar.bz2 New: ---- xfce4-taskmanager-1.4.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-taskmanager.spec ++++++ --- /var/tmp/diff_new_pack.l4aP1S/_old 2021-02-09 21:16:32.382792586 +0100 +++ /var/tmp/diff_new_pack.l4aP1S/_new 2021-02-09 21:16:32.386792590 +0100 @@ -1,7 +1,7 @@ # # spec file for package xfce4-taskmanager # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: xfce4-taskmanager -Version: 1.4.0 +Version: 1.4.1 Release: 0 Summary: Simple Taskmanager for the Xfce Desktop Environment License: GPL-2.0-or-later ++++++ xfce4-taskmanager-1.4.0.tar.bz2 -> xfce4-taskmanager-1.4.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-taskmanager-1.4.0/NEWS new/xfce4-taskmanager-1.4.1/NEWS --- old/xfce4-taskmanager-1.4.0/NEWS 2020-12-28 22:57:31.000000000 +0100 +++ new/xfce4-taskmanager-1.4.1/NEWS 2021-02-07 10:16:56.000000000 +0100 @@ -1,3 +1,13 @@ +1.4.1 +====== +- Replace AC_PROG_LIBTOOL with IT_PROG_INTLTOOL +- Simplify "query-tooltip" signal handler +- statusbar: Use better color that works well with both light and dark + themes (!17) +- Fix tooltip markdown issue +- Create notification area icon only if needed (Bug #25) + + 1.4.0 ====== - Drop Gtk2 support diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-taskmanager-1.4.0/configure new/xfce4-taskmanager-1.4.1/configure --- old/xfce4-taskmanager-1.4.0/configure 2020-12-28 22:59:05.000000000 +0100 +++ new/xfce4-taskmanager-1.4.1/configure 2021-02-07 10:17:40.000000000 +0100 @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac 3506478. +# From configure.ac cb23dbd. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Xfce4 Taskmanager 1.4.0. +# Generated by GNU Autoconf 2.69 for Xfce4 Taskmanager 1.4.1. # # Report bugs to <http://bugzilla.xfce.org/>. # @@ -594,8 +594,8 @@ # Identity of this package. PACKAGE_NAME='Xfce4 Taskmanager' PACKAGE_TARNAME='xfce4-taskmanager' -PACKAGE_VERSION='1.4.0' -PACKAGE_STRING='Xfce4 Taskmanager 1.4.0' +PACKAGE_VERSION='1.4.1' +PACKAGE_STRING='Xfce4 Taskmanager 1.4.1' PACKAGE_BUGREPORT='http://bugzilla.xfce.org/' PACKAGE_URL='http://goodies.xfce.org/projects/applications/xfce4-taskmanager' @@ -1434,7 +1434,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Xfce4 Taskmanager 1.4.0 to adapt to many kinds of systems. +\`configure' configures Xfce4 Taskmanager 1.4.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1511,7 +1511,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Xfce4 Taskmanager 1.4.0:";; + short | recursive ) echo "Configuration of Xfce4 Taskmanager 1.4.1:";; esac cat <<\_ACEOF @@ -1644,7 +1644,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Xfce4 Taskmanager configure 1.4.0 +Xfce4 Taskmanager configure 1.4.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2016,7 +2016,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Xfce4 Taskmanager $as_me 1.4.0, which was +It was created by Xfce4 Taskmanager $as_me 1.4.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2993,7 +2993,7 @@ # Define the identity of the package. PACKAGE='xfce4-taskmanager' - VERSION='1.4.0' + VERSION='1.4.1' cat >>confdefs.h <<_ACEOF @@ -17101,7 +17101,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Xfce4 Taskmanager $as_me 1.4.0, which was +This file was extended by Xfce4 Taskmanager $as_me 1.4.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17168,7 +17168,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Xfce4 Taskmanager config.status 1.4.0 +Xfce4 Taskmanager config.status 1.4.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-taskmanager-1.4.0/configure.ac new/xfce4-taskmanager-1.4.1/configure.ac --- old/xfce4-taskmanager-1.4.0/configure.ac 2020-12-28 22:58:59.000000000 +0100 +++ new/xfce4-taskmanager-1.4.1/configure.ac 2021-02-07 10:17:33.000000000 +0100 @@ -14,8 +14,8 @@ dnl *************************** m4_define([taskmanager_version_major], [1]) m4_define([taskmanager_version_minor], [4]) -m4_define([taskmanager_version_micro], [0]) -m4_define([taskmanager_version_build], [3506478]) +m4_define([taskmanager_version_micro], [1]) +m4_define([taskmanager_version_build], [cb23dbd]) m4_define([taskmanager_version_tag], []) m4_define([taskmanager_version], [taskmanager_version_major().taskmanager_version_minor().taskmanager_version_micro()ifelse(taskmanager_version_tag(), [git], [taskmanager_version_tag()-taskmanager_version_build()], [taskmanager_version_tag()])]) @@ -49,7 +49,7 @@ AM_PROG_CC_C_O() AC_PROG_LD() AC_PROG_INSTALL() -AC_PROG_INTLTOOL() +IT_PROG_INTLTOOL() dnl ************************************ dnl *** Checks for library functions *** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-taskmanager-1.4.0/src/main.c new/xfce4-taskmanager-1.4.1/src/main.c --- old/xfce4-taskmanager-1.4.0/src/main.c 2020-07-02 23:04:27.000000000 +0200 +++ new/xfce4-taskmanager-1.4.1/src/main.c 2021-02-07 10:15:55.000000000 +0100 @@ -24,7 +24,7 @@ static XtmSettings *settings; static GtkWidget *window; -static GtkStatusIcon *status_icon; +static GtkStatusIcon *status_icon_or_null = NULL; static XtmTaskManager *task_manager; static guint timeout = 0; static gboolean start_hidden = FALSE; @@ -65,11 +65,37 @@ } static void +create_status_icon (void) +{ + if (!status_icon_or_null) + { + GtkStatusIcon *status_icon = gtk_status_icon_new_from_icon_name ("org.xfce.taskmanager"); + g_signal_connect (status_icon, "activate", G_CALLBACK (status_icon_activated), NULL); + g_signal_connect (status_icon, "popup-menu", G_CALLBACK (status_icon_popup_menu), NULL); + status_icon_or_null = status_icon; + } +} + +static gboolean +status_icon_get_visible () +{ + return status_icon_or_null && gtk_status_icon_get_visible (status_icon_or_null); +} + +static void show_hide_status_icon (void) { gboolean show_status_icon; g_object_get (settings, "show-status-icon", &show_status_icon, NULL); - gtk_status_icon_set_visible (status_icon, show_status_icon); + if (show_status_icon) + { + create_status_icon (); + gtk_status_icon_set_visible (status_icon_or_null, TRUE); + } + else if (status_icon_get_visible ()) + { + gtk_status_icon_set_visible (status_icon_or_null, FALSE); + } } static void @@ -84,7 +110,7 @@ static gboolean delete_window (void) { - if (!gtk_status_icon_get_visible (status_icon)) + if (!status_icon_get_visible ()) { xtm_settings_save_settings(settings); gtk_main_quit (); @@ -124,7 +150,7 @@ xtm_task_manager_get_swap_usage (task_manager, &swap_free, &swap_total); xtm_process_window_show_swap_usage (XTM_PROCESS_WINDOW (window), (swap_total > 0)); - if (gtk_status_icon_get_visible (status_icon)) + if (status_icon_get_visible ()) { g_snprintf (tooltip, sizeof(tooltip), _("<b>Processes:</b> %u\n" @@ -132,7 +158,7 @@ "<b>Memory:</b> %s\n" "<b>Swap:</b> %s"), num_processes, cpu, memory_info, swap_info); - gtk_status_icon_set_tooltip_markup (GTK_STATUS_ICON (status_icon), tooltip); + gtk_status_icon_set_tooltip_markup (GTK_STATUS_ICON (status_icon_or_null), tooltip); } xtm_task_manager_update_model (task_manager); @@ -210,11 +236,7 @@ #endif settings = xtm_settings_get_default (); - - status_icon = gtk_status_icon_new_from_icon_name ("org.xfce.taskmanager"); show_hide_status_icon (); - g_signal_connect (status_icon, "activate", G_CALLBACK (status_icon_activated), NULL); - g_signal_connect (status_icon, "popup-menu", G_CALLBACK (status_icon_popup_menu), NULL); window = xtm_process_window_new (); @@ -236,7 +258,7 @@ g_signal_connect (window, "destroy", G_CALLBACK (destroy_window), NULL); g_signal_connect (window, "delete-event", G_CALLBACK (delete_window), NULL); - if (gtk_widget_get_visible (window) || gtk_status_icon_get_visible (status_icon)) + if (gtk_widget_get_visible (window) || status_icon_get_visible ()) gtk_main (); else g_warning ("Nothing to do: activate hiding to the notification area when using --start-hidden"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-taskmanager-1.4.0/src/process-statusbar.c new/xfce4-taskmanager-1.4.1/src/process-statusbar.c --- old/xfce4-taskmanager-1.4.0/src/process-statusbar.c 2020-12-28 22:54:04.000000000 +0100 +++ new/xfce4-taskmanager-1.4.1/src/process-statusbar.c 2021-02-07 10:15:55.000000000 +0100 @@ -146,7 +146,7 @@ g_strlcpy(statusbar->memory, g_value_get_string (value), sizeof(statusbar->memory)); text = g_strdup_printf (_("Memory: %s"), statusbar->memory); gtk_label_set_text (GTK_LABEL (statusbar->label_memory), text); - gdk_rgba_parse (&color, "#c22b66"); + gdk_rgba_parse (&color, "#cb386c"); gtk_widget_override_color (statusbar->label_memory, GTK_STATE_NORMAL, &color); g_free (text); break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-taskmanager-1.4.0/src/process-tree-view.c new/xfce4-taskmanager-1.4.1/src/process-tree-view.c --- old/xfce4-taskmanager-1.4.0/src/process-tree-view.c 2020-12-28 22:54:04.000000000 +0100 +++ new/xfce4-taskmanager-1.4.1/src/process-tree-view.c 2021-02-06 13:33:19.000000000 +0100 @@ -73,6 +73,7 @@ static gboolean search_func (GtkTreeModel *model, gint column, const gchar *key, GtkTreeIter *iter, gpointer user_data); static void settings_changed (GObject *object, GParamSpec *pspec, XtmProcessTreeView *treeview); static void expand_row (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, XtmProcessTreeView *treeview); +static gboolean treeview_query_tooltip (GtkWidget *widget, gint x, gint y, gboolean keyboard_tip, GtkTooltip *tooltip, gpointer data); static void xtm_process_tree_view_class_init (XtmProcessTreeViewClass *klass) @@ -220,11 +221,12 @@ gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (treeview->model), sort_column_id, sort_type); } - gtk_tree_view_set_tooltip_column (GTK_TREE_VIEW (treeview), XTM_PTV_COLUMN_COMMAND); gtk_tree_view_set_search_equal_func (GTK_TREE_VIEW (treeview), (GtkTreeViewSearchEqualFunc)search_func, NULL, NULL); g_signal_connect (treeview, "columns-changed", G_CALLBACK (columns_changed), NULL); g_signal_connect (treeview, "button-press-event", G_CALLBACK (treeview_clicked), NULL); g_signal_connect (treeview, "key-press-event", G_CALLBACK (treeview_key_pressed), NULL); + g_signal_connect (treeview, "query-tooltip", G_CALLBACK (treeview_query_tooltip), NULL); + gtk_widget_set_has_tooltip (GTK_WIDGET (treeview), TRUE); } static void @@ -802,3 +804,28 @@ } } } + +static gboolean +treeview_query_tooltip (GtkWidget *widget, gint x, gint y, gboolean keyboard_tip, GtkTooltip *tooltip, gpointer data) +{ + GtkTreeIter iter; + GtkTreePath *path; + GtkTreeModel *model; + GtkTreeView *tree_view = GTK_TREE_VIEW (widget); + + if (gtk_tree_view_get_tooltip_context (tree_view, &x, &y, keyboard_tip, &model, &path, &iter)) + { + gchar *tooltip_text; + + gtk_tree_model_get (model, &iter, XTM_PTV_COLUMN_COMMAND, &tooltip_text, -1); + gtk_tooltip_set_text (tooltip, tooltip_text); + gtk_tree_view_set_tooltip_row (tree_view, tooltip, path); + + gtk_tree_path_free (path); + g_free (tooltip_text); + + return TRUE; + } + + return FALSE; +}
