rpms/xfce4-netload-plugin/F-10 xfce4-netload-plugin-0.4.0-fix-bar-colors.patch, NONE, 1.1 xfce4-netload-plugin-0.4.0-tooltip.patch, NONE, 1.1 xfce4-netload-plugin.spec, 1.11, 1.12 xfce4-netload-0.4.0-asneeded.patch, 1.1, NONE
Christoph Wickert
cwickert at fedoraproject.org
Wed Sep 9 17:02:11 UTC 2009
- Previous message: rpms/cpqarrayd/devel cpqarrayd-2.3-message-overrun.patch, NONE, 1.1 cpqarrayd.spec, 1.9, 1.10
- Next message: rpms/xfce4-netload-plugin/F-11 xfce4-netload-plugin-0.4.0-fix-bar-colors.patch, NONE, 1.1 xfce4-netload-plugin.spec, 1.14, 1.15 xfce4-netload-0.4.0-asneeded.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: cwickert
Update of /cvs/pkgs/rpms/xfce4-netload-plugin/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18992/F-10
Modified Files:
xfce4-netload-plugin.spec
Added Files:
xfce4-netload-plugin-0.4.0-fix-bar-colors.patch
xfce4-netload-plugin-0.4.0-tooltip.patch
Removed Files:
xfce4-netload-0.4.0-asneeded.patch
Log Message:
* Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-12
- Fix bar colors (#505214)
xfce4-netload-plugin-0.4.0-fix-bar-colors.patch:
netload.c | 55 +++++++++++++++++++------------------------------------
1 file changed, 19 insertions(+), 36 deletions(-)
--- NEW FILE xfce4-netload-plugin-0.4.0-fix-bar-colors.patch ---
Index: panel-plugin/netload.c
===================================================================
--- panel-plugin/netload.c (revision 3275)
+++ panel-plugin/netload.c (working copy)
@@ -257,7 +257,6 @@ static void run_update (t_global_monitor
static void monitor_set_orientation (XfcePanelPlugin *plugin, GtkOrientation orientation,
t_global_monitor *global)
{
- GtkRcStyle *rc;
gint i;
if (global->timeout_id)
@@ -316,19 +315,16 @@ static void monitor_set_orientation (Xfc
for (i = 0; i < SUM; i++)
{
- rc = gtk_widget_get_modifier_style(GTK_WIDGET(global->monitor->status[i]));
- if (!rc)
- {
- rc = gtk_rc_style_new();
- }
- else
- {
- rc->color_flags[GTK_STATE_PRELIGHT] |= GTK_RC_BG;
- rc->bg[GTK_STATE_PRELIGHT] =
- global->monitor->options.color[i];
- }
-
- gtk_widget_modify_style(GTK_WIDGET(global->monitor->status[i]), rc);
+ gtk_widget_modify_bg(GTK_WIDGET(global->monitor->status[i]),
+ GTK_STATE_PRELIGHT,
+ &global->monitor->options.color[i]);
+ gtk_widget_modify_bg(GTK_WIDGET(global->monitor->status[i]),
+ GTK_STATE_SELECTED,
+ &global->monitor->options.color[i]);
+ gtk_widget_modify_base(GTK_WIDGET(global->monitor->status[i]),
+ GTK_STATE_SELECTED,
+ &global->monitor->options.color[i]);
+
gtk_widget_show(GTK_WIDGET(global->monitor->status[i]));
gtk_box_pack_start(GTK_BOX(global->monitor->box),
@@ -413,7 +409,6 @@ static t_global_monitor * monitor_new(Xf
/* ---------------------------------------------------------------------------------------------- */
static void setup_monitor(t_global_monitor *global, gboolean supress_warnings)
{
- GtkRcStyle *rc;
gint i;
gtk_widget_hide(GTK_WIDGET(global->monitor->box));
@@ -423,27 +418,15 @@ static void setup_monitor(t_global_monit
for (i = 0; i < SUM; i++)
{
- gtk_widget_hide(GTK_WIDGET(global->monitor->status[i]));
- rc = gtk_widget_get_modifier_style(GTK_WIDGET(global->monitor->status[i]));
-
- if (!rc) {
- rc = gtk_rc_style_new();
- } else {
- /* to free the style safely in any case */
- gtk_rc_style_ref(rc);
- }
-
- if (rc) {
- rc->color_flags[GTK_STATE_PRELIGHT] |= GTK_RC_BG;
- rc->color_flags[GTK_STATE_SELECTED] |= GTK_RC_BASE;
- rc->bg[GTK_STATE_PRELIGHT] = global->monitor->options.color[i];
- rc->base[GTK_STATE_SELECTED] = global->monitor->options.color[i];
-
- gtk_widget_modify_style(GTK_WIDGET(global->monitor->status[i]), rc);
- gtk_rc_style_unref(rc);
- }
-
- gtk_widget_show(GTK_WIDGET(global->monitor->status[i]));
+ gtk_widget_modify_bg(GTK_WIDGET(global->monitor->status[i]),
+ GTK_STATE_PRELIGHT,
+ &global->monitor->options.color[i]);
+ gtk_widget_modify_bg(GTK_WIDGET(global->monitor->status[i]),
+ GTK_STATE_SELECTED,
+ &global->monitor->options.color[i]);
+ gtk_widget_modify_base(GTK_WIDGET(global->monitor->status[i]),
+ GTK_STATE_SELECTED,
+ &global->monitor->options.color[i]);
/* Maximum */
if( global->monitor->options.auto_max )
xfce4-netload-plugin-0.4.0-tooltip.patch:
netload.c | 35 ++++++++++++++++++++++++++---------
1 file changed, 26 insertions(+), 9 deletions(-)
--- NEW FILE xfce4-netload-plugin-0.4.0-tooltip.patch ---
--- ./panel-plugin/netload.c.orig 2005-10-09 12:08:01.000000000 +0300
+++ ./panel-plugin/netload.c 2009-05-23 20:50:22.000000000 +0300
@@ -30,8 +30,6 @@
#include <libxfce4panel/xfce-panel-plugin.h>
-static GtkTooltips *tooltips = NULL;
-
#define BORDER 8
/* Defaults */
@@ -219,7 +217,7 @@
"Incoming: %s kByte/s\nOutgoing: %s kByte/s\nTotal: %s kByte/s"),
get_name(&(global->monitor->data)), ip ? ip : _("no IP address"),
HISTSIZE_CALCULATE, buffer[IN], buffer[OUT], buffer[TOT]);
- gtk_tooltips_set_tip(tooltips, GTK_WIDGET(global->ebox), caption, NULL);
+ gtk_widget_set_tooltip_text(GTK_WIDGET(global->ebox), caption);
}
return TRUE;
@@ -237,6 +235,14 @@
if (global->monitor->options.update_interval > 0)
{
+#if GLIB_CHECK_VERSION( 2,14,0 )
+ if (global->monitor->options.update_interval % 1000 == 0)
+ {
+ global->timeout_id = g_timeout_add_seconds(global->monitor->
+ options.update_interval / 1000, (GtkFunction)update_monitors, global);
+ }
+ else
+#endif
global->timeout_id = g_timeout_add( global->monitor->options.update_interval,
(GtkFunction)update_monitors, global);
}
@@ -368,11 +374,6 @@
global->plugin = plugin;
xfce_panel_plugin_add_action_widget (plugin, global->ebox);
- if (!tooltips)
- {
- tooltips = gtk_tooltips_new();
- }
-
global->monitor = g_new(t_monitor, 1);
global->monitor->options.label_text = g_strdup(DEFAULT_TEXT);
global->monitor->options.network_device = g_strdup("");
@@ -819,6 +820,10 @@
GtkWidget *sep1, *sep2;
GtkBox *update_hbox;
GtkWidget *update_label, *update_unit_label;
+#if GLIB_CHECK_VERSION( 2,14,0 )
+ GtkBox *update_hint_hbox;
+ GtkWidget *update_hint_label;
+#endif
GtkWidget *color_label[SUM];
GtkWidget *align;
GtkBox *color_hbox[SUM];
@@ -935,7 +940,7 @@
gtk_misc_set_alignment(GTK_MISC(update_label), 0, 0.5);
gtk_box_pack_start(GTK_BOX(update_hbox), GTK_WIDGET(update_label), FALSE, FALSE, 0);
- global->monitor->update_spinner = gtk_spin_button_new_with_range (0.1, 10.0, 0.05);
+ global->monitor->update_spinner = gtk_spin_button_new_with_range (1.0, 10.0, 0.25);
gtk_spin_button_set_digits( GTK_SPIN_BUTTON(global->monitor->update_spinner), 2 );
gtk_spin_button_set_value( GTK_SPIN_BUTTON(global->monitor->update_spinner),
global->monitor->options.update_interval / 1000.0 );
@@ -948,6 +953,18 @@
gtk_widget_show_all(GTK_WIDGET(update_hbox));
gtk_size_group_add_widget(sg, update_label);
+
+#if GLIB_CHECK_VERSION( 2,14,0 )
+ /* Update interval hint */
+ update_hint_hbox = GTK_BOX(gtk_hbox_new(FALSE, 5));
+ update_hint_label = gtk_label_new(_("Note: Whole seconds are more power-efficient"));
+ gtk_label_set_line_wrap(GTK_LABEL(update_hint_label), TRUE);
+ gtk_box_pack_start(GTK_BOX(update_hint_hbox), GTK_WIDGET(update_hint_label),
+ FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(global->monitor->opt_vbox),
+ GTK_WIDGET(update_hint_hbox), FALSE, FALSE, 0);
+ gtk_widget_show_all(GTK_WIDGET(update_hint_hbox));
+#endif
sep1 = gtk_hseparator_new();
Index: xfce4-netload-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-netload-plugin/F-10/xfce4-netload-plugin.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- xfce4-netload-plugin.spec 18 Feb 2008 23:53:52 -0000 1.11
+++ xfce4-netload-plugin.spec 9 Sep 2009 17:02:11 -0000 1.12
@@ -1,13 +1,14 @@
Name: xfce4-netload-plugin
Version: 0.4.0
-Release: 7%{?dist}
+Release: 12%{?dist}
Summary: Network-load monitor for the Xfce panel
Group: User Interface/Desktops
License: GPLv2
URL: http://goodies.xfce.org/projects/panel-plugins/%{name}
Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
-Patch0: xfce4-netload-0.4.0-asneeded.patch
+Patch0: xfce4-netload-plugin-0.4.0-fix-bar-colors.patch
+Patch1: xfce4-netload-plugin-0.4.0-tooltip.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: xfce4-panel-devel >= 4.3.20, libxfcegui4-devel >= 4.3.20, libxml2-devel
@@ -19,7 +20,10 @@ A network-load monitor plugin for the Xf
%prep
%setup -q
-%patch0 -p1 -b .asneeded
+%patch0 -p0 -b .color
+%if 0%{?fedora} >= 11
+%patch1 -p1 -b .tooltip
+%endif
%build
%configure --disable-static
@@ -40,31 +44,46 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/xfce4/panel-plugins/*.desktop
%changelog
+* Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-12
+- Fix bar colors (#505214)
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jun 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-10
+- Bring back tooltips in GTK 2.16 with Dimitar Zhekov's patch (#508637)
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Jan 18 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-8
+- Rebuild for Xfce 4.6 (Beta 3)
+
* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.4.0-7
- Autorebuild for GCC 4.3
-* Sat Aug 25 2007 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-6
+* Sat Aug 25 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-6
- Rebuild for BuildID feature
- Update license tag
-* Sat Apr 28 2007 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-5
+* Sat Apr 28 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-5
- Rebuild for Xfce 4.4.1
-* Mon Jan 22 2007 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-4
+* Mon Jan 22 2007 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-4
- Rebuild for Xfce 4.4.
- Patch to compile with -Wl,--as-needed (bugzilla.xfce.org #2782)
-* Thu Oct 05 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-3
+* Thu Oct 05 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-3
- Bump release for devel checkin.
-* Wed Sep 13 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-2
+* Wed Sep 13 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-2
- BR perl(XML::Parser).
-* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.4.0-1
+* Mon Sep 04 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-1
- Update to 0.4 on XFCE 4.3.90.2.
- Remove bufsize-patch for now.
-* Mon Sep 04 2006 Christoph Wickert <fedora christoph-wickert de> - 0.3.3-7
+* Mon Sep 04 2006 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.3-7
- Mass rebuild for Fedora Core 6.
* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-6
--- xfce4-netload-0.4.0-asneeded.patch DELETED ---
- Previous message: rpms/cpqarrayd/devel cpqarrayd-2.3-message-overrun.patch, NONE, 1.1 cpqarrayd.spec, 1.9, 1.10
- Next message: rpms/xfce4-netload-plugin/F-11 xfce4-netload-plugin-0.4.0-fix-bar-colors.patch, NONE, 1.1 xfce4-netload-plugin.spec, 1.14, 1.15 xfce4-netload-0.4.0-asneeded.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list