[Pkg-xfce-commits] r4842 - in goodies/branches/experimental: . xfce4-places-plugin/debian xfce4-weather-plugin/debian xfce4-weather-plugin/debian/patches
Yves-Alexis Perez
corsac at alioth.debian.org
Sun Jan 23 05:14:58 UTC 2011
Author: corsac
Date: 2011-01-23 17:14:53 +0000 (Sun, 23 Jan 2011)
New Revision: 4842
Added:
goodies/branches/experimental/thunar-archive-plugin/
goodies/branches/experimental/xfce4-weather-plugin/debian/patches/02_add-support-xfce4-panel-47.patch
Modified:
goodies/branches/experimental/xfce4-places-plugin/debian/changelog
goodies/branches/experimental/xfce4-places-plugin/debian/control
goodies/branches/experimental/xfce4-weather-plugin/debian/changelog
goodies/branches/experimental/xfce4-weather-plugin/debian/patches/series
Log:
branch thunar-archive-plugin
Modified: goodies/branches/experimental/xfce4-places-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-places-plugin/debian/changelog 2011-01-23 13:35:35 UTC (rev 4841)
+++ goodies/branches/experimental/xfce4-places-plugin/debian/changelog 2011-01-23 17:14:53 UTC (rev 4842)
@@ -3,7 +3,6 @@
[ Yves-Alexis Perez ]
* debian/control:
- switch to xfce section.
- - add exo-utils versionned dependencies since exo-mount is gone in 0.5.
- update standards version to 3.9.1.
* debian/watch edited to track Xfce archive reorganisation.
* debian/rules:
Modified: goodies/branches/experimental/xfce4-places-plugin/debian/control
===================================================================
--- goodies/branches/experimental/xfce4-places-plugin/debian/control 2011-01-23 13:35:35 UTC (rev 4841)
+++ goodies/branches/experimental/xfce4-places-plugin/debian/control 2011-01-23 17:14:53 UTC (rev 4842)
@@ -16,7 +16,7 @@
Package: xfce4-places-plugin
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, thunar, exo-utils (<< 0.5)
+Depends: ${shlibs:Depends}, ${misc:Depends}, thunar
Description: quick access to folders, documents and removable media
This plugin brings much of the functionality of GNOME’s Places menu to Xfce.
It puts a simple button on the panel. Clicking on this button opens up a menu
Modified: goodies/branches/experimental/xfce4-weather-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-weather-plugin/debian/changelog 2011-01-23 13:35:35 UTC (rev 4841)
+++ goodies/branches/experimental/xfce4-weather-plugin/debian/changelog 2011-01-23 17:14:53 UTC (rev 4842)
@@ -9,8 +9,11 @@
- pick {C,LD}FLAGS from dpkg-buildflags.
- add -O1, -z,defs and --as-needed to LDFLAGS.
- add hardening flags to {C,LD}FLAGS.
+ * debian/patches:
+ - 02_add-support-xfce4-panel-47 add, update patch from Nick Schermer to
+ port weather plugin to Xfce 4.7 panel.
- -- Yves-Alexis Perez <corsac at debian.org> Sat, 06 Nov 2010 03:25:13 +0100
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 09 Nov 2010 14:01:03 +0100
xfce4-weather-plugin (0.7.3-3) unstable; urgency=low
Added: goodies/branches/experimental/xfce4-weather-plugin/debian/patches/02_add-support-xfce4-panel-47.patch
===================================================================
--- goodies/branches/experimental/xfce4-weather-plugin/debian/patches/02_add-support-xfce4-panel-47.patch (rev 0)
+++ goodies/branches/experimental/xfce4-weather-plugin/debian/patches/02_add-support-xfce4-panel-47.patch 2011-01-23 17:14:53 UTC (rev 4842)
@@ -0,0 +1,470 @@
+diff --git a/configure.in b/configure.in
+index 90185dc..e99a563 100644
+--- a/configure.in
++++ b/configure.in
+@@ -62,7 +62,7 @@ XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
+ XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.0])
+ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.90.2])
+ XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.90.2])
+-XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.99.1])
++XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.7.0])
+ XDT_CHECK_PACKAGE([LIBXML], [libxml-2.0], [2.4.0])
+
+ AC_CHECK_LIB(resolv, res_query, [LIBRESOLV=-lresolv])
+diff --git a/panel-plugin/weather-config.c b/panel-plugin/weather-config.c
+index 9868468..ea6f1d2 100644
+--- a/panel-plugin/weather-config.c
++++ b/panel-plugin/weather-config.c
+@@ -342,7 +342,7 @@ create_config_dialog (xfceweather_data *data,
+ sg = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+ sg_buttons = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+
+- dialog = panel_slice_new0 (xfceweather_dialog);
++ dialog = g_slice_new0 (xfceweather_dialog);
+
+ dialog->wd = (xfceweather_data *) data;
+ dialog->dialog = gtk_widget_get_toplevel (vbox);
+diff --git a/panel-plugin/weather-data.c b/panel-plugin/weather-data.c
+index 3b7bb0b..87bd066 100644
+--- a/panel-plugin/weather-data.c
++++ b/panel-plugin/weather-data.c
+@@ -402,7 +402,6 @@ get_data_f (xml_dayf *data,
+ str = data->hi;
+ break;
+ default:
+- str = g_strdup ("-");
+ break;
+ }
+ break;
+@@ -416,7 +415,7 @@ get_data_f (xml_dayf *data,
+ }
+
+ if (!str)
+- str = "-";
++ str = "99";
+
+
+ p = copy_buffer (str);
+diff --git a/panel-plugin/weather-http.c b/panel-plugin/weather-http.c
+index fac883f..dba8e46 100644
+--- a/panel-plugin/weather-http.c
++++ b/panel-plugin/weather-http.c
+@@ -38,7 +38,7 @@
+ #include <glib.h>
+ #include <gtk/gtk.h>
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfce4panel/xfce-panel-macros.h>
++#include <libxfce4panel/libxfce4panel.h>
+
+ #include "weather-http.h"
+
+@@ -463,7 +463,7 @@ weather_http_receive_data_destroyed (gpointer user_data)
+ g_free (connection->proxy_host);
+
+ /* cleanup */
+- panel_slice_free (WeatherConnection, connection);
++ g_slice_free (WeatherConnection, connection);
+ }
+
+
+@@ -479,7 +479,7 @@ weather_http_receive_data (const gchar *hostname,
+ WeatherConnection *connection;
+
+ /* create slice */
+- connection = panel_slice_new0 (WeatherConnection);
++ connection = g_slice_new0 (WeatherConnection);
+
+ /* set connection properties */
+ connection->hostname = g_strdup (hostname);
+diff --git a/panel-plugin/weather-icon.c b/panel-plugin/weather-icon.c
+index ea1f9e8..c57d8fc 100644
+--- a/panel-plugin/weather-icon.c
++++ b/panel-plugin/weather-icon.c
+@@ -21,6 +21,7 @@
+ #include <config.h>
+ #endif
+
++#include <string.h>
+ #include <glib.h>
+ #include <gtk/gtk.h>
+
+@@ -39,10 +40,16 @@ get_icon (const gchar *number,
+ GdkPixbuf *image = NULL;
+ gchar *filename;
+
++ if (number == NULL || strcmp (number, "-") == 0)
++ number = "99";
++
+ filename = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "%s" G_DIR_SEPARATOR_S "%s.png",
+ THEMESDIR, DEFAULT_W_THEME, number);
+
+- image = gdk_pixbuf_new_from_file_at_scale (filename, size, size, TRUE, NULL);
++ if (size == -1)
++ image = gdk_pixbuf_new_from_file (filename, NULL);
++ else
++ image = gdk_pixbuf_new_from_file_at_scale (filename, size, size, TRUE, NULL);
+
+ if (G_UNLIKELY (!image)) {
+ g_warning ("Unable to open image: %s", filename);
+diff --git a/panel-plugin/weather-parsers.c b/panel-plugin/weather-parsers.c
+index 61ba8fc..e29fe8e 100644
+--- a/panel-plugin/weather-parsers.c
++++ b/panel-plugin/weather-parsers.c
+@@ -22,7 +22,7 @@
+ #endif
+
+ #include "weather-parsers.h"
+-#include <libxfce4panel/xfce-panel-macros.h>
++#include <libxfce4panel/libxfce4panel.h>
+
+
+
+@@ -38,7 +38,7 @@ parse_weather (xmlNode *cur_node)
+ return NULL;
+ }
+
+- if ((ret = panel_slice_new0 (xml_weather)) == NULL)
++ if ((ret = g_slice_new0 (xml_weather)) == NULL)
+ return NULL;
+
+ for (cur_node = cur_node->children; cur_node; cur_node = cur_node->next)
+@@ -80,7 +80,7 @@ parse_loc (xmlNode *cur_node)
+ {
+ xml_loc *ret;
+
+- if ((ret = panel_slice_new0 (xml_loc)) == NULL)
++ if ((ret = g_slice_new0 (xml_loc)) == NULL)
+ return NULL;
+
+
+@@ -105,7 +105,7 @@ parse_lnk (xmlNode *cur_node)
+ {
+ xml_lnk *ret;
+ int i = 0;
+- if ((ret = panel_slice_new0 (xml_lnk)) == NULL)
++ if ((ret = g_slice_new0 (xml_lnk)) == NULL)
+ return NULL;
+
+
+@@ -138,7 +138,7 @@ parse_uv (xmlNode *cur_node)
+ {
+ xml_uv *ret;
+
+- if ((ret = panel_slice_new0 (xml_uv)) == NULL)
++ if ((ret = g_slice_new0 (xml_uv)) == NULL)
+ return NULL;
+
+ for (cur_node = cur_node->children; cur_node; cur_node = cur_node->next)
+@@ -162,7 +162,7 @@ parse_bar (xmlNode *cur_node)
+ {
+ xml_bar *ret;
+
+- if ((ret = panel_slice_new0 (xml_bar)) == NULL)
++ if ((ret = g_slice_new0 (xml_bar)) == NULL)
+ return NULL;
+
+ for (cur_node = cur_node->children; cur_node; cur_node = cur_node->next)
+@@ -186,7 +186,7 @@ parse_wind (xmlNode *cur_node)
+ {
+ xml_wind *ret;
+
+- if ((ret = panel_slice_new0 (xml_wind)) == NULL)
++ if ((ret = g_slice_new0 (xml_wind)) == NULL)
+ return NULL;
+
+ for (cur_node = cur_node->children; cur_node; cur_node = cur_node->next)
+@@ -214,7 +214,7 @@ parse_cc (xmlNode *cur_node)
+ {
+ xml_cc *ret;
+
+- if ((ret = panel_slice_new0 (xml_cc)) == NULL)
++ if ((ret = g_slice_new0 (xml_cc)) == NULL)
+ return NULL;
+
+ for (cur_node = cur_node->children; cur_node; cur_node = cur_node->next)
+@@ -258,7 +258,7 @@ parse_part (xmlNode *cur_node)
+ {
+ xml_part *ret;
+
+- if ((ret = panel_slice_new0 (xml_part)) == NULL)
++ if ((ret = g_slice_new0 (xml_part)) == NULL)
+ return NULL;
+
+ for (cur_node = cur_node->children; cur_node; cur_node = cur_node->next)
+@@ -289,7 +289,7 @@ parse_dayf (xmlNode *cur_node)
+ xml_dayf *ret;
+ gchar *value;
+
+- if ((ret = panel_slice_new0 (xml_dayf)) == NULL)
++ if ((ret = g_slice_new0 (xml_dayf)) == NULL)
+ return NULL;
+
+ ret->day = (gchar *) xmlGetProp (cur_node, (const xmlChar *) "t");
+@@ -334,7 +334,7 @@ xml_uv_free (xml_uv * data)
+ g_free (data->i);
+ g_free (data->t);
+
+- panel_slice_free (xml_uv, data);
++ g_slice_free (xml_uv, data);
+ }
+
+
+@@ -347,7 +347,7 @@ xml_wind_free (xml_wind * data)
+ g_free (data->d);
+ g_free (data->t);
+
+- panel_slice_free (xml_wind, data);
++ g_slice_free (xml_wind, data);
+ }
+
+
+@@ -358,7 +358,7 @@ xml_bar_free (xml_bar * data)
+ g_free (data->r);
+ g_free (data->d);
+
+- panel_slice_free (xml_bar, data);
++ g_slice_free (xml_bar, data);
+ }
+
+
+@@ -385,7 +385,7 @@ xml_cc_free (xml_cc * data)
+ if (data->bar)
+ xml_bar_free (data->bar);
+
+- panel_slice_free (xml_cc, data);
++ g_slice_free (xml_cc, data);
+ }
+
+
+@@ -397,7 +397,7 @@ xml_loc_free (xml_loc *data)
+ g_free (data->sunr);
+ g_free (data->suns);
+
+- panel_slice_free (xml_loc, data);
++ g_slice_free (xml_loc, data);
+ }
+
+ static void
+@@ -408,7 +408,7 @@ xml_lnk_free (xml_lnk *data)
+ g_free (data->lnk[i]);
+ g_free (data->lnk_txt[i]);
+ }
+- panel_slice_free (xml_lnk, data);
++ g_slice_free (xml_lnk, data);
+ }
+
+ static void
+@@ -425,7 +425,7 @@ xml_part_free (xml_part *data)
+ if (data->wind)
+ xml_wind_free (data->wind);
+
+- panel_slice_free (xml_part, data);
++ g_slice_free (xml_part, data);
+ }
+
+
+@@ -447,7 +447,7 @@ xml_dayf_free (xml_dayf *data)
+ if (data->part[1])
+ xml_part_free (data->part[1]);
+
+- panel_slice_free (xml_dayf, data);
++ g_slice_free (xml_dayf, data);
+ }
+
+
+@@ -477,5 +477,5 @@ xml_weather_free (xml_weather *data)
+ }
+ }
+
+- panel_slice_free (xml_weather, data);
++ g_slice_free (xml_weather, data);
+ }
+diff --git a/panel-plugin/weather-scrollbox.c b/panel-plugin/weather-scrollbox.c
+index ea40574..f522101 100644
+--- a/panel-plugin/weather-scrollbox.c
++++ b/panel-plugin/weather-scrollbox.c
+@@ -63,7 +63,7 @@ free_label (Label *lbl)
+ if (lbl->msg)
+ g_free (lbl->msg);
+
+- panel_slice_free (Label, lbl);
++ g_slice_free (Label, lbl);
+ }
+
+
+@@ -285,7 +285,7 @@ gtk_scrollbox_set_label (GtkScrollbox *self,
+ }
+ else
+ {
+- newlbl = panel_slice_new0 (Label);
++ newlbl = g_slice_new0 (Label);
+ g_ptr_array_add (self->labels, newlbl);
+ }
+
+diff --git a/panel-plugin/weather-search.c b/panel-plugin/weather-search.c
+index 0915e8f..c6bb210 100644
+--- a/panel-plugin/weather-search.c
++++ b/panel-plugin/weather-search.c
+@@ -213,7 +213,7 @@ create_search_dialog (GtkWindow *parent,
+ search_dialog *dialog;
+ GtkWidget *dialog_vbox, *dialog_action;
+
+- dialog = panel_slice_new0 (search_dialog);
++ dialog = g_slice_new0 (search_dialog);
+
+ dialog->proxy_host = proxy_host;
+ dialog->proxy_port = proxy_port;
+@@ -329,7 +329,7 @@ free_search_dialog (search_dialog * dialog)
+
+ gtk_widget_destroy (dialog->dialog);
+
+- panel_slice_free (search_dialog, dialog);
++ g_slice_free (search_dialog, dialog);
+ }
+
+ typedef struct {
+diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c
+index 85b5b20..3b646d5 100644
+--- a/panel-plugin/weather.c
++++ b/panel-plugin/weather.c
+@@ -245,17 +245,8 @@ set_icon_error (xfceweather_data *data)
+ gtk_scrollbox_set_label (GTK_SCROLLBOX (data->scrollbox), -1, str);
+ g_free (str);
+
+- gtk_scrollbox_enablecb (GTK_SCROLLBOX (data->scrollbox), TRUE);
+-
+- gtk_widget_get_size_request (data->scrollbox, NULL, &height);
+-
+- if (data->orientation == GTK_ORIENTATION_VERTICAL)
+- icon = get_icon ("99", data->size - height - 2);
+- else
+- icon = get_icon ("99", data->size);
+-
+- gtk_image_set_from_pixbuf (GTK_IMAGE (data->iconimage), icon);
+-
++ icon = get_icon ("99", -1);
++ xfce_scaled_image_set_from_pixbuf (XFCE_SCALED_IMAGE (data->iconimage), icon);
+ if (G_LIKELY (icon))
+ g_object_unref (G_OBJECT (icon));
+
+@@ -274,7 +265,6 @@ set_icon_current (xfceweather_data *data)
+ GdkPixbuf *icon = NULL;
+ datas opt;
+ gchar *str;
+- gint size, height;
+
+ for (i = 0; i < data->labels->len; i++)
+ {
+@@ -287,25 +277,8 @@ set_icon_current (xfceweather_data *data)
+ g_free (str);
+ }
+
+- gtk_scrollbox_enablecb (GTK_SCROLLBOX (data->scrollbox), TRUE);
+-
+- if (i == 0)
+- {
+- size = data->size;
+- }
+- else
+- {
+- gtk_widget_get_size_request (data->scrollbox, NULL, &height);
+- if (data->orientation == GTK_ORIENTATION_VERTICAL)
+- size = data->size - height - 2;
+- else
+- size = data->size;
+- }
+-
+- icon = get_icon (get_data (data->weatherdata, WICON), size);
+-
+- gtk_image_set_from_pixbuf (GTK_IMAGE (data->iconimage), icon);
+-
++ icon = get_icon (get_data (data->weatherdata, WICON), -1);
++ xfce_scaled_image_set_from_pixbuf (XFCE_SCALED_IMAGE (data->iconimage), icon);
+ if (G_LIKELY (icon))
+ g_object_unref (G_OBJECT (icon));
+
+@@ -704,7 +677,7 @@ xfceweather_dialog_response (GtkWidget *dlg,
+
+ gtk_widget_destroy (dlg);
+ gtk_list_store_clear (dialog->mdl_xmloption);
+- panel_slice_free (xfceweather_dialog, dialog);
++ g_slice_free (xfceweather_dialog, dialog);
+
+ xfce_panel_plugin_unblock_menu (data->plugin);
+ xfceweather_write_config (data->plugin, data);
+@@ -785,7 +758,7 @@ static gboolean weather_get_tooltip_cb (GtkWidget *widget,
+ static xfceweather_data *
+ xfceweather_create_control (XfcePanelPlugin *plugin)
+ {
+- xfceweather_data *data = panel_slice_new0 (xfceweather_data);
++ xfceweather_data *data = g_slice_new0 (xfceweather_data);
+ GtkWidget *refresh, *forecast;
+ datas lbl;
+ GdkPixbuf *icon = NULL;
+@@ -799,8 +772,8 @@ xfceweather_create_control (XfcePanelPlugin *plugin)
+ #endif
+ data->scrollbox = gtk_scrollbox_new ();
+
+- icon = get_icon ("99", 16);
+- data->iconimage = gtk_image_new_from_pixbuf (icon);
++ icon = get_icon ("99", -1);
++ data->iconimage = xfce_scaled_image_new_from_pixbuf(icon);
+
+ if (G_LIKELY (icon))
+ g_object_unref (G_OBJECT (icon));
+@@ -810,12 +783,12 @@ xfceweather_create_control (XfcePanelPlugin *plugin)
+ data->vbox_center_scrollbox = gtk_vbox_new(FALSE, 0);
+ data->top_hbox = gtk_hbox_new (FALSE, 0);
+ gtk_misc_set_alignment (GTK_MISC (data->iconimage), 1, 0.5);
+- gtk_box_pack_start (GTK_BOX (data->top_hbox), data->iconimage, TRUE, FALSE, 0);
++ gtk_box_pack_start (GTK_BOX (data->top_hbox), data->iconimage, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (data->vbox_center_scrollbox), data->scrollbox, TRUE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (data->top_hbox), data->vbox_center_scrollbox, TRUE, FALSE, 0);
+
+ data->top_vbox = gtk_vbox_new (FALSE, 0);
+- gtk_box_pack_start (GTK_BOX (data->top_vbox), data->top_hbox, TRUE, FALSE, 0);
++ gtk_box_pack_start (GTK_BOX (data->top_vbox), data->top_hbox, TRUE, TRUE, 0);
+
+ data->tooltipbox = gtk_event_box_new ();
+ gtk_container_add (GTK_CONTAINER (data->tooltipbox), data->top_vbox);
+@@ -912,7 +885,7 @@ xfceweather_free (XfcePanelPlugin *plugin,
+ /* Free Array */
+ g_array_free (data->labels, TRUE);
+
+- panel_slice_free (xfceweather_data, data);
++ g_slice_free (xfceweather_data, data);
+ }
+
+
+@@ -1004,4 +977,4 @@ weather_construct (XfcePanelPlugin *plugin)
+ update_weatherdata (data);
+ }
+
+-XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL (weather_construct);
++XFCE_PANEL_PLUGIN_REGISTER (weather_construct);
+diff --git a/panel-plugin/weather.desktop.in.in b/panel-plugin/weather.desktop.in.in
+index c4c7b23..4846f8c 100644
+--- a/panel-plugin/weather.desktop.in.in
++++ b/panel-plugin/weather.desktop.in.in
+@@ -4,5 +4,6 @@ Encoding=UTF-8
+ _Name=Weather Update
+ _Comment=Show current weather conditions
+ Icon=xfce4-weather
+-X-XFCE-Exec=@libexecdir@/xfce4/panel-plugins/xfce4-weather-plugin
+-
++X-XFCE-Module=weather
++X-XFCE-Module-Path=@libdir@/xfce4/panel-plugins
++X-XFCE-Internal=FALSE
+diff --git a/panel-plugin/weather.h b/panel-plugin/weather.h
+index fe06073..f9f0fac 100644
+--- a/panel-plugin/weather.h
++++ b/panel-plugin/weather.h
+@@ -20,7 +20,7 @@
+ #ifndef __WEATHER_H__
+ #define __WEATHER_H__
+
+-#include <libxfce4panel/xfce-panel-plugin.h>
++#include <libxfce4panel/libxfce4panel.h>
+ #include <libxfce4util/libxfce4util.h>
+ #define PLUGIN_WEBSITE "http://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin"
+ #define PARTNER_ID "1121946239"
Modified: goodies/branches/experimental/xfce4-weather-plugin/debian/patches/series
===================================================================
--- goodies/branches/experimental/xfce4-weather-plugin/debian/patches/series 2011-01-23 13:35:35 UTC (rev 4841)
+++ goodies/branches/experimental/xfce4-weather-plugin/debian/patches/series 2011-01-23 17:14:53 UTC (rev 4842)
@@ -1 +1,2 @@
01_support-ipv6-only-proxies.patch
+02_add-support-xfce4-panel-47.patch
More information about the Pkg-xfce-commits
mailing list