[Pkg-xfce-commits] r4632 - in goodies/branches/experimental/xfce4-wavelan-plugin/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2010-12-05 16:00:18 +0000 (Sun, 05 Dec 2010)
New Revision: 4632

Removed:
   goodies/branches/experimental/xfce4-wavelan-plugin/debian/patches/01_fix-tooltips-gtk2.16.patch
Modified:
   goodies/branches/experimental/xfce4-wavelan-plugin/debian/changelog
   goodies/branches/experimental/xfce4-wavelan-plugin/debian/patches/series
Log:
01_fix-tooltips-gtk2.16 dropped, included upstream.

Modified: goodies/branches/experimental/xfce4-wavelan-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-wavelan-plugin/debian/changelog	2010-12-05 15:57:45 UTC (rev 4631)
+++ goodies/branches/experimental/xfce4-wavelan-plugin/debian/changelog	2010-12-05 16:00:18 UTC (rev 4632)
@@ -5,6 +5,7 @@
     - add build-dep on libxfcegui4-dev.
     - add build-dep on xfce4-dev-tools and libtool.
   * debian/patches:
+    - 01_fix-tooltips-gtk2.16 dropped, included upstream.
     - 03_link-against-libxfcegui4 added, link against libxfcegui4.
   * debian/rules:
     - run xdt-autogen after applying patches touching
@@ -14,7 +15,7 @@
     - add hardening flags to {C,LD}FLAGS.
   * Switch to 3.0 (quilt) source format.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 05 Dec 2010 16:57:20 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 05 Dec 2010 16:59:22 +0100
 
 xfce4-wavelan-plugin (0.5.5-3) unstable; urgency=low
 

Deleted: goodies/branches/experimental/xfce4-wavelan-plugin/debian/patches/01_fix-tooltips-gtk2.16.patch
===================================================================
--- goodies/branches/experimental/xfce4-wavelan-plugin/debian/patches/01_fix-tooltips-gtk2.16.patch	2010-12-05 15:57:45 UTC (rev 4631)
+++ goodies/branches/experimental/xfce4-wavelan-plugin/debian/patches/01_fix-tooltips-gtk2.16.patch	2010-12-05 16:00:18 UTC (rev 4632)
@@ -1,85 +0,0 @@
---- ./panel-plugin/wavelan.c.orig	2009-04-08 23:58:02.000000000 +0300
-+++ ./panel-plugin/wavelan.c	2009-05-23 18:09:53.000000000 +0300
-@@ -63,8 +63,6 @@
-   GtkWidget *image;
-   GtkWidget *signal;
- 
--  GtkTooltips *tooltips;
--
-   XfcePanelPlugin *plugin;
-   
- } t_wavelan;
-@@ -145,22 +143,20 @@
-       TRACE ("result = %d", result);
-       /* reset quality indicator */
-       if (result == WI_NOCARRIER) {
--        tip = g_strdup_printf(_("No carrier signal"));
-+        tip = g_strdup(_("No carrier signal"));
-         wavelan_set_state(wavelan, 0);
-       }
-       else {
-         /* set error */
--        tip = g_strdup_printf("%s", wi_strerror(result));
-+        tip = g_strdup(wi_strerror(result));
-         wavelan_set_state(wavelan, -1);
-       }
-     }
-     else {
-       wavelan_set_state(wavelan, stats.ws_quality);
--
--      if (strlen(stats.ws_netname) > 0)
--        tip = g_strdup_printf("%s: %d%s at %dMb/s", stats.ws_netname, stats.ws_quality, stats.ws_qunit, stats.ws_rate);
--      else
--        tip = g_strdup_printf("%d%s at %dMb/s", stats.ws_quality, stats.ws_qunit, stats.ws_rate);
-+      tip = g_strdup_printf("%s%s%d%s at %dMb/s", stats.ws_netname,
-+                            strlen(stats.ws_netname) > 0 ? ": " : "",
-+                            stats.ws_quality, stats.ws_qunit, stats.ws_rate);
-     }
-   }
-   else {
-@@ -170,8 +166,7 @@
- 
-   /* activate new tooltip */
-   if (tip != NULL) {
--    gtk_tooltips_set_tip(wavelan->tooltips, GTK_WIDGET (wavelan->plugin), 
--                         tip, NULL);
-+    gtk_widget_set_tooltip_text(GTK_WIDGET (wavelan->plugin), tip);
-     g_free(tip);
-   }
- 
-@@ -199,7 +194,11 @@
-     if ((wavelan->device = wi_open(wavelan->interface)) != NULL) {
-       /* register the update timer */
-       TRACE ("Opened device");
--      wavelan->timer_id = g_timeout_add(250, wavelan_timer, wavelan);
-+#if GLIB_CHECK_VERSION( 2,14,0 )
-+      wavelan->timer_id = g_timeout_add_seconds(1, wavelan_timer, wavelan);
-+#else
-+      wavelan->timer_id = g_timeout_add(1000, wavelan_timer, wavelan);
-+#endif
-     }
-   }
- }
-@@ -328,12 +327,6 @@
-   else
-     gtk_widget_set_size_request(wavelan->ebox, wavelan->size, -1);
-   
--
--  /* create tooltips */
--  wavelan->tooltips = gtk_tooltips_new();
--  g_object_ref (wavelan->tooltips);
--  gtk_object_sink (GTK_OBJECT (wavelan->tooltips));
--
-   wavelan_read_config(plugin, wavelan);
- 
-   wavelan_set_state(wavelan, wavelan->state);
-@@ -346,9 +339,6 @@
- {
-   TRACE ("Entered wavelan_free");
-   
--  /* free tooltips */
--  g_object_unref(G_OBJECT(wavelan->tooltips));
--
-     g_source_remove(wavelan->timer_id);
- 
-   /* free the device info */

Modified: goodies/branches/experimental/xfce4-wavelan-plugin/debian/patches/series
===================================================================
--- goodies/branches/experimental/xfce4-wavelan-plugin/debian/patches/series	2010-12-05 15:57:45 UTC (rev 4631)
+++ goodies/branches/experimental/xfce4-wavelan-plugin/debian/patches/series	2010-12-05 16:00:18 UTC (rev 4632)
@@ -1,3 +1,2 @@
-01_fix-tooltips-gtk2.16.patch
 02_fix-ftbfs-kfreebsd.patch
 03_link-against-libxfcegui4.patch