[Xfce4-commits] xfce4-cpugraph-plugin:master move gtk_widget_destroy() a bit below
Updating branch refs/heads/master to 0da8abda08486c0394b5d5004210b45c3f0ba695 (commit) from 8b9f945b6c459dcfd050651ab4bb8371f41505d2 (commit) commit 0da8abda08486c0394b5d5004210b45c3f0ba695 Author: Landry Breuil lan...@xfce.org Date: Sun Jun 24 21:18:18 2012 +0200 move gtk_widget_destroy() a bit below panel-plugin/settings.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/panel-plugin/settings.c b/panel-plugin/settings.c index 76346ba..ca82cf1 100644 --- a/panel-plugin/settings.c +++ b/panel-plugin/settings.c @@ -88,8 +88,8 @@ void read_settings( XfcePanelPlugin * plugin, CPUGraph * base ) /* use color from theme for default bar color */ bar = gtk_progress_bar_new(); barstyle = gtk_widget_get_style(bar); - gtk_widget_destroy(bar); barscolor = barstyle-bg[GTK_STATE_SELECTED]; + gtk_widget_destroy(bar); size = xfce_panel_plugin_get_size( plugin ); default_command( associated_command, in_terminal, startup_notification ); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-cpugraph-plugin:master use gdk_color_to_string() instead of handcrafting color codes when saving them
Updating branch refs/heads/master
to 9b7a70384962f4ada26b09342e8460c61c727b00 (commit)
from cd8aff8ee7055ee32444aa38a7ebf3eac1ff5d84 (commit)
commit 9b7a70384962f4ada26b09342e8460c61c727b00
Author: Landry Breuil lan...@xfce.org
Date: Sun Jun 24 21:26:13 2012 +0200
use gdk_color_to_string() instead of handcrafting color codes when saving
them
panel-plugin/settings.c | 16 +---
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/panel-plugin/settings.c b/panel-plugin/settings.c
index ca82cf1..bec6585 100644
--- a/panel-plugin/settings.c
+++ b/panel-plugin/settings.c
@@ -150,7 +150,6 @@ void read_settings( XfcePanelPlugin * plugin, CPUGraph *
base )
void write_settings( XfcePanelPlugin *plugin, CPUGraph *base )
{
- char value[10];
XfceRc *rc;
char *file;
@@ -176,15 +175,10 @@ void write_settings( XfcePanelPlugin *plugin, CPUGraph
*base )
xfce_rc_write_int_entry( rc, StartupNotification,
base-startup_notification );
xfce_rc_write_int_entry( rc, ColorMode, base-color_mode );
- g_snprintf( value, 8, #%02X%02X%02X, base-colors[1].red 8,
base-colors[1].green 8, base-colors[1].blue 8 );
- xfce_rc_write_entry( rc, Foreground1, value );
- g_snprintf( value, 8, #%02X%02X%02X, base-colors[2].red 8,
base-colors[2].green 8, base-colors[2].blue 8 );
- xfce_rc_write_entry( rc, Foreground2, value );
- g_snprintf( value, 8, #%02X%02X%02X, base-colors[0].red 8,
base-colors[0].green 8, base-colors[0].blue 8 );
- xfce_rc_write_entry( rc, Background, value );
- g_snprintf( value, 8, #%02X%02X%02X, base-colors[3].red 8,
base-colors[3].green 8, base-colors[3].blue 8 );
- xfce_rc_write_entry( rc, Foreground3, value );
- g_snprintf( value, 8, #%02X%02X%02X, base-colors[4].red 8,
base-colors[4].green 8, base-colors[4].blue 8 );
- xfce_rc_write_entry( rc, BarsColor, value );
+ xfce_rc_write_entry( rc, Foreground1,
gdk_color_to_string((base-colors[1])) );
+ xfce_rc_write_entry( rc, Foreground2,
gdk_color_to_string((base-colors[2])) );
+ xfce_rc_write_entry( rc, Foreground3,
gdk_color_to_string((base-colors[3])) );
+ xfce_rc_write_entry( rc, Background,
gdk_color_to_string((base-colors[0])) );
+ xfce_rc_write_entry( rc, BarsColor,
gdk_color_to_string((base-colors[4])) );
xfce_rc_close( rc );
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-wavelan-plugin:master Use XDT_FEATURE_DEBUG instead of the deprecated BM_DEBUG_SUPPORT
Updating branch refs/heads/master
to 79b2e326e295515a728ef605bc78dc2593eb3f75 (commit)
from b26808c146b2c784c6bb847a6c391a50a33a7cd5 (commit)
commit 79b2e326e295515a728ef605bc78dc2593eb3f75
Author: Landry Breuil lan...@xfce.org
Date: Fri Jun 29 21:58:10 2012 +0200
Use XDT_FEATURE_DEBUG instead of the deprecated BM_DEBUG_SUPPORT
Add a pair of DBG() for set-size and orientation-changed callbacks
configure.ac.in|2 +-
panel-plugin/wavelan.c |2 ++
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index a2e..06047b7 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -51,7 +51,7 @@ XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0],
[4.8.0])
XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
dnl Check for debugging support
-BM_DEBUG_SUPPORT()
+XDT_FEATURE_DEBUG
AC_OUTPUT([
Makefile
diff --git a/panel-plugin/wavelan.c b/panel-plugin/wavelan.c
index 1699508..27d8e21 100644
--- a/panel-plugin/wavelan.c
+++ b/panel-plugin/wavelan.c
@@ -403,6 +403,7 @@ wavelan_write_config(XfcePanelPlugin *plugin, t_wavelan
*wavelan)
static void
wavelan_set_orientation(XfcePanelPlugin* plugin, GtkOrientation orientation,
t_wavelan *wavelan)
{
+ DBG(wavelan_set_orientation(%d), orientation);
wavelan-orientation = orientation;
xfce_hvbox_set_orientation(XFCE_HVBOX(wavelan-box), orientation);
if (orientation == GTK_ORIENTATION_HORIZONTAL) {
@@ -421,6 +422,7 @@ static void
wavelan_set_size(XfcePanelPlugin* plugin, int size, t_wavelan *wavelan)
{
int border_width, image_size;
+ DBG(wavelan_set_size(%d), size);
#ifdef HAS_PANEL_49
size /= xfce_panel_plugin_get_nrows(plugin);
xfce_panel_plugin_set_small (plugin, (xfce_panel_plugin_get_mode(plugin) !=
XFCE_PANEL_PLUGIN_MODE_DESKBAR));
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-wavelan-plugin:master Merge branch 'master' of git://git.xfce.org/panel-plugins/xfce4-wavelan-plugin
Updating branch refs/heads/master to 10e836e81e48cc9ae9c1883ae4a09fbd61d883cd (commit) from 79b2e326e295515a728ef605bc78dc2593eb3f75 (commit) commit 10e836e81e48cc9ae9c1883ae4a09fbd61d883cd Merge: 79b2e32 440e758 Author: Landry Breuil lan...@xfce.org Date: Fri Jun 29 21:59:07 2012 +0200 Merge branch 'master' of git://git.xfce.org/panel-plugins/xfce4-wavelan-plugin commit 440e758c28d9de4503d988d304b12f41cdab3a05 Author: Gheyret Kenji ghey...@yahoo.com Date: Thu Jun 21 06:28:15 2012 +0200 l10n: Updated Uyghur (ug) translation to 100% New status: 12 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ug.po | 16 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/po/ug.po b/po/ug.po index 486267d..37c3ca9 100644 --- a/po/ug.po +++ b/po/ug.po @@ -6,7 +6,7 @@ # msgid msgstr -Project-Id-Version: xfce4-wavelan-plugin 0.4.3svn\n +Project-Id-Version: xfce4-wavelan-plugin\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2012-04-09 23:00+0200\n PO-Revision-Date: 2008-12-09 16:26+0900\n @@ -19,11 +19,11 @@ msgstr #: ../panel-plugin/wavelan.c:153 msgid No carrier signal -msgstr carrier سىگنالى يوق +msgstr سىگنالى يوق #: ../panel-plugin/wavelan.c:172 msgid No device configured -msgstr ئۈسكۈنە سەپلەنمىگەن(تەڭشەلمىگەن) +msgstr ئۈسكۈنە سەپلەنمىگەن #: ../panel-plugin/wavelan.c:521 msgid Wavelan Plugin Options @@ -35,11 +35,11 @@ msgstr خاسلىق #: ../panel-plugin/wavelan.c:547 msgid Interface -msgstr كۆرۈنمە يۈز +msgstr ئارايۈز #: ../panel-plugin/wavelan.c:568 msgid _Autohide when offline -msgstr offline چاغدا يوشۇرسۇن(_A) +msgstr توردا يوق چاغدا يوشۇرسۇن(_A) #: ../panel-plugin/wavelan.c:578 msgid Autohide when no hardware present @@ -53,11 +53,11 @@ msgstr ئىزاھات: ئۈسكۈنە يوق ۋاقىتتا قىستۇرمىن #: ../panel-plugin/wavelan.c:597 msgid Enable signal quality colors -msgstr 信号品質色を有効にする +msgstr سىگنال سۈپىتى كۆرسەتكۈچىنى ئىناۋەتلىك قىلسۇن #: ../panel-plugin/wavelan.c:608 msgid Show icon -msgstr +msgstr سىنبەلگە كۆرسەتسۇن #: ../panel-plugin/wavelan.c:671 ../panel-plugin/wavelan.desktop.in.h:2 msgid View the status of a wireless network @@ -65,4 +65,4 @@ msgstr سىمسىز تور ھالىتىنى كۆرسەتسۇن #: ../panel-plugin/wavelan.desktop.in.h:1 msgid Wavelan -msgstr Wavelan +msgstr Wavelan \ No newline at end of file ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-wavelan-plugin:master Set small property in all cases
Updating branch refs/heads/master to f3e3df9424c86c27e86ed8ae0b40a55ca393185d (commit) from 10e836e81e48cc9ae9c1883ae4a09fbd61d883cd (commit) commit f3e3df9424c86c27e86ed8ae0b40a55ca393185d Author: Landry Breuil lan...@xfce.org Date: Fri Jun 29 22:07:36 2012 +0200 Set small property in all cases The icon looks garbled in deskbar mode with several rows.. panel-plugin/wavelan.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/panel-plugin/wavelan.c b/panel-plugin/wavelan.c index 27d8e21..51e8aaa 100644 --- a/panel-plugin/wavelan.c +++ b/panel-plugin/wavelan.c @@ -425,7 +425,7 @@ wavelan_set_size(XfcePanelPlugin* plugin, int size, t_wavelan *wavelan) DBG(wavelan_set_size(%d), size); #ifdef HAS_PANEL_49 size /= xfce_panel_plugin_get_nrows(plugin); - xfce_panel_plugin_set_small (plugin, (xfce_panel_plugin_get_mode(plugin) != XFCE_PANEL_PLUGIN_MODE_DESKBAR)); + xfce_panel_plugin_set_small (plugin, TRUE); #endif border_width = size 26 ? 2 : 1; wavelan-size = size; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-battery-plugin:master Updates for 1.0.5.
Updating branch refs/heads/master to 297b29b560fa302d3399c879e38d700634063739 (commit) from 013b96b84185c4f63773c99b3146ddb20ad07e3e (commit) commit 297b29b560fa302d3399c879e38d700634063739 Author: Landry Breuil lan...@xfce.org Date: Sat Jun 30 09:37:38 2012 +0200 Updates for 1.0.5. NEWS|5 + configure.ac.in |2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/NEWS b/NEWS index b45a3e7..eb78336 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,8 @@ +1.0.5 (2012/05/30): +* Better compliance with the panel plugin HIG +* Don't set labels orientation on 4.8 panels (bug #8961) +* Set progressbar orientation in setup_battmon (bug #8935) + 1.0.4 (2012/05/14): === * Fix compilation with panel version 4.9 diff --git a/configure.ac.in b/configure.ac.in index 7f6b38e..b4d79b6 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -11,7 +11,7 @@ dnl *** Version information *** dnl *** m4_define([battery_version_major], [1]) m4_define([battery_version_minor], [0]) -m4_define([battery_version_micro], [4]) +m4_define([battery_version_micro], [5]) m4_define([battery_version_build], [r@REVISION@]) m4_define([battery_version_tag], []) m4_define([battery_version], [battery_version_major().battery_version_minor().battery_version_micro()ifelse(battery_version_tag(), [svn], [battery_version_tag()-battery_version_build()], [battery_version_tag()])]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-battery-plugin|1.0.5 Creating annotated tag 1.0.5
Updating annotated tag refs/tags/1.0.5 as new annotated tag to 63242999af21486e4bf6a80cf0f19f0adca6472c (tag) succeeds 1.0.4-12-g013b96b tagged by Landry Breuil lan...@xfce.org on 2012-06-30 09:45 +0200 Landry Breuil (1): Updates for 1.0.5. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-cpugraph-plugin:master Updates for 1.0.3.
Updating branch refs/heads/master to f992ddb2671429c04d1cc9a2dbc52a08d7bd8e97 (commit) from 85f05179dfa912a9310d38347f0f5f58d6a45a82 (commit) commit f992ddb2671429c04d1cc9a2dbc52a08d7bd8e97 Author: Landry Breuil lan...@xfce.org Date: Sat Jun 30 09:37:55 2012 +0200 Updates for 1.0.3. NEWS|5 + configure.ac.in |2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/NEWS b/NEWS index ed74a08..0a14900 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,8 @@ +1.0.3 (30/6/2012) += +- Better compliance with panel plugin HIG +- Add an option allowing to set the bar color (bug #8923) +- Fix transparency issues (bug #8893) 1.0.2 (29/4/2012) = - Ported to libxfce4ui diff --git a/configure.ac.in b/configure.ac.in index 114198f..0d946d8 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -5,7 +5,7 @@ dnl dnl 2004 Alexander Nordfelth alex.nordfe...@telia.com dnl -m4_define([cpugraph_version],[1.0.2]) +m4_define([cpugraph_version],[1.0.3]) AC_INIT([xfce4-cpugraph-plugin], [cpugraph_version], [goodies-...@xfce.org]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-cpugraph-plugin:master set bars orientation to opposite of panel orientation, fixes deskbar mode
Updating branch refs/heads/master to 9be0ab867b0f085191503f83492db2f9cbfb1761 (commit) from f992ddb2671429c04d1cc9a2dbc52a08d7bd8e97 (commit) commit 9be0ab867b0f085191503f83492db2f9cbfb1761 Author: Landry Breuil lan...@xfce.org Date: Sat Jun 30 11:13:49 2012 +0200 set bars orientation to opposite of panel orientation, fixes deskbar mode panel-plugin/cpu.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/panel-plugin/cpu.c b/panel-plugin/cpu.c index 8958259..b997840 100644 --- a/panel-plugin/cpu.c +++ b/panel-plugin/cpu.c @@ -292,7 +292,7 @@ static void orientation_cb( XfcePanelPlugin * plugin, GtkOrientation orientation xfce_hvbox_set_orientation( XFCE_HVBOX( base-box ), orientation ); #endif if( base-has_bars ) - set_bars_orientation( base, orientation ); + set_bars_orientation( base, panel_orientation ); size_cb( plugin, xfce_panel_plugin_get_size( base-plugin ), base); } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-cpugraph-plugin|1.0.3 Creating annotated tag 1.0.3
Updating annotated tag refs/tags/1.0.3 as new annotated tag to 6ba8730f305e0f45cf29cf220a821df2a02b6d87 (tag) succeeds xfce4-cpugraph-plugin-1.0.2-25-gf992ddb tagged by Landry Breuil lan...@xfce.org on 2012-06-30 11:14 +0200 Landry Breuil (1): set bars orientation to opposite of panel orientation, fixes deskbar mode ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-diskperf-plugin:master Updates for 2.5.4.
Updating branch refs/heads/master to cf7b839726f2b08c298022b041f324af94565d2a (commit) from c476fded0cefdbce725b616e9802ca2100debe03 (commit) commit cf7b839726f2b08c298022b041f324af94565d2a Author: Landry Breuil lan...@xfce.org Date: Sat Jun 30 09:38:03 2012 +0200 Updates for 2.5.4. NEWS|6 ++ configure.ac.in |2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/NEWS b/NEWS index 555f390..f12f1a6 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,9 @@ +2.5.4 (2012/6/30): + * Better compliance with panel plugin HIG + * Use double values for progress bars (bug #8882) + * Facilitate bringing up the configuration dialog (bug #8899) + * Fix transparency (bug #8892) + 2.5.3 (2012/5/13): - * Use newer tooltip API (bug #8730) diff --git a/configure.ac.in b/configure.ac.in index 221a8db..074dbbe 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -5,7 +5,7 @@ dnl m4_define([diskperf_version_major], [2]) m4_define([diskperf_version_minor], [5]) -m4_define([diskperf_version_micro], [3]) +m4_define([diskperf_version_micro], [4]) m4_define([diskperf_version_build], [@REVISION@]) m4_define([diskperf_version_tag], []) # leave empty for releases m4_define([diskperf_version], [diskperf_version_major().diskperf_version_minor().diskperf_version_micro()ifelse(diskperf_version_tag(), [git], [diskperf_version_tag()-diskperf_version_build()], [diskperf_version_tag()])]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-diskperf-plugin|2.5.4 Creating annotated tag 2.5.4
Updating annotated tag refs/tags/2.5.4 as new annotated tag to f91e7dd61f8e0b85da703626d5a7a2d38e109ebe (tag) succeeds 2.5.3-18-gc476fde tagged by Landry Breuil lan...@xfce.org on 2012-06-30 09:46 +0200 Landry Breuil (1): Updates for 2.5.4. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-fsguard-plugin:master Updates for 1.0.1.
Updating branch refs/heads/master to c19906d83bb08829d5bf5b5ce81b0a311866d2a2 (commit) from c9aa8e1f60799f239d0a031bee485964d11d6016 (commit) commit c19906d83bb08829d5bf5b5ce81b0a311866d2a2 Author: Landry Breuil lan...@xfce.org Date: Sat Jun 30 09:38:09 2012 +0200 Updates for 1.0.1. NEWS| 11 +++ configure.ac.in |2 +- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/NEWS b/NEWS index 1378a98..d83aba2 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,14 @@ +20120630 (1.0.1): +- + +* Better compliance with panel plugin HIG +* Fix look on transparent/colored panels +* Added compatibility with xfce4-panel v.4.9.0+ +* Fix config loading (bug #8821) +* Fix build on GNU/Hurd (Bug #7955 / #8820) +* Port to libxfce4ui (bug #8143) +* Build the plugin as a module + 20101215 (1.0.0): - diff --git a/configure.ac.in b/configure.ac.in index e0b48dd..5444ee5 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -6,7 +6,7 @@ dnl m4_define([xfce4_fsguard_plugin_version_major], [1]) m4_define([xfce4_fsguard_plugin_version_minor], [0]) -m4_define([xfce4_fsguard_plugin_version_micro], [0]) +m4_define([xfce4_fsguard_plugin_version_micro], [1]) m4_define([xfce4_fsguard_plugin_version_nano], []) m4_define([xfce4_fsguard_plugin_version_build], [@REVISION@]) m4_define([xfce4_fsguard_plugin_version_tag], [git]) # Leave empty for releases ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-fsguard-plugin:master oops, empty version tag for release
Updating branch refs/heads/master to dcd2e7da1fcc623ef817aadf1c94a5504f273694 (commit) from c19906d83bb08829d5bf5b5ce81b0a311866d2a2 (commit) commit dcd2e7da1fcc623ef817aadf1c94a5504f273694 Author: Landry Breuil lan...@xfce.org Date: Sat Jun 30 10:02:31 2012 +0200 oops, empty version tag for release configure.ac.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 5444ee5..c02dbb3 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -9,7 +9,7 @@ m4_define([xfce4_fsguard_plugin_version_minor], [0]) m4_define([xfce4_fsguard_plugin_version_micro], [1]) m4_define([xfce4_fsguard_plugin_version_nano], []) m4_define([xfce4_fsguard_plugin_version_build], [@REVISION@]) -m4_define([xfce4_fsguard_plugin_version_tag], [git]) # Leave empty for releases +m4_define([xfce4_fsguard_plugin_version_tag], []) # Leave empty for releases m4_define([xfce4_fsguard_plugin_version], [xfce4_fsguard_plugin_version_major().xfce4_fsguard_plugin_version_minor().xfce4_fsguard_plugin_version_micro()ifelse(xfce4_fsguard_plugin_version_nano(), [], [], [.xfce4_fsguard_plugin_version_nano()])ifelse(xfce4_fsguard_plugin_version_tag(), [git], [xfce4_fsguard_plugin_version_tag()-xfce4_fsguard_plugin_version_build()], [xfce4_fsguard_plugin_version_tag()])]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-fsguard-plugin:master Properly resize image _and_ btn so that the image is not shrinked
Updating branch refs/heads/master to f3b0e9a1d8c1cf0c6ce841f45a84e1bc0f136744 (commit) from dcd2e7da1fcc623ef817aadf1c94a5504f273694 (commit) commit f3b0e9a1d8c1cf0c6ce841f45a84e1bc0f136744 Author: Landry Breuil lan...@xfce.org Date: Sat Jun 30 11:10:05 2012 +0200 Properly resize image _and_ btn so that the image is not shrinked panel-plugin/fsguard.c |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/panel-plugin/fsguard.c b/panel-plugin/fsguard.c index fe83058..8d97574 100644 --- a/panel-plugin/fsguard.c +++ b/panel-plugin/fsguard.c @@ -491,8 +491,9 @@ fsguard_set_size (XfcePanelPlugin *plugin, int size, FsGuard *fsguard) gtk_widget_set_size_request (GTK_WIDGET(fsguard-progress_bar), -1, 8); gtk_widget_set_size_request (GTK_WIDGET(plugin), size, -1); } -size -= 2 * border_width; gtk_widget_set_size_request (fsguard-btn_panel, size, size); +size -= 2 * border_width; +gtk_widget_set_size_request (fsguard-icon_panel, size, size); fsguard_refresh_icon (fsguard); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-fsguard-plugin|1.0.1 Creating annotated tag 1.0.1
Updating annotated tag refs/tags/1.0.1 as new annotated tag to cfb769cd302d48119c022a7817a8f978309d3b09 (tag) succeeds 1.0.0-42-gdcd2e7d tagged by Landry Breuil lan...@xfce.org on 2012-06-30 11:10 +0200 Landry Breuil (1): Properly resize image _and_ btn so that the image is not shrinked ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-mpc-plugin:master Updates for 0.4.4.
Updating branch refs/heads/master to a54bfff373215eb593e59f2a06f8f0630ed236b1 (commit) from 47e7baff9c9778b9491d70b92fdfb83623bd1a0e (commit) commit a54bfff373215eb593e59f2a06f8f0630ed236b1 Author: Landry Breuil lan...@xfce.org Date: Sat Jun 30 09:38:17 2012 +0200 Updates for 0.4.4. ChangeLog |5 + configure.ac.in |2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3ad7d41..65b1e10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +30-06-2012 Landry Breuil landry at xfce.org + * release 0.4.4 + * Better compliance with the panel plugin HIG + * Fix wrong fr translation + 13-05-2012 Landry Breuil landry at xfce.org * release 0.4.3 * set small property (unless in deskbar mode) diff --git a/configure.ac.in b/configure.ac.in index 2967022..047328c 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -5,7 +5,7 @@ dnl m4_define([mpc_version_major], [0]) m4_define([mpc_version_minor], [4]) -m4_define([mpc_version_micro], [3]) +m4_define([mpc_version_micro], [4]) m4_define([mpc_version_tag], []) # Leave empty for releases m4_define([mpc_version_build], [@REVISION@]) m4_define([mpc_version], [mpc_version_major().mpc_version_minor().mpc_version_micro()ifelse(mpc_version_tag(), [], [], [mpc_version_tag()-mpc_version_build()])]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-mpc-plugin|0.4.4 Creating annotated tag 0.4.4
Updating annotated tag refs/tags/0.4.4 as new annotated tag to e2bd0f6777097f1ad6b79b1b0e4855bbb48eeafb (tag) succeeds xfce4-mpc-plugin-0.4.3-6-g47e7baf tagged by Landry Breuil lan...@xfce.org on 2012-06-30 09:47 +0200 Landry Breuil (1): Updates for 0.4.4. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-systemload-plugin:master Updates for 1.1.1.
Updating branch refs/heads/master to a907f47fc2cbf958343db5e38549f519de9358e2 (commit) from 522535569428beb2366795727696f84f9e2edef9 (commit) commit a907f47fc2cbf958343db5e38549f519de9358e2 Author: Landry Breuil lan...@xfce.org Date: Sat Jun 30 09:38:27 2012 +0200 Updates for 1.1.1. NEWS| 12 configure.ac.in |2 +- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/NEWS b/NEWS index 1cad2bd..3284775 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,15 @@ +1.1.1 (2012/06/30) +- +- Simplify tooltip handling code +- Better compliance with panel plugin HIG +- Only set label angle with panel 4.9 +- Set plugin to small in all modes except deskbar modes (bug #8944) +- Facilitate bringing up the configuration dialog (bug #8900) +- Fix background transparency by setting the main evbox hidden (bug #8891) +- Changing uptime label orientation in the vertical mode +- Compatibility with panel 4.9+ +- Use only HW_PHYSMEM64 on OpenBSD, HW_SYSMEM is deprecated + 1.1.0 (2012/04/18) - - Fix progressbar width in vertical mode diff --git a/configure.ac.in b/configure.ac.in index 1594991..06a0d6d 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -9,7 +9,7 @@ dnl *** Version information *** dnl *** m4_define([systemload_version_major], [1]) m4_define([systemload_version_minor], [1]) -m4_define([systemload_version_micro], [0]) +m4_define([systemload_version_micro], [1]) m4_define([systemload_version_build], [r@REVISION@]) m4_define([systemload_version_tag], []) m4_define([systemload_version], [systemload_version_major().systemload_version_minor().systemload_version_micro()ifelse(systemload_version_tag(), [git], [systemload_version_tag()-systemload_version_build()], [systemload_version_tag()])]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-systemload-plugin|1.1.1 Creating annotated tag 1.1.1
Updating annotated tag refs/tags/1.1.1 as new annotated tag to f4b63fc1e9f3354a94f59d118eacae7fed25f1f5 (tag) succeeds 1.1.0-49-g5225355 tagged by Landry Breuil lan...@xfce.org on 2012-06-30 09:48 +0200 Landry Breuil (1): Updates for 1.1.1. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-wavelan-plugin:master Updates for 0.5.11.
Updating branch refs/heads/master to 411fb25c74f2a6d1e869f17e3b7f5b6bd78e9dc0 (commit) from f3e3df9424c86c27e86ed8ae0b40a55ca393185d (commit) commit 411fb25c74f2a6d1e869f17e3b7f5b6bd78e9dc0 Author: Landry Breuil lan...@xfce.org Date: Sat Jun 30 09:38:34 2012 +0200 Updates for 0.5.11. NEWS|5 + configure.ac.in |2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/NEWS b/NEWS index 1fa891f..6e69c11 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,8 @@ +0.5.11 (2012/06/30): +- + * Better compliance with panel plugin HIG + * Fix transparency and put event box above its children (bug #8913) + 0.5.10 (2012/04/13): - * Translation updates (uk,sk,eu,pt_BR,it,da,nl,pt,gl,ko,zh_CN) diff --git a/configure.ac.in b/configure.ac.in index 06047b7..0d6c8c5 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -5,7 +5,7 @@ dnl dnl Version information m4_define([xwp_version_major], [0]) m4_define([xwp_version_minor], [5]) -m4_define([xwp_version_micro], [10]) +m4_define([xwp_version_micro], [11]) m4_define([xwp_version], [xwp_version_major().xwp_version_minor().xwp_version_micro()]) dnl Initial autoconf ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-wavelan-plugin|0.5.11 Creating annotated tag 0.5.11
Updating annotated tag refs/tags/0.5.11 as new annotated tag to fc498b102e7f16e09f3891d2ba9cf4f4a71c374e (tag) succeeds xfce4-wavelan-plugin-0.5.10-27-gf3e3df9 tagged by Landry Breuil lan...@xfce.org on 2012-06-30 09:48 +0200 Landry Breuil (1): Updates for 0.5.11. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-cpugraph-plugin:master use AUTOMAKE_OPTIONS to set dist-bzip2 target
Updating branch refs/heads/master to da421d085e420de9840bd4331c91069f9998be24 (commit) from 50f47c7d5797cbd81dc68fd41a1bd328db2e5255 (commit) commit da421d085e420de9840bd4331c91069f9998be24 Author: Landry Breuil lan...@xfce.org Date: Mon Jul 2 16:00:09 2012 +0200 use AUTOMAKE_OPTIONS to set dist-bzip2 target Makefile.am |6 +- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index a8be6ce..39f0a85 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,11 +5,7 @@ SUBDIRS = panel-plugin po icons distclean-local: rm -rf *.cache *~ -dist-bz2: dist - zcat $(PACKAGE)-$(VERSION).tar.gz | bzip2 --best -c $(PACKAGE)-$(VERSION).tar.bz2 - -distcheck-bz2: distcheck - zcat $(PACKAGE)-$(VERSION).tar.gz | bzip2 --best -c $(PACKAGE)-$(VERSION).tar.bz2 +AUTOMAKE_OPTIONS = 1.8 dist-bzip2 .PHONY: ChangeLog ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-cpugraph-plugin:master Updates for 1.0.4
Updating branch refs/heads/master to 95997aef92a29ee155ac442965915927950bfdfc (commit) from da421d085e420de9840bd4331c91069f9998be24 (commit) commit 95997aef92a29ee155ac442965915927950bfdfc Author: Landry Breuil lan...@xfce.org Date: Mon Jul 2 16:06:00 2012 +0200 Updates for 1.0.4 NEWS|4 configure.ac.in |2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/NEWS b/NEWS index 0a14900..d52a449 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +1.0.4 (2/7/2012) += +- Fix FTBFS with panel 4.8 + 1.0.3 (30/6/2012) = - Better compliance with panel plugin HIG diff --git a/configure.ac.in b/configure.ac.in index 0d946d8..6f4d79f 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -5,7 +5,7 @@ dnl dnl 2004 Alexander Nordfelth alex.nordfe...@telia.com dnl -m4_define([cpugraph_version],[1.0.3]) +m4_define([cpugraph_version],[1.0.4]) AC_INIT([xfce4-cpugraph-plugin], [cpugraph_version], [goodies-...@xfce.org]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-cpugraph-plugin:master Only set bar color if bars are enabled (bug #9071)
Updating branch refs/heads/master
to 25b2e1e8deec574201092559901d6154dc608ab7 (commit)
from 95997aef92a29ee155ac442965915927950bfdfc (commit)
commit 25b2e1e8deec574201092559901d6154dc608ab7
Author: Landry Breuil lan...@xfce.org
Date: Mon Jul 2 17:12:03 2012 +0200
Only set bar color if bars are enabled (bug #9071)
panel-plugin/cpu.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/panel-plugin/cpu.c b/panel-plugin/cpu.c
index b1030c2..c454124 100644
--- a/panel-plugin/cpu.c
+++ b/panel-plugin/cpu.c
@@ -517,7 +517,7 @@ void set_color( CPUGraph *base, guint number, GdkColor
color )
gtk_widget_modify_bg( base-draw_area, GTK_STATE_INSENSITIVE,
base-colors[0] );
gtk_widget_modify_bg( base-draw_area, GTK_STATE_NORMAL,
base-colors[0] );
}
- if( number == 4 )
+ if( number == 4 base-has_bars )
{
n = nb_bars( base );
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-cpugraph-plugin:master Merge branch 'master' of git://git.xfce.org/panel-plugins/xfce4-cpugraph-plugin
Updating branch refs/heads/master to 1b4295c483adf48e2e1479cf836552223c7f5220 (commit) from 25b2e1e8deec574201092559901d6154dc608ab7 (commit) commit 1b4295c483adf48e2e1479cf836552223c7f5220 Merge: 25b2e1e 60102a3 Author: Landry Breuil lan...@xfce.org Date: Mon Jul 2 17:12:35 2012 +0200 Merge branch 'master' of git://git.xfce.org/panel-plugins/xfce4-cpugraph-plugin commit 60102a3da40d2bf55ed39e447a6966a43f590d4e Author: Sergio Marques smarque...@gmail.com Date: Sun Jul 1 12:31:19 2012 +0200 l10n: Updated Portuguese (pt) translation to 100% New status: 37 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit e5a3f2eb9067a403f2a70058ca4b1f1d8b77ed43 Author: Andhika Padmawan andhika.padma...@gmail.com Date: Sun Jul 1 04:13:06 2012 +0200 l10n: Updated Indonesian (id) translation to 100% New status: 37 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/id.po | 72 +++--- po/pt.po | 76 - 2 files changed, 78 insertions(+), 70 deletions(-) diff --git a/po/id.po b/po/id.po index 9f185a2..d125b09 100644 --- a/po/id.po +++ b/po/id.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: xfce4-cpugraph-plugin 0.3.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2012-06-10 08:30+\n +POT-Creation-Date: 2012-07-01 02:03+\n PO-Revision-Date: 2010-06-24 00:04+0700\n Last-Translator: Andhika Padmawan andhika.padma...@gmail.com\n Language-Team: Indonesian translation-team...@lists.sourceforge.net\n @@ -24,137 +24,141 @@ msgstr Representasi grafik dari beban CPU msgid Copyright (c) 2003-2012\n msgstr Hak Cipta 2003-2012\n -#: ../panel-plugin/cpu.c:361 +#: ../panel-plugin/cpu.c:367 #, c-format msgid Usage: %u%% msgstr Penggunaan: %u%% -#: ../panel-plugin/properties.c:78 +#: ../panel-plugin/properties.c:80 msgid CPU Graph Properties msgstr Properti Grafik CPU -#: ../panel-plugin/properties.c:96 +#: ../panel-plugin/properties.c:98 msgid Use non-linear time-scale msgstr Gunakan skala waktu non linear -#: ../panel-plugin/properties.c:97 +#: ../panel-plugin/properties.c:99 msgid Show frame msgstr Tampilkan bingkai -#: ../panel-plugin/properties.c:98 +#: ../panel-plugin/properties.c:100 msgid Show border msgstr Tampilkan batas -#: ../panel-plugin/properties.c:99 +#: ../panel-plugin/properties.c:101 msgid Show current usage bar msgid_plural Show current usage bars msgstr[0] Tampilkan batang penggunaan saat ini -#: ../panel-plugin/properties.c:101 +#: ../panel-plugin/properties.c:103 msgid Run in terminal msgstr Jalankan di terminal -#: ../panel-plugin/properties.c:102 +#: ../panel-plugin/properties.c:104 msgid Use startup notification msgstr Gunakan notifikasi hidupkan -#: ../panel-plugin/properties.c:105 +#: ../panel-plugin/properties.c:107 msgid Color 1: msgstr Warna 1: -#: ../panel-plugin/properties.c:106 +#: ../panel-plugin/properties.c:108 msgid Color 2: msgstr Warna 2: -#: ../panel-plugin/properties.c:107 +#: ../panel-plugin/properties.c:109 msgid Color 3: msgstr Warna 3: -#: ../panel-plugin/properties.c:108 +#: ../panel-plugin/properties.c:110 msgid Background: msgstr Latar belakang: -#: ../panel-plugin/properties.c:115 +#: ../panel-plugin/properties.c:114 +msgid Bars color: +msgstr Warna batang: + +#: ../panel-plugin/properties.c:119 msgid Appearance msgstr Tampilan -#: ../panel-plugin/properties.c:117 +#: ../panel-plugin/properties.c:121 msgid Advanced msgstr Mahir -#: ../panel-plugin/properties.c:193 +#: ../panel-plugin/properties.c:197 msgid Fastest (~250ms) msgstr Tercepat (~250md) -#: ../panel-plugin/properties.c:194 +#: ../panel-plugin/properties.c:198 msgid Fast (~500ms) msgstr Cepat (~500md) -#: ../panel-plugin/properties.c:195 +#: ../panel-plugin/properties.c:199 msgid Normal (~750ms) msgstr Normal (~750md) -#: ../panel-plugin/properties.c:196 +#: ../panel-plugin/properties.c:200 msgid Slow (~1s) msgstr Pelan (~1d) -#: ../panel-plugin/properties.c:200 +#: ../panel-plugin/properties.c:204 msgid Update Interval: msgstr Interval Pemutakhiran: -#: ../panel-plugin/properties.c:208 +#: ../panel-plugin/properties.c:212 msgid All msgstr Semua -#: ../panel-plugin/properties.c:213 +#: ../panel-plugin/properties.c:217 msgid Tracked Core: msgstr Inti Terlacak: -#: ../panel-plugin/properties.c:224 +#: ../panel-plugin/properties.c:228 msgid Width: msgstr Lebar: -#: ../panel-plugin/properties.c:226 +#: ../panel-plugin/properties.c:230 msgid Height: msgstr Tinggi: -#: ../panel-plugin/properties.c:240 +#: ../panel-plugin/properties.c:244 msgid Associated command: msgstr Perintah diasosiasikan: -#: ../panel-plugin/properties.c:264 +#: ../panel-plugin/properties.c:268 msgid Normal msgstr Normal -#: ../panel-plugin
[Xfce4-commits] xfce4-cpugraph-plugin|1.0.4 Creating annotated tag 1.0.4
Updating annotated tag refs/tags/1.0.4 as new annotated tag to 7cb7ae4ccdc38c03e96bdb9839b81b96a2f1bb83 (tag) succeeds 1.0.3-2-gda421d0 tagged by Landry Breuil lan...@xfce.org on 2012-07-02 16:06 +0200 Landry Breuil (1): Updates for 1.0.4 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-cpugraph-plugin:master Fix FTBFS with panel 4.8.
Updating branch refs/heads/master
to 50f47c7d5797cbd81dc68fd41a1bd328db2e5255 (commit)
from 9be0ab867b0f085191503f83492db2f9cbfb1761 (commit)
commit 50f47c7d5797cbd81dc68fd41a1bd328db2e5255
Author: Landry Breuil lan...@xfce.org
Date: Mon Jul 2 15:58:17 2012 +0200
Fix FTBFS with panel 4.8.
While here simplifiy 4.9 mode-changed callback codepath.
panel-plugin/cpu.c |9 -
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/panel-plugin/cpu.c b/panel-plugin/cpu.c
index b997840..b1030c2 100644
--- a/panel-plugin/cpu.c
+++ b/panel-plugin/cpu.c
@@ -281,18 +281,17 @@ static void set_bars_size( CPUGraph *base, gint size,
GtkOrientation orientation
#ifdef HAS_PANEL_49
static void mode_cb( XfcePanelPlugin * plugin, XfcePanelPluginMode mode,
CPUGraph *base )
{
- GtkOrientation panel_orientation = xfce_panel_plugin_get_orientation
(plugin);
- GtkOrientation orientation = (mode == XFCE_PANEL_PLUGIN_MODE_VERTICAL) ?
- GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL;
+ GtkOrientation orientation = (mode ==
XFCE_PANEL_PLUGIN_MODE_HORIZONTAL) ?
+ GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL;
- xfce_hvbox_set_orientation( XFCE_HVBOX( base-box ), panel_orientation
);
+ xfce_hvbox_set_orientation( XFCE_HVBOX( base-box ),
xfce_panel_plugin_get_orientation (plugin));
#else
static void orientation_cb( XfcePanelPlugin * plugin, GtkOrientation
orientation, CPUGraph *base )
{
xfce_hvbox_set_orientation( XFCE_HVBOX( base-box ), orientation );
#endif
if( base-has_bars )
- set_bars_orientation( base, panel_orientation );
+ set_bars_orientation( base, orientation );
size_cb( plugin, xfce_panel_plugin_get_size( base-plugin ), base);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-time-out-plugin:master Ditch _xfce_create_framebox() and use xfce_gtk_frame_box_new() instead
Updating branch refs/heads/master
to 8d85aff5c22fff30f7b10cb09cb1ff4bbff3a0ee (commit)
from f8d8c71f00cbe891b67116d4fa7178e8ebd31645 (commit)
commit 8d85aff5c22fff30f7b10cb09cb1ff4bbff3a0ee
Author: Landry Breuil lan...@xfce.org
Date: Sun Dec 30 17:31:17 2012 +0100
Ditch _xfce_create_framebox() and use xfce_gtk_frame_box_new() instead
panel-plugin/time-out.c | 36 +++-
1 files changed, 3 insertions(+), 33 deletions(-)
diff --git a/panel-plugin/time-out.c b/panel-plugin/time-out.c
index 2544f01..5c3cf5d 100644
--- a/panel-plugin/time-out.c
+++ b/panel-plugin/time-out.c
@@ -431,36 +431,6 @@ time_out_about (XfcePanelPlugin *plugin)
NULL);
}
-GtkWidget *
-_xfce_create_framebox(const gchar *title, GtkWidget **frame_bin)
-{
- GtkWidget *framebox;
-
- g_return_val_if_fail(frame_bin, NULL);
-
- framebox = gtk_frame_new(NULL);
- gtk_frame_set_shadow_type(GTK_FRAME(framebox), GTK_SHADOW_NONE);
- gtk_frame_set_label_align(GTK_FRAME(framebox), 0.0, 1.0);
- gtk_widget_show(framebox);
-
- if(title) {
-gchar *tmp = g_strdup_printf(b%s/b, title);
-GtkWidget *label = gtk_label_new(tmp);
-gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
-gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-gtk_widget_show(label);
-gtk_frame_set_label_widget(GTK_FRAME(framebox), label);
-g_free(tmp);
- }
-
- *frame_bin = gtk_alignment_new(0.0, 0.0, 1.0, 1.0);
- gtk_alignment_set_padding(GTK_ALIGNMENT(*frame_bin), 5, 5, 21, 5);
- gtk_widget_show(*frame_bin);
- gtk_container_add(GTK_CONTAINER(framebox), *frame_bin);
-
- return framebox;
-}
-
static void
time_out_configure (XfcePanelPlugin *plugin,
TimeOutPlugin *time_out)
@@ -504,7 +474,7 @@ time_out_configure (XfcePanelPlugin *plugin,
gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);
/* Create time settings section */
- framebox = _xfce_create_framebox (_(Time settings), timebin);
+ framebox = xfce_gtk_frame_box_new (_(Time settings), timebin);
gtk_container_set_border_width (GTK_CONTAINER (framebox), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)-vbox), framebox, TRUE,
TRUE, 0);
gtk_widget_show (framebox);
@@ -588,7 +558,7 @@ time_out_configure (XfcePanelPlugin *plugin,
gtk_widget_show (spin);
/* Create behaviour section */
- framebox = _xfce_create_framebox (_(Behaviour), behaviourbin);
+ framebox = xfce_gtk_frame_box_new (_(Behaviour), behaviourbin);
gtk_container_set_border_width (GTK_CONTAINER (framebox), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)-vbox), framebox, TRUE,
TRUE, 0);
gtk_widget_show (framebox);
@@ -613,7 +583,7 @@ time_out_configure (XfcePanelPlugin *plugin,
gtk_widget_show (checkbutton);
/* Create appearance section */
- framebox = _xfce_create_framebox (_(Appearance), appearancebin);
+ framebox = xfce_gtk_frame_box_new (_(Appearance), appearancebin);
gtk_container_set_border_width (GTK_CONTAINER (framebox), 6);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)-vbox), framebox, TRUE,
TRUE, 0);
gtk_widget_show (framebox);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-smartbookmark-plugin:master Bring up-to-date with 2012 xfce standards.
Updating branch refs/heads/master
to 1592b6de9aea22296e32ff9c2d5a56910e69a865 (commit)
from c983114f440474090940b02ad37c758de206591a (commit)
commit 1592b6de9aea22296e32ff9c2d5a56910e69a865
Author: Landry Breuil lan...@xfce.org
Date: Sun Dec 30 17:59:40 2012 +0100
Bring up-to-date with 2012 xfce standards.
- port to libxfce4ui
- build as a module
- dont force -O0
- use 'exo-open --launch WebBrowser' g_spawn_command_line_async() instead
of 'xfbrowser4' exec_command()
- use system-search icon for desktop file/dialog icon
configure.ac.in| 11 ---
src/Makefile.am| 31 +++
src/smartbookmark.c| 24 ++-
...mark.desktop.in.in = smartbookmark.desktop.in} |4 +-
4 files changed, 29 insertions(+), 41 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index 6bfddf2..0db20e8 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -16,17 +16,18 @@ AM_MAINTAINER_MODE()
dnl check for basic programs
AC_PROG_CC()
AC_PROG_INSTALL()
-AC_PROG_LIBTOOL()
AC_PROG_INTLTOOL()
+dnl Initialize libtool
+LT_PREREQ([2.2.6])
+LT_INIT([disable-static])
+
dnl Check for i18n support
XDT_I18N([@LINGUAS@])
dnl Check for required packages
-XDT_CHECK_LIBX11_REQUIRE()
-XDT_CHECK_PACKAGE([GDK], [gdk-2.0], [2.0])
-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.2])
-XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.8.0])
XDT_FEATURE_DEBUG()
diff --git a/src/Makefile.am b/src/Makefile.am
index 406421e..47eb803 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,42 +1,35 @@
-plugindir = $(libdir)/xfce4/panel-plugins
+plugindir = $(libdir)/xfce4/panel/plugins
plugin_LTLIBRARIES = \
libsmartbookmark.la
libsmartbookmark_la_LDFLAGS =
\
- -O0 \
-avoid-version \
-module \
+ -no-undefined \
+ -export-symbols-regex '^xfce_panel_module_(preinit|init|construct)' \
+ $(PLATFORM_LDFLAGS)
+
+libsmartbookmark_la_LIBADD = \
@LIBXFCE4PANEL_LIBS@ \
- @LIBXFCEGUI4_LIBS@ \
- @GDK_LIBS@
+ @LIBXFCE4UI_LIBS@
libsmartbookmark_la_SOURCES =
\
smartbookmark.c
libsmartbookmark_la_CFLAGS =\
- -O0 \
-I$(top_srcdir) \
- @LIBXFCEGUI4_CFLAGS@ \
+ @LIBXFCE4UI_CFLAGS@ \
@LIBXFCE4PANEL_CFLAGS@ \
- @GDK_CFLAGS@\
-DPACKAGE_LOCALE_DIR=\$(localedir)\
-desktop_in_in_files = smartbookmark.desktop.in.in
-desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
+desktop_in_files = smartbookmark.desktop.in
-desktopdir = $(datadir)/xfce4/panel-plugins
+desktopdir = $(datadir)/xfce4/panel/plugins
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
-EXTRA_DIST = \
- $(desktop_in_in_files)
-
-DISTCLEANFILES = \
- $(desktop_DATA) $(desktop_in_files)
+EXTRA_DIST = $(desktop_in_files)
-# get full path into .desktop file
-%.desktop.in: %.desktop.in.in
- sed -e s^@INTERNAL_PLUGIN_PATH@^$(libdir)/xfce4/panel-plugins^ \
- $ $@
+DISTCLEANFILES = $(desktop_DATA)
diff --git a/src/smartbookmark.c b/src/smartbookmark.c
index 17db33e..ca284b1 100644
--- a/src/smartbookmark.c
+++ b/src/smartbookmark.c
@@ -40,7 +40,7 @@
#include gdk/gdkx.h
#include libxfce4util/libxfce4util.h
-#include libxfcegui4/dialogs.h
+#include libxfce4ui/libxfce4ui.h
#include libxfce4panel/xfce-panel-plugin.h
/*
@@ -71,19 +71,18 @@ typedef struct {
static void
smartbookmark_construct(XfcePanelPlugin *plugin);
-XFCE_PANEL_PLUGIN_REGISTER_INTERNAL(smartbookmark_construct);
+XFCE_PANEL_PLUGIN_REGISTER(smartbookmark_construct);
static gboolean do_search(const char *url, const char *keyword)
{
DBG (Do search);
gchar *execute;
gboolean success;
-execute = g_strconcat(xfbrowser4 \, url, NULL);//works better for me
-//execute = g_strconcat(x-www-browser \, url, NULL);
+execute = g_strconcat(exo-open --launch WebBrowser \, url, NULL);
execute = g_strconcat(execute, keyword, NULL);
execute = g_strconcat(execute, \, NULL);
-success = exec_command(execute);
+success = g_spawn_command_line_async(execute, NULL);
g_free(execute);
return success;
@@ -285,21 +284,16 @@ static void search_create_options(XfcePanelPlugin
*plugin, t_search *search)
xfce_panel_plugin_block_menu(plugin);
GtkWidget *urllabel, *textlabel, *sizelabel;
DBG (search_create_options
[Xfce4-commits] xfce4-smartbookmark-plugin:master Allow numpad enter to trigger the search too (bug #9663)
Updating branch refs/heads/master
to fd0efa33db5a940f905eaa56597293e21de6ce08 (commit)
from 1592b6de9aea22296e32ff9c2d5a56910e69a865 (commit)
commit fd0efa33db5a940f905eaa56597293e21de6ce08
Author: Landry Breuil lan...@xfce.org
Date: Sun Dec 30 18:14:28 2012 +0100
Allow numpad enter to trigger the search too (bug #9663)
While here add a comment explaining why we dont use GDK_KEY_* defines..
src/smartbookmark.c |2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/smartbookmark.c b/src/smartbookmark.c
index ca284b1..fee3d19 100644
--- a/src/smartbookmark.c
+++ b/src/smartbookmark.c
@@ -146,7 +146,9 @@ static gboolean entry_keypress_cb(GtkWidget *entry,
GdkEventKey *event, t_search
const gchar *key = NULL; /* keyword */
switch (event-keyval) {
+/* XXX use GDK_KEY_xx from gdkkeyssyms.h when we depend on gtk+ 2.22 */
case GDK_Return:
+case GDK_KP_Enter:
key = gtk_entry_get_text(GTK_ENTRY(entry));
if (do_search(search-url, key)) {
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-smartbookmark-plugin:master Save config after destroying the dialog (bug #9523)
Updating branch refs/heads/master to 14dab798f15a2738bbce271590d93176ddf32e88 (commit) from fd0efa33db5a940f905eaa56597293e21de6ce08 (commit) commit 14dab798f15a2738bbce271590d93176ddf32e88 Author: Evangelos Foutras evange...@foutrelis.com Date: Sun Dec 30 18:25:28 2012 +0100 Save config after destroying the dialog (bug #9523) Previously the config was only saved upon 'save' signal. src/smartbookmark.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/smartbookmark.c b/src/smartbookmark.c index fee3d19..b78d014 100644 --- a/src/smartbookmark.c +++ b/src/smartbookmark.c @@ -361,6 +361,7 @@ static void search_create_options(XfcePanelPlugin *plugin, t_search *search) search_apply_options_cb(search); gtk_widget_destroy(search-opt_dialog); xfce_panel_plugin_unblock_menu(plugin); +search_write_config(plugin, search); } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-verve-plugin:master Port to libxfce4ui.
Updating branch refs/heads/master to ba3167019ae25cb340c36b676f038ec73bb47d98 (commit) from 592853aeed8df90e06f37d98e68c6110dc8ae232 (commit) commit ba3167019ae25cb340c36b676f038ec73bb47d98 Author: Landry Breuil lan...@xfce.org Date: Sun Dec 30 18:30:34 2012 +0100 Port to libxfce4ui. While here only call g_thread_init() on glib 2.32. configure.ac.in | 16 +++- panel-plugin/Makefile.am|6 ++ panel-plugin/verve-plugin.c |8 +--- scripts/Makefile.am |2 -- 4 files changed, 14 insertions(+), 18 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 758fad6..9f9f49b 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -35,8 +35,8 @@ AC_PROG_INTLTOOL() dnl ** dnl *** Initialize libtool *** dnl ** -AC_DISABLE_STATIC() -AC_PROG_LIBTOOL() +LT_PREREQ([2.2.6]) +LT_INIT([disable-static]) dnl ** dnl *** Check for standard headers *** @@ -51,12 +51,10 @@ XDT_I18N([@LINGUAS@]) dnl *** dnl *** Check for required packages *** dnl *** -XDT_CHECK_PACKAGE([LIBEXO], [exo-0.3], [0.3.1.3], [], - [XDT_CHECK_PACKAGE([LIBEXO], [exo-1], [0.5.0])]) -XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.4.0]) -XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0]) -XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0]) -XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.6.4]) +XDT_CHECK_PACKAGE([LIBEXO], [exo-1], [0.5.0]) +XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.8.0]) +XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.8.0]) +XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0]) XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.4]) XDT_CHECK_PACKAGE([LIBPCRE], [libpcre], [5.0]) @@ -77,7 +75,7 @@ fi dnl *** dnl *** Check for debugging support *** dnl *** -BM_DEBUG_SUPPORT() +XDT_FEATURE_DEBUG() AC_OUTPUT([ Makefile diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am index 06d68ef..69fb4bd 100644 --- a/panel-plugin/Makefile.am +++ b/panel-plugin/Makefile.am @@ -18,19 +18,17 @@ xfce4_verve_plugin_CFLAGS = \ -DPACKAGE_LOCALE_DIR=\$(localedir)\ \ @LIBEXO_CFLAGS@ \ @LIBXFCE4PANEL_CFLAGS@ \ + @LIBXFCE4UI_CFLAGS@ \ @LIBXFCE4UTIL_CFLAGS@ \ - @LIBXFCEGUI4_CFLAGS@\ @LIBPCRE_CFLAGS@\ - @GLIB_CFLAGS@ \ @GTHREAD_CFLAGS@ xfce4_verve_plugin_LDADD = \ @LIBEXO_LIBS@ \ @LIBXFCE4PANEL_LIBS@\ + @LIBXFCE4UI_LIBS@ \ @LIBXFCE4UTIL_LIBS@ \ - @LIBXFCEGUI4_LIBS@ \ @LIBPCRE_LIBS@ \ - @GLIB_LIBS@ \ @GTHREAD_LIBS@ if HAVE_DBUS diff --git a/panel-plugin/verve-plugin.c b/panel-plugin/verve-plugin.c index ecc9015..1403b2a 100644 --- a/panel-plugin/verve-plugin.c +++ b/panel-plugin/verve-plugin.c @@ -411,7 +411,7 @@ verve_plugin_keypress_cb (GtkWidget *entry, gchar *msg = g_strconcat (_(Could not execute command:), , command, NULL); /* Display error message dialog */ -xfce_err (msg); +xfce_dialog_show_error (NULL, NULL, msg); /* Free message */ g_free (msg); @@ -501,8 +501,10 @@ verve_plugin_new (XfcePanelPlugin *plugin) /* Set application name */ g_set_application_name (Verve); +#if !GLIB_CHECK_VERSION (2, 30, 0) /* Init thread system */ g_thread_init (NULL); +#endif /* Init Verve mini-framework */ verve_init (); @@ -804,7 +806,7 @@ verve_plugin_properties (XfcePanelPlugin *plugin, gtk_container_set_border_width (GTK_CONTAINER (dialog), 2); /* Frame for appearance settings */ - frame = xfce_create_framebox (_(Appearance), bin1); + frame = xfce_gtk_frame_box_new (_(Appearance), bin1); gtk_container_set_border_width (GTK_CONTAINER (frame), 6); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)-vbox), frame, TRUE, TRUE, 0); gtk_widget_show (frame); @@ -835,7 +837,7 @@ verve_plugin_properties (XfcePanelPlugin *plugin, g_signal_connect
[Xfce4-commits] xfce4-verve-plugin:master fix gtk_adjustment warning
Updating branch refs/heads/master to e113585ff14a119094b28b2f0d2757db4b491cc6 (commit) from f7b923d980e3004c634750d6c2fedeb73f10b51e (commit) commit e113585ff14a119094b28b2f0d2757db4b491cc6 Author: Landry Breuil lan...@xfce.org Date: Sun Dec 30 18:51:19 2012 +0100 fix gtk_adjustment warning panel-plugin/verve-plugin.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/panel-plugin/verve-plugin.c b/panel-plugin/verve-plugin.c index f8bd7c4..194b76c 100644 --- a/panel-plugin/verve-plugin.c +++ b/panel-plugin/verve-plugin.c @@ -822,7 +822,7 @@ verve_plugin_properties (XfcePanelPlugin *plugin, gtk_widget_show (size_label); /* Plugin size adjustment */ - adjustment = gtk_adjustment_new (verve-size, 5, 100, 1, 5, 10); + adjustment = gtk_adjustment_new (verve-size, 5, 100, 1, 5, 0); /* Plugin size spin button */ size_spin = gtk_spin_button_new (GTK_ADJUSTMENT (adjustment), 1, 0); @@ -853,7 +853,7 @@ verve_plugin_properties (XfcePanelPlugin *plugin, gtk_widget_show (history_length_label); /* History length adjustment */ - adjustment = gtk_adjustment_new (verve-history_length, 0, 1000, 1, 5, 10); + adjustment = gtk_adjustment_new (verve-history_length, 0, 1000, 1, 5, 0); /* History length spin button */ history_length_spin = gtk_spin_button_new (GTK_ADJUSTMENT (adjustment), 1, 0); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-verve-plugin:master Build the plugin as a module
Updating branch refs/heads/master to f7b923d980e3004c634750d6c2fedeb73f10b51e (commit) from ba3167019ae25cb340c36b676f038ec73bb47d98 (commit) commit f7b923d980e3004c634750d6c2fedeb73f10b51e Author: Landry Breuil lan...@xfce.org Date: Sun Dec 30 18:50:07 2012 +0100 Build the plugin as a module panel-plugin/Makefile.am | 45 +-- panel-plugin/verve-plugin.c|2 +- ...desktop.in.in = xfce4-verve-plugin.desktop.in} |4 +- 3 files changed, 24 insertions(+), 27 deletions(-) diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am index 69fb4bd..5ac7b84 100644 --- a/panel-plugin/Makefile.am +++ b/panel-plugin/Makefile.am @@ -1,9 +1,8 @@ -plugindir = $(libexecdir)/xfce4/panel-plugins +plugindir = $(libexecdir)/xfce4/panel/plugins -plugin_PROGRAMS = \ - xfce4-verve-plugin +plugin_LTLIBRARIES = libverve.la -xfce4_verve_plugin_SOURCES = \ +libverve_la_SOURCES = \ verve-plugin.c \ verve.c \ verve-history.c \ @@ -12,7 +11,7 @@ xfce4_verve_plugin_SOURCES = \ verve-history.h \ verve-env.h -xfce4_verve_plugin_CFLAGS =\ +libverve_la_CFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ -DPACKAGE_LOCALE_DIR=\$(localedir)\ \ @@ -23,7 +22,7 @@ xfce4_verve_plugin_CFLAGS = \ @LIBPCRE_CFLAGS@\ @GTHREAD_CFLAGS@ -xfce4_verve_plugin_LDADD = \ +libverve_la_LIBADD = \ @LIBEXO_LIBS@ \ @LIBXFCE4PANEL_LIBS@\ @LIBXFCE4UI_LIBS@ \ @@ -31,17 +30,24 @@ xfce4_verve_plugin_LDADD = \ @LIBPCRE_LIBS@ \ @GTHREAD_LIBS@ +libverve_la_LDFLAGS = \ + -avoid-version \ + -module \ + -no-undefined \ + -export-symbols-regex '^xfce_panel_module_(preinit|init|construct)' \ + $(PLATFORM_LDFLAGS) + if HAVE_DBUS -xfce4_verve_plugin_SOURCES += \ +libverve_la_SOURCES += \ verve-dbus-service-infos.h \ verve-dbus-service.h\ verve-dbus-service.c -xfce4_verve_plugin_CFLAGS += \ +libverve_la_CFLAGS += \ -DDBUS_API_SUBJECT_TO_CHANGE\ $(DBUS_CFLAGS) -xfce4_verve_plugin_LDADD +=\ +libverve_la_LIBADD += \ $(DBUS_LIBS) verve-dbus-service-infos.h: Makefile $(srcdir)/verve-dbus-service-infos.xml @@ -53,32 +59,23 @@ endif # .desktop file # -# Some automake trickery here. Because we cannot use $(libexecdir) in the -# automake stage, we'll use sed to get the full path into the .desktop file. -# We also need to let intltool merge the translated fields, so we add an -# additional level of indirection: a name.desktop.in.in file. +# We need to let intltool merge the translated fields, so we add a +# level of indirection: a name.desktop.in file. # -desktop_in_in_files = xfce4-verve-plugin.desktop.in.in -desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in) -desktopdir = $(datadir)/xfce4/panel-plugins +desktop_in_files = xfce4-verve-plugin.desktop.in +desktopdir = $(datadir)/xfce4/panel/plugins desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ EXTRA_DIST = \ - $(desktop_in_in_files) \ + $(desktop_in_files) \ verve-dbus-service-infos.xml -DISTCLEANFILES = \ - $(desktop_DATA) $(desktop_in_files
[Xfce4-commits] xfce4-smartbookmark-plugin:master fix POTFILES.in
Updating branch refs/heads/master to 860c500cf991c0d64f1538abf39c7579bad4a9ed (commit) from 14dab798f15a2738bbce271590d93176ddf32e88 (commit) commit 860c500cf991c0d64f1538abf39c7579bad4a9ed Author: Landry Breuil lan...@xfce.org Date: Sun Dec 30 19:13:09 2012 +0100 fix POTFILES.in po/POTFILES.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 092d988..7cf1def 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,3 +1,3 @@ src/smartbookmark.c -src/smartbookmark.desktop.in.in +src/smartbookmark.desktop.in ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-verve-plugin:master fix POTFILES.in
Updating branch refs/heads/master to 3d0844ad0833df6d8f06286e0072e6da2c47 (commit) from e113585ff14a119094b28b2f0d2757db4b491cc6 (commit) commit 3d0844ad0833df6d8f06286e0072e6da2c47 Author: Landry Breuil lan...@xfce.org Date: Sun Dec 30 19:13:33 2012 +0100 fix POTFILES.in po/POTFILES.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 5b7f36f..edcbe0c 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -5,5 +5,5 @@ panel-plugin/verve-env.c panel-plugin/verve-history.h panel-plugin/verve-history.c panel-plugin/verve-plugin.c -panel-plugin/xfce4-verve-plugin.desktop.in.in +panel-plugin/xfce4-verve-plugin.desktop.in scripts/verve-focus.c ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-smartbookmark-plugin:master Fix broken argument handling (bug #8642)
Updating branch refs/heads/master
to d077cd1dfa46cb6d736bedf172f33d51e1fed334 (commit)
from 860c500cf991c0d64f1538abf39c7579bad4a9ed (commit)
commit d077cd1dfa46cb6d736bedf172f33d51e1fed334
Author: Landry Breuil lan...@xfce.org
Date: Thu Jan 3 22:22:27 2013 +0100
Fix broken argument handling (bug #8642)
Use g_spawn_async() instead of building a commandline and passing it
to g_spawn_command_line_async() which will in turn use
g_shell_parse_argv()..
Fix some corner cases with some special chars interpreted by the shell.
Mostly from Guido Berhoerster, thanks!
src/smartbookmark.c | 19 +--
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/smartbookmark.c b/src/smartbookmark.c
index b78d014..6f358d3 100644
--- a/src/smartbookmark.c
+++ b/src/smartbookmark.c
@@ -76,14 +76,21 @@ XFCE_PANEL_PLUGIN_REGISTER(smartbookmark_construct);
static gboolean do_search(const char *url, const char *keyword)
{
DBG (Do search);
-gchar *execute;
+gchar *argv[] = { exo-open, --launch, WebBrowser, NULL, NULL };
+GError *error = NULL;
+gchar *complete_url;
gboolean success;
-execute = g_strconcat(exo-open --launch WebBrowser \, url, NULL);
-execute = g_strconcat(execute, keyword, NULL);
-execute = g_strconcat(execute, \, NULL);
+complete_url = g_strconcat(url, keyword, NULL);
+argv[3] = complete_url;
-success = g_spawn_command_line_async(execute, NULL);
-g_free(execute);
+success = g_spawn_async(NULL, (gchar **)argv, NULL,
+G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, NULL,
error);
+
+if (!success) {
+xfce_dialog_show_error(NULL, error, _(Failed to send %s to your
preferred browser), complete_url);
+g_error_free(error);
+}
+g_free(complete_url);
return success;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-smartbookmark-plugin:master updates for 0.4.5 release
Updating branch refs/heads/master to 700a8552263982b6358cca808d9236805dbd01e4 (commit) from 8f13e2b967814f7d41caf39c35d3d29eff9f9134 (commit) commit 700a8552263982b6358cca808d9236805dbd01e4 Author: Landry Breuil lan...@xfce.org Date: Sun Jan 20 21:34:23 2013 +0100 updates for 0.4.5 release NEWS|8 configure.ac.in |2 +- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/NEWS b/NEWS index 13a929e..75dc2b7 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,11 @@ +0.4.5 : 2013/01/20 += +- Port to libxfce4ui +- Build the plugin as a module +- Fix broken argument handling (bug #8642) +- Save config after destroying the dialog (bug #9523) +- Allow numpad enter to trigger the search too (bug #9663) + 0.4.4 = - Fix compatibility with Xfce 4.7+, fixing bug #6939 and #6940 diff --git a/configure.ac.in b/configure.ac.in index 0db20e8..49f206e 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -1,7 +1,7 @@ dnl Version information m4_define([smartbookmark_version_major], [0]) m4_define([smartbookmark_version_minor], [4]) -m4_define([smartbookmark_version_micro], [4]) +m4_define([smartbookmark_version_micro], [5]) m4_define([smartbookmark_version], [smartbookmark_version_major.smartbookmark_version_minor.smartbookmark_version_micro]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-smartbookmark-plugin|0.4.5 Creating annotated tag 0.4.5
Updating annotated tag refs/tags/0.4.5 as new annotated tag to 05f2eff71e518e6f55c53f6c113b68dad63b489f (tag) succeeds 0.4.4-31-g8f13e2b tagged by Landry Breuil lan...@xfce.org on 2013-01-20 21:45 +0100 Landry Breuil (1): updates for 0.4.5 release ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-verve-plugin:master Fix style when the entry loses focus (bug #3525)
Updating branch refs/heads/master
to 271221054d21aab631dc7a37c2fa49f2dc19cf19 (commit)
from 3d0844ad0833df6d8f06286e0072e6da2c47 (commit)
commit 271221054d21aab631dc7a37c2fa49f2dc19cf19
Author: Landry Breuil lan...@xfce.org
Date: Sun Jan 20 21:59:13 2013 +0100
Fix style when the entry loses focus (bug #3525)
panel-plugin/verve-plugin.c | 22 +-
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/panel-plugin/verve-plugin.c b/panel-plugin/verve-plugin.c
index 194b76c..e61e043 100644
--- a/panel-plugin/verve-plugin.c
+++ b/panel-plugin/verve-plugin.c
@@ -120,7 +120,6 @@ verve_plugin_load_completion (VerveEnv* env, gpointer
user_data)
static gboolean
verve_plugin_focus_timeout (VervePlugin *verve)
{
- GtkStyle *default_style;
GtkStyle *style;
g_return_val_if_fail (verve != NULL, FALSE);
@@ -129,16 +128,13 @@ verve_plugin_focus_timeout (VervePlugin *verve)
/* Determine current entry style */
style = gtk_widget_get_style (verve-input);
- /* Get default style for widgets */
- default_style = gtk_widget_get_default_style ();
-
/* Check whether the entry already is highlighted */
if (gdk_color_equal (style-base[GTK_STATE_NORMAL],
style-base[GTK_STATE_SELECTED]))
{
/* Make it look normal again */
- gtk_widget_modify_base (verve-input, GTK_STATE_NORMAL,
default_style-base[GTK_STATE_NORMAL]);
- gtk_widget_modify_bg (verve-input, GTK_STATE_NORMAL,
default_style-bg[GTK_STATE_NORMAL]);
- gtk_widget_modify_text (verve-input, GTK_STATE_NORMAL,
default_style-text[GTK_STATE_NORMAL]);
+ gtk_widget_modify_base (verve-input, GTK_STATE_NORMAL,
style-base[GTK_STATE_NORMAL]);
+ gtk_widget_modify_bg (verve-input, GTK_STATE_NORMAL,
style-bg[GTK_STATE_NORMAL]);
+ gtk_widget_modify_text (verve-input, GTK_STATE_NORMAL,
style-text[GTK_STATE_NORMAL]);
}
else
{
@@ -156,7 +152,7 @@ verve_plugin_focus_timeout (VervePlugin *verve)
static void
verve_plugin_focus_timeout_reset (VervePlugin *verve)
{
- GtkStyle *default_style;
+ GtkStyle *style;
g_return_if_fail (verve != NULL);
g_return_if_fail (verve-input != NULL || GTK_IS_ENTRY (verve-input));
@@ -168,13 +164,13 @@ verve_plugin_focus_timeout_reset (VervePlugin *verve)
verve-focus_timeout = 0;
}
- /* Get default style */
- default_style = gtk_widget_get_default_style ();
+ /* Determine current entry style */
+ style = gtk_widget_get_style (verve-input);
/* Reset entry background */
- gtk_widget_modify_base (verve-input, GTK_STATE_NORMAL,
default_style-base[GTK_STATE_NORMAL]);
- gtk_widget_modify_bg (verve-input, GTK_STATE_NORMAL,
default_style-bg[GTK_STATE_NORMAL]);
- gtk_widget_modify_text (verve-input, GTK_STATE_NORMAL,
default_style-text[GTK_STATE_NORMAL]);
+ gtk_widget_modify_base (verve-input, GTK_STATE_NORMAL,
style-base[GTK_STATE_NORMAL]);
+ gtk_widget_modify_bg (verve-input, GTK_STATE_NORMAL,
style-bg[GTK_STATE_NORMAL]);
+ gtk_widget_modify_text (verve-input, GTK_STATE_NORMAL,
style-text[GTK_STATE_NORMAL]);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-smartbookmark-plugin:master Make sure childs are reaped, instead of leaving zombies behind (bug #9791)
Updating branch refs/heads/master
to a56503f4aba4525c5951d14bb1b4251e8df06f57 (commit)
from 700a8552263982b6358cca808d9236805dbd01e4 (commit)
commit a56503f4aba4525c5951d14bb1b4251e8df06f57
Author: Landry Breuil lan...@xfce.org
Date: Thu Jan 24 10:17:58 2013 +0100
Make sure childs are reaped, instead of leaving zombies behind (bug #9791)
src/smartbookmark.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/smartbookmark.c b/src/smartbookmark.c
index 6f358d3..176bb05 100644
--- a/src/smartbookmark.c
+++ b/src/smartbookmark.c
@@ -84,7 +84,7 @@ static gboolean do_search(const char *url, const char
*keyword)
argv[3] = complete_url;
success = g_spawn_async(NULL, (gchar **)argv, NULL,
-G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, NULL,
error);
+G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, error);
if (!success) {
xfce_dialog_show_error(NULL, error, _(Failed to send %s to your
preferred browser), complete_url);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-smartbookmark-plugin:master Merge branch 'master' of git://git.xfce.org/panel-plugins/xfce4-smartbookmark-plugin
Updating branch refs/heads/master to 4fc14cde30b4504a44d7fb0e2de4ff988da8c847 (commit) from a56503f4aba4525c5951d14bb1b4251e8df06f57 (commit) commit 4fc14cde30b4504a44d7fb0e2de4ff988da8c847 Merge: a56503f 9c47bb1 Author: Landry Breuil lan...@xfce.org Date: Thu Jan 24 10:18:38 2013 +0100 Merge branch 'master' of git://git.xfce.org/panel-plugins/xfce4-smartbookmark-plugin commit 9c47bb114df692995078b9c7e85a9725849a6d08 Author: Seong-ho Cho darkcircle.0...@gmail.com Date: Wed Jan 23 19:19:48 2013 +0100 l10n: Updated Korean (ko) translation to 100% New status: 9 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ko.po | 22 +++--- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/po/ko.po b/po/ko.po index 9a62e62..a8b2f57 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,17 +1,16 @@ # Korean translation for xfce4-smartbookmark-plugin package. # Copyright (C) 2006-2012 Emanuele Rocca et al. # This file is distributed under the same license as the xfce4-smartbookmark-plugin package. -# Seong-ho, Cho darkcircle.0...@gmail.com, 2012. +# Seong-ho Cho darkcircle.0...@gmail.com, 2012, 2013. # msgid msgstr Project-Id-Version: xfce4-smartbookmark-plugin.master\n -Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2013-01-03 22:26+0100\n -PO-Revision-Date: 2012-02-26 14:37+0900\n -Last-Translator: Seong-ho, Cho darkcircle.0...@gmail.com\n -Language-Team: xfce4-users-kr-i18n xfce4-users-kr-i18n@lists.sourceforge. -net\n +Report-Msgid-Bugs-To: https://bugzilla.xfce.org/enter_bug.cgi?product=xfce4-smartbookmark-plugin\n; +POT-Creation-Date: 2013-01-23 13:48+\n +PO-Revision-Date: 2013-01-24 03:18+0900\n +Last-Translator: Seong-ho Cho darkcircle.0...@gmail.com\n +Language-Team: xfce4-users-kr-i18n xfce4-users-kr-i...@lists.sourceforge.net\n Language: ko\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n @@ -24,7 +23,7 @@ msgstr #: ../src/smartbookmark.c:90 #, c-format msgid Failed to send %s to your preferred browser -msgstr +msgstr %s을(를) 기본 브라우저로 보내는데 실패했습니다 #: ../src/smartbookmark.c:296 msgid Smartbookmark @@ -55,9 +54,10 @@ msgid URL: msgstr URL: #: ../src/smartbookmark.desktop.in.h:1 +msgid Query websites from the Xfce panel +msgstr Xfce 패널에서 웹사이트 요청하기 + +#: ../src/smartbookmark.desktop.in.h:2 msgid SmartBookmark msgstr 똑똑한 북마크 -#: ../src/smartbookmark.desktop.in.h:2 -msgid Query websites from the Xfce panel -msgstr Xfce 패널에서 웹사이트 요청하기 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-datetime-plugin:master Port to libxfce4ui. (bug #8064)
Updating branch refs/heads/master to 61eba531ec7daa0e38b3d9b89c1c34a4cbac976f (commit) from 7d11392ef6d626519e5c6ef317b681df61637ca6 (commit) commit 61eba531ec7daa0e38b3d9b89c1c34a4cbac976f Author: Landry Breuil lan...@xfce.org Date: Wed Feb 13 22:30:03 2013 +0100 Port to libxfce4ui. (bug #8064) Joachim Wiedorn sent a very similar patch, thanks too! INSTALL| 53 +++ configure.ac.in| 29 ++--- panel-plugin/Makefile.am |4 +- panel-plugin/datetime-dialog.c |8 +++--- panel-plugin/datetime.c|2 +- 5 files changed, 47 insertions(+), 49 deletions(-) diff --git a/INSTALL b/INSTALL index d3c5b40..23e5f25 100644 --- a/INSTALL +++ b/INSTALL @@ -1,8 +1,8 @@ Installation Instructions * -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007 Free Software Foundation, Inc. +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free +Software Foundation, Inc. This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. @@ -10,10 +10,7 @@ unlimited permission to copy, distribute and modify it. Basic Installation == -Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following -more-detailed instructions are generic; see the `README' file for -instructions specific to this package. +These are generic installation instructions. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -26,9 +23,9 @@ debugging `configure'). It can also use an optional file (typically called `config.cache' and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. Caching is +the results of its tests to speed up reconfiguring. (Caching is disabled by default to prevent problems with accidental use of stale -cache files. +cache files.) If you need to do unusual things to compile the package, please try to figure out how `configure' could check whether to do them, and mail @@ -38,17 +35,20 @@ some point `config.cache' contains results you don't want to keep, you may remove or edit it. The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You need `configure.ac' if -you want to change it or regenerate `configure' using a newer version -of `autoconf'. +`configure' by a program called `autoconf'. You only need +`configure.ac' if you want to change it or regenerate `configure' using +a newer version of `autoconf'. The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. + `./configure' to configure the package for your system. If you're + using `csh' on an old version of System V, you might need to type + `sh ./configure' instead to prevent `csh' from trying to execute + `configure' itself. - Running `configure' might take a while. While running, it prints - some messages telling which features it is checking for. + Running `configure' takes awhile. While running, it prints some + messages telling which features it is checking for. 2. Type `make' to compile the package. @@ -67,9 +67,6 @@ The simplest way to compile this package is: all sorts of other programs in order to regenerate files that came with the distribution. - 6. Often, you can also type `make uninstall' to remove the installed - files again. - Compilers and Options = @@ -81,7 +78,7 @@ details on some of the pertinent environment variables. by setting variables in the command line or in the environment. Here is an example: - ./configure CC=c99 CFLAGS=-g LIBS=-lposix + ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix *Note Defining Variables::, for more details. @@ -90,15 +87,17 @@ Compiling For Multiple Architectures You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their -own directory. To do this, you can use GNU `make'. `cd' to the +own directory. To do this, you must use a version of `make' that +supports the `VPATH' variable, such as GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the source code in the directory that `configure' is in and in `..'. - With a non-GNU `make', it is safer to compile the package for one -architecture at a time in the source code directory. After you have -installed the package for one architecture, use `make distclean
[Xfce4-commits] xfce4-datetime-plugin:master remove useless pot file
Updating branch refs/heads/master to 25c3c81a01a899577702b9cabdb60a3b7da7483a (commit) from 61eba531ec7daa0e38b3d9b89c1c34a4cbac976f (commit) commit 25c3c81a01a899577702b9cabdb60a3b7da7483a Author: Landry Breuil lan...@xfce.org Date: Wed Feb 13 22:33:07 2013 +0100 remove useless pot file po/xfce4-datetime-plugin.pot | 108 -- 1 files changed, 0 insertions(+), 108 deletions(-) diff --git a/po/xfce4-datetime-plugin.pot b/po/xfce4-datetime-plugin.pot deleted file mode 100644 index 72a099b..000 --- a/po/xfce4-datetime-plugin.pot +++ /dev/null @@ -1,108 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR EMAIL@ADDRESS, YEAR. -# -#, fuzzy -msgid -msgstr -Project-Id-Version: PACKAGE VERSION\n -Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2009-07-31 13:39-0500\n -PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n -Last-Translator: FULL NAME EMAIL@ADDRESS\n -Language-Team: LANGUAGE l...@li.org\n -MIME-Version: 1.0\n -Content-Type: text/plain; charset=CHARSET\n -Content-Transfer-Encoding: 8bit\n - -#: ../panel-plugin/datetime.c:82 -msgid Invalid format -msgstr - -#: ../panel-plugin/datetime.c:87 -msgid Error -msgstr - -#: ../panel-plugin/datetime-dialog.c:42 -msgid Date, then time -msgstr - -#: ../panel-plugin/datetime-dialog.c:43 -msgid Time, then date -msgstr - -#: ../panel-plugin/datetime-dialog.c:44 -msgid Date only -msgstr - -#: ../panel-plugin/datetime-dialog.c:45 -msgid Time only -msgstr - -#. placeholder -#: ../panel-plugin/datetime-dialog.c:85 ../panel-plugin/datetime-dialog.c:96 -msgid Custom... -msgstr - -#: ../panel-plugin/datetime-dialog.c:131 -msgid Select font -msgstr - -#: ../panel-plugin/datetime-dialog.c:332 -#, c-format -msgid Unable to open the following url: %s -msgstr - -#: ../panel-plugin/datetime-dialog.c:371 -msgid Datetime -msgstr - -#. -#. * layout frame -#. -#: ../panel-plugin/datetime-dialog.c:391 -msgid Layout -msgstr - -#. Format label -#. format label -#: ../panel-plugin/datetime-dialog.c:405 ../panel-plugin/datetime-dialog.c:467 -#: ../panel-plugin/datetime-dialog.c:570 -msgid Format: -msgstr - -#. -#. * Date frame -#. -#: ../panel-plugin/datetime-dialog.c:425 -msgid Date -msgstr - -#: ../panel-plugin/datetime-dialog.c:437 -msgid The date will appear in a tooltip. -msgstr - -#. font label -#: ../panel-plugin/datetime-dialog.c:450 ../panel-plugin/datetime-dialog.c:553 -msgid Font: -msgstr - -#. -#. * time frame -#. -#: ../panel-plugin/datetime-dialog.c:528 -msgid Time -msgstr - -#: ../panel-plugin/datetime-dialog.c:540 -msgid The time will appear in a tooltip. -msgstr - -#: ../panel-plugin/datetime.desktop.in.in.h:1 -msgid Date and Time plugin with a simple calendar -msgstr - -#: ../panel-plugin/datetime.desktop.in.in.h:2 -msgid DateTime -msgstr ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-datetime-plugin:master Remove Xfce 4.6 compat files, we now depend on 4.8.
Updating branch refs/heads/master
to cd1bb412779e6240eeffecc717528c8053f0fe1d (commit)
from 25c3c81a01a899577702b9cabdb60a3b7da7483a (commit)
commit cd1bb412779e6240eeffecc717528c8053f0fe1d
Author: Landry Breuil lan...@xfce.org
Date: Wed Feb 13 22:35:04 2013 +0100
Remove Xfce 4.6 compat files, we now depend on 4.8.
panel-plugin/Makefile.am |4 +-
panel-plugin/datetime.c |2 -
panel-plugin/xfce46-compat.c | 193 --
panel-plugin/xfce46-compat.h | 20 -
4 files changed, 1 insertions(+), 218 deletions(-)
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 6f0bb00..18bbc7e 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -7,9 +7,7 @@ libdatetime_la_SOURCES =\
datetime.h \
datetime.c \
datetime-dialog.h \
- datetime-dialog.c \
- xfce46-compat.h \
- xfce46-compat.c
+ datetime-dialog.c
libdatetime_la_CFLAGS =\
-I$(top_srcdir) \
diff --git a/panel-plugin/datetime.c b/panel-plugin/datetime.c
index 031166a..0738889 100644
--- a/panel-plugin/datetime.c
+++ b/panel-plugin/datetime.c
@@ -33,8 +33,6 @@
#include libxfce4panel/xfce-panel-plugin.h
#include libxfce4panel/xfce-panel-convenience.h
-#include xfce46-compat.h
-
#include datetime.h
#include datetime-dialog.h
diff --git a/panel-plugin/xfce46-compat.c b/panel-plugin/xfce46-compat.c
deleted file mode 100644
index 97f10b1..000
--- a/panel-plugin/xfce46-compat.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Code was taken from libxfce4panel (LGPL2 or any later version),
- * distributed here under the GPL.
- *
- * Copyright (c) 2005-2007 Jasper Huijsmans jas...@xfce.org
- *
- * This program 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 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 Library General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-# include config.h
-#endif
-
-#ifndef HAVE_LIBXFCE4PANEL_46
-
-#include xfce46-compat.h
-
-#include libxfce4panel/xfce-panel-plugin.h
-#include libxfce4panel/xfce-panel-macros.h
-
-/* support macros for debugging */
-#ifndef NDEBUG
-#define _panel_assert(expr) g_assert (expr)
-#define _panel_assert_not_reached() g_assert_not_reached ()
-#define _panel_return_if_fail(expr) g_return_if_fail (expr)
-#define _panel_return_val_if_fail(expr, val) g_return_val_if_fail (expr, (val))
-#else
-#define _panel_assert(expr) G_STMT_START{ (void)0; }G_STMT_END
-#define _panel_assert_not_reached() G_STMT_START{ (void)0; }G_STMT_END
-#define _panel_return_if_fail(expr) G_STMT_START{ (void)0; }G_STMT_END
-#define _panel_return_val_if_fail(expr, val) G_STMT_START{ (void)0; }G_STMT_END
-#endif
-
-/**
- * xfce_panel_plugin_arrow_type:
- * @plugin: an #XfcePanelPlugin
- *
- * Determine the #GtkArrowType for a widget that opens a menu and uses
- * xfce_panel_plugin_position_menu() to position the menu.
- *
- * Returns: The #GtkArrowType to use.
- **/
-GtkArrowType
-xfce_panel_plugin_arrow_type (XfcePanelPlugin *plugin)
-{
-XfceScreenPosition position;
-GdkScreen *screen;
-GdkRectanglegeom;
-gintmon, x, y;
-
-if (!GTK_WIDGET_REALIZED (plugin))
-return GTK_ARROW_UP;
-
-position = xfce_panel_plugin_get_screen_position (plugin);
-switch (position)
-{
-/* top */
-case XFCE_SCREEN_POSITION_NW_H:
-case XFCE_SCREEN_POSITION_N:
-case XFCE_SCREEN_POSITION_NE_H:
-return GTK_ARROW_DOWN;
-
-/* left */
-case XFCE_SCREEN_POSITION_NW_V:
-case XFCE_SCREEN_POSITION_W:
-case XFCE_SCREEN_POSITION_SW_V:
-return GTK_ARROW_RIGHT;
-
-/* right */
-case XFCE_SCREEN_POSITION_NE_V:
-case XFCE_SCREEN_POSITION_E:
-case XFCE_SCREEN_POSITION_SE_V:
-return GTK_ARROW_LEFT;
-
-/* bottom */
-case XFCE_SCREEN_POSITION_SW_H:
-case XFCE_SCREEN_POSITION_S:
-case XFCE_SCREEN_POSITION_SE_H:
-return GTK_ARROW_UP;
-
-/* floating */
-default:
-/* get the screen
[Xfce4-commits] xfce4-datetime-plugin:master Update to 2013 xfce standards
Updating branch refs/heads/master
to e55a418bd9d8c284774d7b8ac33aff0356a5a4ab (commit)
from cd1bb412779e6240eeffecc717528c8053f0fe1d (commit)
commit e55a418bd9d8c284774d7b8ac33aff0356a5a4ab
Author: Landry Breuil lan...@xfce.org
Date: Wed Feb 13 22:49:21 2013 +0100
Update to 2013 xfce standards
- rename datetime.desktop.in.in
- use newer xfce4/panel/plugins paths for desktop and module file
- register the module as not internal to the panel
- remove now useless cygwin check
configure.ac.in|1 -
panel-plugin/Makefile.am | 27 ++-
panel-plugin/datetime.c|2 +-
...{datetime.desktop.in.in = datetime.desktop.in} |2 +-
po/POTFILES.in |2 +-
5 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index 98b394a..cdb3536 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -17,7 +17,6 @@ AM_MAINTAINER_MODE()
dnl Check for UNIX variants
AC_AIX
AC_ISC_POSIX
-AM_CONDITIONAL([HAVE_CYGWIN], [test `uname | grep \CYGWIN\` != ])
dnl check for basic programs
AC_PROG_CC
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 18bbc7e..c6e44df 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -1,4 +1,4 @@
-plugindir = $(libdir)/xfce4/panel-plugins/
+plugindir = $(libdir)/xfce4/panel/plugins/
plugin_LTLIBRARIES = \
libdatetime.la
@@ -19,12 +19,10 @@ libdatetime_la_CFLAGS = \
libdatetime_la_LDFLAGS = \
-avoid-version \
- -module
-
-if HAVE_CYGWIN
-libdatetime_la_LDFLAGS += \
- -no-undefined
-endif
+ -module \
+ -no-undefined \
+ -export-symbols-regex '^xfce_panel_module_(preinit|init|construct)' \
+ $(PLATFORM_LDFLAGS)
libdatetime_la_LIBADD =\
$(GTK_LIBS) \
@@ -32,19 +30,12 @@ libdatetime_la_LIBADD = \
$(LIBXFCE4UI_LIBS) \
$(LIBXFCE4UTIL_LIBS)
-desktopdir = $(datadir)/xfce4/panel-plugins
-desktop_in_in_files = datetime.desktop.in.in
-desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-%.desktop.in: %.desktop.in.in
- sed -e s,\@libdir\@,$(libdir),g $ $@
+desktopdir = $(datadir)/xfce4/panel/plugins
+desktop_in_files = datetime.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
-EXTRA_DIST = \
- $(desktop_in_in_files)
-
-DISTCLEANFILES = \
- $(desktop_DATA) \
- $(desktop_in_files)
+EXTRA_DIST = $(desktop_in_files)
+CLEANFILES = $(desktop_DATA)
diff --git a/panel-plugin/datetime.c b/panel-plugin/datetime.c
index 0738889..3350c3a 100644
--- a/panel-plugin/datetime.c
+++ b/panel-plugin/datetime.c
@@ -694,5 +694,5 @@ static void datetime_construct(XfcePanelPlugin *plugin)
}
-XFCE_PANEL_PLUGIN_REGISTER_INTERNAL(datetime_construct);
+XFCE_PANEL_PLUGIN_REGISTER(datetime_construct);
diff --git a/panel-plugin/datetime.desktop.in.in
b/panel-plugin/datetime.desktop.in
similarity index 75%
rename from panel-plugin/datetime.desktop.in.in
rename to panel-plugin/datetime.desktop.in
index e3e3c5d..3c3277a 100644
--- a/panel-plugin/datetime.desktop.in.in
+++ b/panel-plugin/datetime.desktop.in
@@ -4,4 +4,4 @@ _Name=DateTime
_Comment=Date and Time plugin with a simple calendar
Icon=xfce-schedule
X-XFCE-Module=datetime
-X-XFCE-Module-Path=@libdir@/xfce4/panel-plugins
+X-XFCE-Internal=FALSE
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ec27071..971c3a3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,3 @@
panel-plugin/datetime.c
panel-plugin/datetime-dialog.c
-panel-plugin/datetime.desktop.in.in
+panel-plugin/datetime.desktop.in
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-datetime-plugin:master Set widgets orientation according to the panel orientation.
Updating branch refs/heads/master
to 34b77702471d93f2d8f19e736d616ea0b01f4664 (commit)
from e55a418bd9d8c284774d7b8ac33aff0356a5a4ab (commit)
commit 34b77702471d93f2d8f19e736d616ea0b01f4664
Author: Harald Judt h.j...@gmx.at
Date: Mon May 21 10:54:00 2012 +0200
Set widgets orientation according to the panel orientation.
This makes the plugin rotate its widgets in vertical mode
and introduces support for panel-4.10 features, like the new
deskbar mode.
Signed-off-by: Landry Breuil lan...@xfce.org
panel-plugin/datetime.c | 82 ++
panel-plugin/datetime.h |2 +-
2 files changed, 68 insertions(+), 16 deletions(-)
diff --git a/panel-plugin/datetime.c b/panel-plugin/datetime.c
index 3350c3a..559020e 100644
--- a/panel-plugin/datetime.c
+++ b/panel-plugin/datetime.c
@@ -38,6 +38,13 @@
#define DATETIME_MAX_STRLEN 256
+/* check for new Xfce 4.10 panel features */
+#ifdef LIBXFCE4PANEL_CHECK_VERSION
+#if LIBXFCE4PANEL_CHECK_VERSION (4,9,0)
+#define HAS_PANEL_49
+#endif
+#endif
+
/**
* Convert a GTimeVal to milliseconds.
* Fractions of a millisecond are truncated.
@@ -440,13 +447,13 @@ void datetime_apply_layout(t_datetime *datetime, t_layout
layout)
switch(datetime-layout)
{
case LAYOUT_TIME_DATE:
- gtk_box_reorder_child(GTK_BOX(datetime-vbox), datetime-time_label, 0);
- gtk_box_reorder_child(GTK_BOX(datetime-vbox), datetime-date_label, 1);
+ gtk_box_reorder_child(GTK_BOX(datetime-box), datetime-time_label, 0);
+ gtk_box_reorder_child(GTK_BOX(datetime-box), datetime-date_label, 1);
break;
default:
- gtk_box_reorder_child(GTK_BOX(datetime-vbox), datetime-time_label, 1);
- gtk_box_reorder_child(GTK_BOX(datetime-vbox), datetime-date_label, 0);
+ gtk_box_reorder_child(GTK_BOX(datetime-box), datetime-time_label, 1);
+ gtk_box_reorder_child(GTK_BOX(datetime-box), datetime-date_label, 0);
}
datetime_set_update_interval(datetime);
@@ -585,18 +592,53 @@ void datetime_write_rc_file(XfcePanelPlugin *plugin,
t_datetime *dt)
}
/*
+ * change widgets orientation when the panel orientation changes
+ */
+#ifdef HAS_PANEL_49
+static void datetime_set_mode(XfcePanelPlugin *plugin, XfcePanelPluginMode
mode, t_datetime *datetime)
+{
+ GtkOrientation panel_orientation = xfce_panel_plugin_get_orientation
(plugin);
+ GtkOrientation orientation = (mode == XFCE_PANEL_PLUGIN_MODE_VERTICAL) ?
+GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL;
+#else
+static void datetime_set_orientation(XfcePanelPlugin *plugin, GtkOrientation
orientation, t_datetime *datetime)
+{
+#endif
+ if (orientation == GTK_ORIENTATION_VERTICAL)
+ {
+xfce_hvbox_set_orientation(XFCE_HVBOX(datetime-box),
GTK_ORIENTATION_HORIZONTAL);
+gtk_label_set_angle(GTK_LABEL(datetime-time_label), -90);
+gtk_label_set_angle(GTK_LABEL(datetime-date_label), -90);
+gtk_box_reorder_child(GTK_BOX(datetime-box), datetime-time_label, 0);
+gtk_box_reorder_child(GTK_BOX(datetime-box), datetime-date_label, 1);
+ }
+ else
+ {
+xfce_hvbox_set_orientation(XFCE_HVBOX(datetime-box),
GTK_ORIENTATION_VERTICAL);
+gtk_label_set_angle(GTK_LABEL(datetime-time_label), 0);
+gtk_label_set_angle(GTK_LABEL(datetime-date_label), 0);
+gtk_box_reorder_child(GTK_BOX(datetime-box), datetime-date_label, 0);
+gtk_box_reorder_child(GTK_BOX(datetime-box), datetime-time_label, 1);
+ }
+}
+
+/*
* create the gtk-part of the datetime plugin
*/
static void datetime_create_widget(t_datetime * datetime)
{
+ GtkOrientation orientation;
+ orientation = xfce_panel_plugin_get_orientation(datetime-plugin);
+
/* create button */
datetime-button = xfce_create_panel_toggle_button();
gtk_widget_show(datetime-button);
- /* create vertical box */
- datetime-vbox = gtk_vbox_new(TRUE, 0);
- gtk_widget_show(datetime-vbox);
- gtk_container_add(GTK_CONTAINER(datetime-button), datetime-vbox);
+ /* create a box which can be easily adapted to the panel orientation */
+ datetime-box = xfce_hvbox_new(GTK_ORIENTATION_VERTICAL, TRUE, 0);
+
+ gtk_widget_show(datetime-box);
+ gtk_container_add(GTK_CONTAINER(datetime-button), datetime-box);
/* create time and date lines */
datetime-time_label = gtk_label_new();
@@ -604,17 +646,22 @@ static void datetime_create_widget(t_datetime * datetime)
gtk_label_set_justify(GTK_LABEL(datetime-time_label), GTK_JUSTIFY_CENTER);
gtk_label_set_justify(GTK_LABEL(datetime-date_label), GTK_JUSTIFY_CENTER);
- /* add time and date lines to the vbox */
- gtk_box_pack_start(GTK_BOX(datetime-vbox),
+ /* add time and date lines to the box */
+ gtk_box_pack_start(GTK_BOX(datetime-box),
datetime-time_label, FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(datetime-vbox),
+ gtk_box_pack_start(GTK_BOX(datetime-box),
datetime-date_label, FALSE, FALSE, 0);
- gtk_box_reorder_child(GTK_BOX(datetime-vbox), datetime-time_label
[Xfce4-commits] xfce4-datetime-plugin:master Remove the #ifdef machinery checking if GtkTooltip is available
Updating branch refs/heads/master
to 1bd3d679d4591dd6689f0f7008e69d5fe8fe177e (commit)
from 34b77702471d93f2d8f19e736d616ea0b01f4664 (commit)
commit 1bd3d679d4591dd6689f0f7008e69d5fe8fe177e
Author: Landry Breuil lan...@xfce.org
Date: Thu Feb 14 21:30:41 2013 +0100
Remove the #ifdef machinery checking if GtkTooltip is available
Gtk 2.15.4 was released 4 years ago and GtkTooltip is here since 2.12...
panel-plugin/datetime-dialog.c | 23 ---
panel-plugin/datetime.c|4
panel-plugin/datetime.h|8
3 files changed, 0 insertions(+), 35 deletions(-)
diff --git a/panel-plugin/datetime-dialog.c b/panel-plugin/datetime-dialog.c
index 4ef3ab8..ede858f 100644
--- a/panel-plugin/datetime-dialog.c
+++ b/panel-plugin/datetime-dialog.c
@@ -170,7 +170,6 @@ datetime_layout_changed(GtkComboBox *cbox, t_datetime *dt)
/* read layout */
layout = gtk_combo_box_get_active(cbox);
-#if USE_GTK_TOOLTIP_API
switch(layout)
{
case LAYOUT_DATE:
@@ -196,24 +195,6 @@ datetime_layout_changed(GtkComboBox *cbox, t_datetime *dt)
gtk_widget_show(dt-time_font_hbox);
gtk_widget_hide(dt-time_tooltip_label);
}
-#else
- switch(layout)
- {
-case LAYOUT_DATE:
- gtk_widget_set_sensitive(dt-date_frame, TRUE);
- gtk_widget_set_sensitive(dt-time_frame, FALSE);
- break;
-
-case LAYOUT_TIME:
- gtk_widget_set_sensitive(dt-date_frame, FALSE);
- gtk_widget_set_sensitive(dt-time_frame, TRUE);
- break;
-
-default:
- gtk_widget_set_sensitive(dt-date_frame, TRUE);
- gtk_widget_set_sensitive(dt-time_frame, TRUE);
- }
-#endif
datetime_apply_layout(dt, layout);
datetime_update(dt);
@@ -431,7 +412,6 @@ datetime_properties_dialog(XfcePanelPlugin *plugin,
t_datetime * datetime)
vbox = gtk_vbox_new(FALSE, 8);
gtk_container_add(GTK_CONTAINER(bin),vbox);
-#if USE_GTK_TOOLTIP_API
/* tooltip label */
str = g_markup_printf_escaped(span style=\italic\%s/span,
_(The date will appear in a tooltip.));
@@ -440,7 +420,6 @@ datetime_properties_dialog(XfcePanelPlugin *plugin,
t_datetime * datetime)
gtk_label_set_use_markup(GTK_LABEL(datetime-date_tooltip_label), TRUE);
gtk_misc_set_alignment(GTK_MISC(datetime-date_tooltip_label), 0.0f, 0.0f);
gtk_box_pack_start(GTK_BOX(vbox), datetime-date_tooltip_label, FALSE,
FALSE, 0);
-#endif
/* hbox */
datetime-date_font_hbox = gtk_hbox_new(FALSE, 2);
@@ -534,7 +513,6 @@ datetime_properties_dialog(XfcePanelPlugin *plugin,
t_datetime * datetime)
vbox = gtk_vbox_new(FALSE, 8);
gtk_container_add(GTK_CONTAINER(bin),vbox);
-#if USE_GTK_TOOLTIP_API
/* tooltip label */
str = g_markup_printf_escaped(span style=\italic\%s/span,
_(The time will appear in a tooltip.));
@@ -543,7 +521,6 @@ datetime_properties_dialog(XfcePanelPlugin *plugin,
t_datetime * datetime)
gtk_label_set_use_markup(GTK_LABEL(datetime-time_tooltip_label), TRUE);
gtk_misc_set_alignment(GTK_MISC(datetime-time_tooltip_label), 0.0f, 0.0f);
gtk_box_pack_start(GTK_BOX(vbox), datetime-time_tooltip_label, FALSE,
FALSE, 0);
-#endif
/* hbox */
datetime-time_font_hbox = gtk_hbox_new(FALSE, 2);
diff --git a/panel-plugin/datetime.c b/panel-plugin/datetime.c
index 559020e..181c273 100644
--- a/panel-plugin/datetime.c
+++ b/panel-plugin/datetime.c
@@ -177,7 +177,6 @@ gboolean datetime_update(t_datetime *datetime)
return TRUE;
}
-#if USE_GTK_TOOLTIP_API
static gboolean datetime_tooltip_timer(t_datetime *datetime)
{
DBG(wake);
@@ -244,7 +243,6 @@ static gboolean datetime_query_tooltip(GtkWidget *widget,
return TRUE;
}
-#endif
static void on_calendar_realized(GtkWidget *widget, t_datetime *datetime)
{
@@ -420,7 +418,6 @@ void datetime_apply_layout(t_datetime *datetime, t_layout
layout)
break;
}
-#if USE_GTK_TOOLTIP_API
/* update tooltip handler */
if (datetime-tooltip_handler_id)
{
@@ -441,7 +438,6 @@ void datetime_apply_layout(t_datetime *datetime, t_layout
layout)
default:
gtk_widget_set_has_tooltip(GTK_WIDGET(datetime-button), FALSE);
}
-#endif
/* set order based on layout-selection */
switch(datetime-layout)
diff --git a/panel-plugin/datetime.h b/panel-plugin/datetime.h
index 73aa4ed..5f09f83 100644
--- a/panel-plugin/datetime.h
+++ b/panel-plugin/datetime.h
@@ -22,8 +22,6 @@
#ifndef DATETIME_H
#define DATETIME_H
-#define USE_GTK_TOOLTIP_API GTK_CHECK_VERSION(2,15,4)
-
/* enums */
enum {
DATE = 0,
@@ -48,10 +46,8 @@ typedef struct {
GtkWidget *time_label;
guint update_interval; /* time between updates in milliseconds */
guint timeout_id;
-#if USE_GTK_TOOLTIP_API
guint tooltip_timeout_id;
gulong tooltip_handler_id;
-#endif
/* settings */
gchar *date_font;
@@ -62,17 +58,13 @@ typedef struct {
/* option widgets */
GtkWidget *date_frame;
-#if USE_GTK_TOOLTIP_API
GtkWidget
[Xfce4-commits] xfce4-datetime-plugin:master Updates for release 0.6.2.
Updating branch refs/heads/master to dd789c65229ae2ee452227619ea95c93381b8604 (commit) from 1bd3d679d4591dd6689f0f7008e69d5fe8fe177e (commit) commit dd789c65229ae2ee452227619ea95c93381b8604 Author: Landry Breuil lan...@xfce.org Date: Thu Feb 14 22:02:44 2013 +0100 Updates for release 0.6.2. Reset maintainer to goodies-dev.. NEWS|8 configure.ac.in |9 + 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index 0afc635..787db3d 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,11 @@ +2013-02-14 + +xfce4-datetime-plugin v0.6.2 released + +* port to libxfce4ui (bug #8064) +* set text orientation according to panel mode/orientation (bug #8926) +* update toolchain/makefiles + 2008-11-19 xfce4-datetime-plugin v0.6.1 released diff --git a/configure.ac.in b/configure.ac.in index cdb3536..9113f98 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -1,13 +1,14 @@ dnl Version information m4_define([datetime_version_major], [0]) m4_define([datetime_version_minor], [6]) -m4_define([datetime_version_micro], [1]) +m4_define([datetime_version_micro], [2]) m4_define([datetime_version], [datetime_version_major().datetime_version_minor().datetime_version_micro()]) dnl Initialize autoconf -AC_COPYRIGHT([Copyright (c) 2006 -Remco den Breeje re...@sx.mine.nu]) -AC_INIT([xfce4-datetime-plugin], [datetime_version], [ongar...@gmail.com]) +AC_COPYRIGHT([Copyright (c) 2006-2009 +Remco den Breeje re...@sx.mine.nu +Diego Ongaro ongar...@gmail.com]) +AC_INIT([xfce4-datetime-plugin], [datetime_version], [goodies-...@xfce.org]) dnl Initialize automake AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME()], [AC_PACKAGE_VERSION()]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-datetime-plugin|datetime-0.6.2 Creating annotated tag datetime-0.6.2
Updating annotated tag refs/tags/datetime-0.6.2 as new annotated tag to 985e825ec4db00ddd0cfe604f5061140e3b4d99c (tag) succeeds datetime-0.6.1-103-g1bd3d67 tagged by Landry Breuil lan...@xfce.org on 2013-02-14 22:04 +0100 Landry Breuil (1): Updates for release 0.6.2. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-smartbookmark-plugin:master Remove the GtkEventBox and use an XfceHVBox instead
Updating branch refs/heads/master
to 8c4971e17efdfc207d73089e5803ad1c0f30d76f (commit)
from 98b402b9b7e639c6fae77c572c1ba67324cef538 (commit)
commit 8c4971e17efdfc207d73089e5803ad1c0f30d76f
Author: Landry Breuil lan...@xfce.org
Date: Mon Feb 18 21:47:30 2013 +0100
Remove the GtkEventBox and use an XfceHVBox instead
Pack the box inside the GtkAlignment so that both label
and entry are nicely centered like it was with the ebox.
src/smartbookmark.c | 23 ++-
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/src/smartbookmark.c b/src/smartbookmark.c
index 176bb05..01e71fb 100644
--- a/src/smartbookmark.c
+++ b/src/smartbookmark.c
@@ -47,7 +47,7 @@
* Types
*/
typedef struct {
-GtkWidget *ebox;
+GtkWidget *box;
GtkWidget *entry; /* keyword entry */
GtkWidget *label;
@@ -99,10 +99,10 @@ static gboolean do_search(const char *url, const char
*keyword)
/* redraw the plugin */
static void update_search(t_search *search) {
DBG (Update search);
-gtk_widget_hide(GTK_WIDGET(search-ebox));
+gtk_widget_hide(GTK_WIDGET(search-box));
gtk_widget_hide(search-label);
gtk_label_set_text(GTK_LABEL(search-label), search-label_text);
-gtk_widget_show(GTK_WIDGET(search-ebox));
+gtk_widget_show(GTK_WIDGET(search-box));
if (!search-hide_label) {
gtk_widget_show(search-label);
}
@@ -173,14 +173,13 @@ static void search_read_config(t_search *search, const
gchar* filename);
static t_search *search_new(XfcePanelPlugin *plugin)
{
t_search *search;
-GtkWidget *box, *align;
+GtkWidget *align;
gchar* filename;
search = g_new0(t_search, 1);
-search-ebox = gtk_event_box_new();
+search-box = xfce_hvbox_new(!xfce_panel_plugin_get_orientation(plugin),
FALSE, 0);
align = gtk_alignment_new(0.5, 0.5, 0, 0);
-gtk_container_add(GTK_CONTAINER(search-ebox), align);
-box = gtk_vbox_new(FALSE, 0);
+gtk_container_add(GTK_CONTAINER(align), search-box);
/* default options */
search-url = http://bugs.debian.org/;;
@@ -191,20 +190,18 @@ static t_search *search_new(XfcePanelPlugin *plugin)
filename = xfce_panel_plugin_save_location(plugin, TRUE);
search_read_config(search, filename);
-gtk_container_add(GTK_CONTAINER(align), box);
search-entry = gtk_entry_new();
gtk_entry_set_width_chars(GTK_ENTRY(search-entry), search-size);
search-label = gtk_label_new(search-label_text);
-gtk_box_pack_start(GTK_BOX(box), search-label, FALSE, FALSE, 0);
-gtk_box_pack_start(GTK_BOX(box), search-entry, FALSE, FALSE, 0);
+gtk_box_pack_start(GTK_BOX(search-box), search-label, FALSE, FALSE, 0);
+gtk_box_pack_start(GTK_BOX(search-box), search-entry, FALSE, FALSE, 0);
// g_signal_connect(command-entry, activate, G_CALLBACK(runcl),
command);
g_signal_connect(search-entry, key-press-event,
G_CALLBACK(entry_keypress_cb), search);
g_signal_connect (search-entry, button-press-event,
G_CALLBACK(entry_buttonpress_cb), plugin);
-gtk_container_add( GTK_CONTAINER(plugin), search-ebox);
-xfce_panel_plugin_add_action_widget(plugin, search-ebox);
-gtk_widget_show_all(search-ebox);
+gtk_container_add( GTK_CONTAINER(plugin), align);
+gtk_widget_show_all(align);
if (search-hide_label) {
gtk_widget_hide(search-label);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-smartbookmark-plugin:master remove commented out code
Updating branch refs/heads/master
to afd8dcba74102be5924bb9d0c8d06614f58c97db (commit)
from 8c4971e17efdfc207d73089e5803ad1c0f30d76f (commit)
commit afd8dcba74102be5924bb9d0c8d06614f58c97db
Author: Landry Breuil lan...@xfce.org
Date: Mon Feb 18 22:14:49 2013 +0100
remove commented out code
src/smartbookmark.c | 35 ---
1 files changed, 0 insertions(+), 35 deletions(-)
diff --git a/src/smartbookmark.c b/src/smartbookmark.c
index 01e71fb..a74d21c 100644
--- a/src/smartbookmark.c
+++ b/src/smartbookmark.c
@@ -207,45 +207,11 @@ static t_search *search_new(XfcePanelPlugin *plugin)
gtk_widget_hide(search-label);
}
-/*
-filename = xfce_panel_plugin_save_location(plugin, TRUE);
-search_read_config(search, filename);
-*/
DBG (SmartBookMark created);
return (search);
}
-/*
-static gboolean search_control_new(Control * ctrl)
-{
-t_search *search;
-
-search = search_new();
-
-gtk_container_add(GTK_CONTAINER(ctrl-base), search-ebox);
-
-ctrl-data = (gpointer) search;
-ctrl-with_popup = FALSE;
-
-gtk_widget_set_size_request(ctrl-base, -1, -1);
-
-return (TRUE);
-}
-
-static void search_free(Control * ctrl)
-{
-t_search *search;
-
-g_return_if_fail(ctrl != NULL);
-g_return_if_fail(ctrl-data != NULL);
-
-search = (t_search *) ctrl-data;
-
-g_free(search);
-}
-*/
-
static void search_read_config(t_search *search, const gchar* filename)
{
XfceRc* rcfile;
@@ -387,6 +353,5 @@ smartbookmark_construct(XfcePanelPlugin *plugin)
xfce_panel_plugin_menu_show_configure (plugin);
g_signal_connect (plugin, configure-plugin,
G_CALLBACK (search_create_options), search);
-//cc-read_config = search_read_config;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-diskperf-plugin:master Add support for FreeBSD (bug #10350)
Updating branch refs/heads/master
to 0faba9adc585a02071b4ab1d8761413b4cc35a9a (commit)
from b1167d15ad443ac1b97a4c1f360e5e345d25747a (commit)
commit 0faba9adc585a02071b4ab1d8761413b4cc35a9a
Author: Danilo Egea daniloe...@yahoo.com.br
Date: Sat Sep 14 10:13:23 2013 +0200
Add support for FreeBSD (bug #10350)
panel-plugin/devperf.c | 88
panel-plugin/main.c| 17 ++
2 files changed, 98 insertions(+), 7 deletions(-)
diff --git a/panel-plugin/devperf.c b/panel-plugin/devperf.c
index 4f7bbf2..45391d5 100644
--- a/panel-plugin/devperf.c
+++ b/panel-plugin/devperf.c
@@ -225,6 +225,94 @@ int main ()
/** Linux End ***/
+#elif defined(__FreeBSD__)
+
+#include sys/disk.h
+#include sys/param.h
+#include sys/sysctl.h
+#include sys/types.h
+#include sys/errno.h
+#include sys/resource.h
+#include sys/time.h
+#include devstat.h
+#include fcntl.h
+#include limits.h
+#include string.h
+#include syslog.h
+#include stdarg.h
+
+#define MAXNAMELEN 256
+
+int DevPerfInit ()
+{
+ return (0);
+}
+
+int DevCheckStatAvailability(char const **strptr)
+{
+ return (0);
+}
+
+int DevGetPerfData (const void *p_pvDevice, struct devperf_t *perf)
+{
+ struct timeval tv;
+ struct timespec ts;
+ struct statinfo stats;
+ struct devinfo dinfo;
+ struct devstat dev;
+ kvm_t *kd = NULL;
+ int i, found = 0;
+ char *check_dev = (char *) p_pvDevice;
+
+ memset(stats, 0, sizeof(stats));
+ memset(dinfo, 0, sizeof(dinfo));
+ stats.dinfo = dinfo;
+
+ if(devstat_getdevs(kd, stats) == -1) {
+ syslog(0, DISKPERF: getdevs fail);
+ }
+
+ for(found = 0, i = 0; i (stats.dinfo)-numdevs; i++) {
+ char dev_name[MAXNAMELEN];
+ dev = (stats.dinfo)-devices[i];
+ snprintf(dev_name, MAXNAMELEN-1, %s%d,
+ dev.device_name, dev.unit_number);
+ if ((check_dev != NULL) (strcmp(check_dev, dev_name) != 0))
+ continue;
+ else {
+ found = 1;
+ break;
+ }
+
+ }
+
+ if(check_dev != NULL found) {
+ perf-wbytes = dev.bytes[DEVSTAT_WRITE];
+ perf-rbytes = dev.bytes[DEVSTAT_READ];
+ gettimeofday (tv, 0);
+ perf-timestamp_ns = (uint64_t)1000ull * 1000ull * 1000ull *
+ tv.tv_sec + 1000ull * tv.tv_usec;
+ perf-qlen = dev.start_count - dev.end_count;
+ // I'm not sure about rbusy and wbusy calculation
+ bintime2timespec(dev.busy_time, ts);
+ perf-rbusy_ns = (uint64_t) ts.tv_nsec;
+ perf-wbusy_ns = perf-rbusy_ns;
+ }
+
+ return (0);
+}
+
+#if 0 /* Standalone test purpose */
+int main ()
+{
+struct devperf_t oPerf;
+DevGetPerfData ((void*)ada0, oPerf);
+printf (%lu\t%lu\n, oPerf.rbytes, oPerf.wbytes);
+return (0);
+}
+#endif
+
+
#elif defined(__NetBSD__)
/**/
diff --git a/panel-plugin/main.c b/panel-plugin/main.c
index 87e4d9c..6d49b28 100644
--- a/panel-plugin/main.c
+++ b/panel-plugin/main.c
@@ -86,7 +86,7 @@ typedef enum monitor_bar_order_t {
typedef struct param_t {
/* Configurable parameters */
characDevice[64];
-#if !defined(__NetBSD__) !defined(__OpenBSD__) !defined(__sun__)
+#if !defined(__FreeBSD__) !defined(__NetBSD__) !defined(__OpenBSD__)
!defined(__sun__)
dev_t st_rdev;
#endif
int fTitleDisplayed;
@@ -172,7 +172,7 @@ static int DisplayPerf (struct diskperf_t *p_poPlugin)
struct param_t *poConf = (p_poPlugin-oConf.oParam);
struct monitor_t *poMonitor = (p_poPlugin-oMonitor);
struct perfbar_t *poPerf = poMonitor-aoPerfBar;
-#if !defined(__NetBSD__) !defined(__OpenBSD__) !defined(__sun__)
+#if !defined(__FreeBSD__) !defined(__NetBSD__) !defined(__OpenBSD__)
!defined(__sun__)
struct stat oStat;
#endif
uint64_tiInterval_ns, rbytes, wbytes, iRBusy_ns, iWBusy_ns;
@@ -185,7 +185,7 @@ static int DisplayPerf (struct diskperf_t *p_poPlugin)
rbytes = wbytes = iRBusy_ns = iWBusy_ns = -1;
memset (oPerf, 0, sizeof (oPerf));
oPerf.qlen = -1;
-#if defined (__NetBSD__) || defined(__OpenBSD__) || defined(__sun__)
+#if defined(__FreeBSD__) || defined (__NetBSD__) || defined(__OpenBSD__) ||
defined(__sun__)
status = DevGetPerfData (poConf-acDevice, oPerf);
#else
if (poConf-st_rdev == 0)
@@ -429,7 +429,7 @@ static diskperf_t *diskperf_create_control (XfcePanelPlugin
*plugin)
struct diskperf_t *poPlugin;
struct param_t *poConf;
struct monitor_t *poMonitor;
-#if !defined(__NetBSD__) !defined(__OpenBSD__) !defined(__sun__)
+#if
[Xfce4-commits] xfce4-taskmanager:master Include sys/proc.h for P_ZOMBIE SSLEEP macros definition.
Updating branch refs/heads/master
to e293a72e0f990780e5fb11a1286095ef8119f01c (commit)
from d720c86b87e183e05b5f5158c03d77d97e889c40 (commit)
commit e293a72e0f990780e5fb11a1286095ef8119f01c
Author: Landry Breuil lan...@xfce.org
Date: Thu Jan 9 22:10:09 2014 +0100
Include sys/proc.h for P_ZOMBIE SSLEEP macros definition.
src/task-manager-bsd.c |2 ++
1 file changed, 2 insertions(+)
diff --git a/src/task-manager-bsd.c b/src/task-manager-bsd.c
index 2bdfd70..c34e1ad 100644
--- a/src/task-manager-bsd.c
+++ b/src/task-manager-bsd.c
@@ -31,6 +31,8 @@
#include string.h
/* for getpagesize() */
#include unistd.h
+/* for P_ZOMBIE SSLEEP */
+#include sys/proc.h
#include task-manager.h
char *state_abbrev[] = {
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
