Hello community,
here is the log from the commit of package xfce4-panel-plugin-smartbookmark for
openSUSE:Factory checked in at 2017-10-07 17:50:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xfce4-panel-plugin-smartbookmark (Old)
and /work/SRC/openSUSE:Factory/.xfce4-panel-plugin-smartbookmark.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce4-panel-plugin-smartbookmark"
Sat Oct 7 17:50:14 2017 rev:14 rq:530182 version:0.5.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/xfce4-panel-plugin-smartbookmark/xfce4-panel-plugin-smartbookmark.changes
2015-03-11 09:58:40.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.xfce4-panel-plugin-smartbookmark.new/xfce4-panel-plugin-smartbookmark.changes
2017-10-07 17:50:17.656283287 +0200
@@ -1,0 +2,14 @@
+Sat Sep 30 17:09:06 UTC 2017 - [email protected]
+
+- + xfce4-panel-plugin-smartbookmark-0.5.0-defaults.patch
+- - xfce4-panel-plugin-smartbookmark-0.4.2-defaults.patch
+
+-------------------------------------------------------------------
+Sun Nov 27 11:59:15 UTC 2016 - [email protected]
+
+- update to version 0.5.0
+ - port to gtk+3/libxfce4ui-2/libxfce4panel-2.0
+ - fix value changes saving in prefs dialog (#12666)
+ - fix boolean logic in GtkSwitch use
+
+-------------------------------------------------------------------
Old:
----
xfce4-panel-plugin-smartbookmark-0.4.2-defaults.patch
xfce4-smartbookmark-plugin-0.4.6.tar.bz2
New:
----
xfce4-panel-plugin-smartbookmark-0.5.0-defaults.patch
xfce4-smartbookmark-plugin-0.5.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xfce4-panel-plugin-smartbookmark.spec ++++++
--- /var/tmp/diff_new_pack.pMCLBT/_old 2017-10-07 17:50:20.984136993 +0200
+++ /var/tmp/diff_new_pack.pMCLBT/_new 2017-10-07 17:50:20.984136993 +0200
@@ -1,7 +1,7 @@
#
# spec file for package xfce4-panel-plugin-smartbookmark
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,23 +16,22 @@
#
-%define panel_version 4.10.0
+%define panel_version 4.12.0
%define plugin_name xfce4-smartbookmark-plugin
Name: xfce4-panel-plugin-smartbookmark
-Version: 0.4.6
+Version: 0.5.0
Release: 0
Summary: Smart Bookmark Plugin for the Xfce Panel
License: GPL-2.0+
Group: System/GUI/XFCE
Url:
http://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-plugin
-Source0:
http://archive.xfce.org/src/panel-plugins/%{plugin_name}/0.4/%{plugin_name}-%{version}.tar.bz2
-# PATCH-FEATURE-OPENSUSE xfce4-panel-plugin-smartbookmark-0.4.2-defaults.patch
[email protected] -- Replaces Debian defaults and hides the label on to of the
entry widget by default
-Patch0: xfce4-panel-plugin-smartbookmark-0.4.2-defaults.patch
+Source0:
http://archive.xfce.org/src/panel-plugins/%{plugin_name}/0.5/%{plugin_name}-%{version}.tar.bz2
+# PATCH-FEATURE-OPENSUSE xfce4-panel-plugin-smartbookmark-0.5.0-defaults.patch
[email protected] -- Replaces Debian defaults and hides the label on to of the
entry widget by default
+Patch0: xfce4-panel-plugin-smartbookmark-0.5.0-defaults.patch
BuildRequires: fdupes
BuildRequires: intltool
-BuildRequires: pkgconfig(gdk-2.0)
-BuildRequires: pkgconfig(libxfce4panel-1.0)
-BuildRequires: pkgconfig(libxfce4ui-1)
+BuildRequires: pkgconfig(libxfce4panel-2.0) >= %{panel_version}
+BuildRequires: pkgconfig(libxfce4ui-2) >= %{panel_version}
Requires: exo
Requires: xfce4-panel >= %{panel_version}
Recommends: %{name}-lang = %{version}
++++++ xfce4-panel-plugin-smartbookmark-0.4.2-defaults.patch ->
xfce4-panel-plugin-smartbookmark-0.5.0-defaults.patch ++++++
---
/work/SRC/openSUSE:Factory/xfce4-panel-plugin-smartbookmark/xfce4-panel-plugin-smartbookmark-0.4.2-defaults.patch
2015-03-11 09:58:40.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.xfce4-panel-plugin-smartbookmark.new/xfce4-panel-plugin-smartbookmark-0.5.0-defaults.patch
2017-10-07 17:50:17.228302101 +0200
@@ -1,9 +1,9 @@
-Index: xfce4-smartbookmark-plugin-0.4.6/src/smartbookmark.c
+Index: b/src/smartbookmark.c
===================================================================
---- xfce4-smartbookmark-plugin-0.4.6.orig/src/smartbookmark.c
-+++ xfce4-smartbookmark-plugin-0.4.6/src/smartbookmark.c
-@@ -182,10 +182,10 @@ static t_search *search_new(XfcePanelPlu
- gtk_container_add(GTK_CONTAINER(align), search->box);
+--- a/src/smartbookmark.c
++++ b/src/smartbookmark.c
+@@ -173,10 +173,10 @@ static t_search *search_new(XfcePanelPlu
+ gtk_widget_set_valign(GTK_WIDGET(search->box), GTK_ALIGN_CENTER);
/* default options */
- search->url = "http://bugs.debian.org/";;
@@ -16,7 +16,7 @@
/* read config file options */
filename = xfce_panel_plugin_save_location(plugin, TRUE);
search_read_config(search, filename);
-@@ -218,10 +218,10 @@ static void search_read_config(t_search
+@@ -209,10 +209,10 @@ static void search_read_config(t_search
if( (rcfile = xfce_rc_simple_open(filename, TRUE) ))
{
xfce_rc_set_group(rcfile, NULL);
++++++ xfce4-smartbookmark-plugin-0.4.6.tar.bz2 ->
xfce4-smartbookmark-plugin-0.5.0.tar.bz2 ++++++
++++ 1875 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xfce4-smartbookmark-plugin-0.4.6/ChangeLog
new/xfce4-smartbookmark-plugin-0.5.0/ChangeLog
--- old/xfce4-smartbookmark-plugin-0.4.6/ChangeLog 2015-03-09
22:27:00.000000000 +0100
+++ new/xfce4-smartbookmark-plugin-0.5.0/ChangeLog 2016-11-01
15:39:14.000000000 +0100
@@ -1,3 +1,244 @@
+commit e0db4d6bf09fd749bc7188f14104ed39cf1b0f95
+Author: Landry Breuil <[email protected]>
+Date: Tue Nov 1 15:37:25 2016 +0100
+
+ Release 0.5.0
+
+commit 4ef680fdfea8cc7967ae5c1b2f28f1de9f11c00d
+Author: Landry Breuil <[email protected]>
+Date: Wed Jun 29 20:58:51 2016 +0200
+
+ Fix value changes saving in prefs dialog (#12666)
+
+ Connect the callbacks to the 'changed' signal instead of the 'activate'
signal which
+ is only called upon Enter. This way, the label is updated live on the
panel,
+ and the url is properly saved when exiting the prefs dialog.
+
+commit b757a777ed4390e1a8784ddc6be62804a14179f9
+Author: Landry Breuil <[email protected]>
+Date: Tue Jun 28 21:45:55 2016 +0200
+
+ Now that each dialog widget is connected to its own callback, drop useless
update_search() & search_apply_options_cb() methods
+
+commit 060fa1d41be2416b8170e2d9d5015d7860beb66a
+Author: Landry Breuil <[email protected]>
+Date: Tue Jun 28 21:44:31 2016 +0200
+
+ Fix boolean logic in GtkSwitch use
+
+ Properly set the switch state after applying label visibility and entry
sensitivity
+
+commit 5c274bb943d5a1d2dbebeff63cb144eae6226484
+Author: Landry Breuil <[email protected]>
+Date: Tue Jun 28 21:43:29 2016 +0200
+
+ Connect value-changed signal to a callback that directly resizes the entry
on the panel
+
+ While here, directly set the label text in text_entry_activate_cb()
+
+commit 0fca244ace9ac37e08605ac32bcadeb6bb2da88c
+Author: Landry Breuil <[email protected]>
+Date: Tue Jun 28 21:42:46 2016 +0200
+
+ Set the max size spinner value to 30 chars
+
+commit ae28b4496f3509892337612eca7619ab8d54e537
+Author: Landry Breuil <[email protected]>
+Date: Sun Jun 5 17:35:49 2016 +0200
+
+ Release 0.4.99
+
+commit 67b9f8f0c6e521eb3425e3b498dcad48ef5e7b14
+Author: Landry Breuil <[email protected]>
+Date: Sun Jun 5 16:45:15 2016 +0200
+
+ Use a grid instead of packing boxes into boxes
+
+commit 8ecff935f5bc2a8fba9d29a2c0cd055425924bf8
+Author: Robert Antoni Buj i Gelonch <[email protected]>
+Date: Wed May 4 18:32:20 2016 +0200
+
+ I18n: Update translation ca (100%).
+
+ 9 translated messages.
+
+ Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 6be4a7543e4def0bfbe0fc2babfca51fd684f8a2
+Author: Robert Antoni Buj i Gelonch <[email protected]>
+Date: Mon May 2 00:35:53 2016 +0200
+
+ I18n: Update translation ca (100%).
+
+ 9 translated messages.
+
+ Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 36fb61845e71ec58d65dddebb906a9489931d313
+Author: Landry Breuil <[email protected]>
+Date: Fri Apr 29 09:43:28 2016 +0200
+
+ reuse label to set tooltip on the GtkSwitch for clarity
+
+commit 7f0fc7d5b3c2ff33985c166633d50f292f34e596
+Author: Simon Steinbeiss <[email protected]>
+Date: Thu Apr 28 23:07:49 2016 +0200
+
+ Improve the settings dialog
+
+ Signed-off-by: Landry Breuil <[email protected]>
+
+commit 64eec93e0cfc3beb969b36011567ebd3401dfee3
+Author: Landry Breuil <[email protected]>
+Date: Thu Apr 28 11:50:25 2016 +0200
+
+ properly give a parent to the option dialog
+
+commit f1062268ad1fc644d4d8d87a4d7fdf535a85337b
+Author: Landry Breuil <[email protected]>
+Date: Thu Apr 28 11:47:18 2016 +0200
+
+ Use gtk_dialog_get_content_area() instead of adding an intermediate
useless GtkVBox
+
+ We cant access the vbox private member anyway.
+
+commit af7d368d10cf1889d8d95ef7c0ce28bb3b4d68ac
+Author: Landry Breuil <[email protected]>
+Date: Thu Apr 28 11:46:49 2016 +0200
+
+ Use GtkBox with GTK_ORIENTATION_HORIZONTAL instead of GtkHBox
+
+commit f8361fc44c661b81a58cf90b08bf59e125566032
+Author: Landry Breuil <[email protected]>
+Date: Thu Apr 28 11:46:25 2016 +0200
+
+ Use the correct type for GtkAdjustment
+
+commit de9849ee076470b6d233dd19eac56fbd259b6907
+Author: Landry Breuil <[email protected]>
+Date: Thu Apr 28 11:42:15 2016 +0200
+
+ GTK_DIALOG_NO_SEPARATOR was removed, and replace GTK_STOCK_CLOSE by
"gtk-close"
+
+commit 1d2c46e7feb0b734096aac82b1918cc23d703ec9
+Author: Landry Breuil <[email protected]>
+Date: Thu Apr 28 11:41:45 2016 +0200
+
+ Remove unused variable
+
+commit 68ccac81fedd8bb7ccee05f4a18902f7bd8d1f1a
+Author: Landry Breuil <[email protected]>
+Date: Thu Apr 28 11:40:47 2016 +0200
+
+ Stop using GtkAlignment and XfceHVBox, use a plain GtkBox and set
halign/valign
+
+commit 5873690fb9d4aa9a4d72fb7fa0f3ae86e5e418fa
+Author: Landry Breuil <[email protected]>
+Date: Thu Apr 28 11:40:02 2016 +0200
+
+ Use the correct GDK_KEY defines
+
+commit 411669f522812d2614adc843b872aa6d76f4080b
+Author: Landry Breuil <[email protected]>
+Date: Thu Apr 28 11:39:33 2016 +0200
+
+ Don't access window member directly, use gtk_widget_get_window() instead
+
+commit 664f7b63c557e8ec252915cdcec54692c1b46d37
+Author: Landry Breuil <[email protected]>
+Date: Thu Apr 28 11:38:59 2016 +0200
+
+ Set X-XFCE-API=2.0 in desktop file
+
+commit a749f697f6068eaeefe6032b325b819b962fef4d
+Author: Landry Breuil <[email protected]>
+Date: Thu Apr 28 11:38:33 2016 +0200
+
+ Bump dependencies to check for libxfce4ui-2/libxfce4panel-2.0.
+
+commit 277427fd46e64309369642c1f9f1d61bbc818f3f
+Author: Davidmp <[email protected]>
+Date: Fri Apr 1 18:31:56 2016 +0200
+
+ I18n: Update translation ca (100%).
+
+ 9 translated messages.
+
+ Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit bf17ad30bad0513559db48a0974c448b7702ee8a
+Author: Elishai Eliyahu <[email protected]>
+Date: Mon Feb 8 00:31:57 2016 +0100
+
+ I18n: Add new translation he (100%).
+
+ 9 translated messages.
+
+ Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit d0a036474daf4e8a8aa21b2407585bc6c05cb618
+Author: Anonymous <[email protected]>
+Date: Mon Sep 21 00:32:40 2015 +0200
+
+ I18n: Update translation lt (100%).
+
+ 9 translated messages.
+
+ Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 426677a46cc5f38e1227b389aaf4ebbe1454d524
+Author: Anonymous <[email protected]>
+Date: Tue Jul 21 18:32:15 2015 +0200
+
+ I18n: Update translation lt (100%).
+
+ 9 translated messages.
+
+ Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 5311666e2040ed53ec37493ddcfbfe02866c9c33
+Author: Påvel Nicklasson <[email protected]>
+Date: Mon Jul 20 00:35:04 2015 +0200
+
+ I18n: Update translation sv (100%).
+
+ 9 translated messages.
+
+ Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit e3b5ceba863f332aef40b6936404d73d7463cab9
+Author: Anonymous <[email protected]>
+Date: Wed Apr 29 00:31:48 2015 +0200
+
+ I18n: Update translation lt (100%).
+
+ 9 translated messages.
+
+ Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 7faebc8def80db9306a11ca3ce8dada987729100
+Merge: 6110398 c32d86f
+Author: Landry Breuil <[email protected]>
+Date: Mon Mar 23 22:11:02 2015 +0100
+
+ Merge branch 'master' of
git://git.xfce.org/panel-plugins/xfce4-smartbookmark-plugin
+
+commit c32d86f753271100cf11a3f7b116e236eb865916
+Author: Efstathios Iosifidis <[email protected]>
+Date: Thu Mar 19 12:32:00 2015 +0100
+
+ I18n: Update translation el (100%).
+
+ 9 translated messages.
+
+ Transifex (https://www.transifex.com/projects/p/xfce/).
+
+commit 6110398d0665530f2c7ceb34a43c355ba34bf66f
+Author: Landry Breuil <[email protected]>
+Date: Mon Mar 9 22:27:46 2015 +0100
+
+ rly update changelog again
+
commit 7715b965df394afd318156d2856e39e933aee172
Author: Landry Breuil <[email protected]>
Date: Mon Mar 9 22:26:28 2015 +0100
@@ -942,7 +1183,7 @@
2009-07-24 Gabor Kelemen <[email protected]>
- * hu.po: Translation reworked.
+ * hu.po: Translation reworked.
(Old svn revision: 7808)
@@ -1023,45 +1264,45 @@
Date: Sat Dec 20 21:52:03 2008 +0000
xfce4-taskmanager/trunk/po:
- * sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
+ * sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
xfce4-time-out-plugin/trunk/po:
- * sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
+ * sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
xfce4-wavelan-plugin/trunk/po:
- * sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
+ * sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
xfce4-radio-plugin/trunk/po:
- * sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
+ * sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
xfce4-datetime-plugin/trunk/po:
- * sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
+ * sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
xfce4-cpufreq-plugin/trunk/po:
- * sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
+ * sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
xfburn/trunk/po:
- * sv.po: Swedish translation update (Daniel Nylander)
+ * sv.po: Swedish translation update (Daniel Nylander)
xfce4-xkb-plugin/trunk/po:
- * sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
+ * sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
xfce4-smartbookmark-plugin/trunk/po:
- * sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
+ * sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
xfce4-smartpm-plugin/trunk/po:
- * sv.po: Swedish translation update (Daniel Nylander)
+ * sv.po: Swedish translation update (Daniel Nylander)
thunar-media-tags-plugin/trunk/po:
- * sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
+ * sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
xfvnc/trunk/po:
- * sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
+ * sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
xfce4-verve-plugin/trunk/po:
- * sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
+ * sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
xfce4-xfapplet-plugin/trunk/po:
- * sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
+ * sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
thunar-archive-plugin/trunk/po:
- * sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
+ * sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
xfce4-websearch-plugin/trunk/po:
- * sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
+ * sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
xfce4-screenshooter-plugin/trunk/po:
- * sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
+ * sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
xfce4-teatime-plugin/trunk/po:
- * sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
+ * sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
xfce4-rss-plugin/trunk/po:
- * sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
+ * sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
xfmpc/trunk/po:
- * sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
+ * sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
(Old svn revision: 6343)
@@ -1140,7 +1381,7 @@
Author: Lars Nielsen <[email protected]>
Date: Thu Oct 2 20:01:48 2008 +0000
- * da.po: Danish translation update
+ * da.po: Danish translation update
@@ -1311,7 +1552,7 @@
Maxim Dziumanenko <[email protected]>
- * Update Ukrainian translatioon
+ * Update Ukrainian translatioon
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xfce4-smartbookmark-plugin-0.4.6/NEWS
new/xfce4-smartbookmark-plugin-0.5.0/NEWS
--- old/xfce4-smartbookmark-plugin-0.4.6/NEWS 2015-03-09 21:54:33.000000000
+0100
+++ new/xfce4-smartbookmark-plugin-0.5.0/NEWS 2016-10-31 18:54:10.000000000
+0100
@@ -1,3 +1,12 @@
+0.5.0 : 2016/11/01
+=====
+- Fix value changes saving in prefs dialog (#12666)
+- Fix boolean logic in GtkSwitch use
+
+0.4.99 : 2016/06/05
+=====
+- port to gtk+3/libxfce4ui-2/libxfce4panel-2.0
+
0.4.6 : 2015/03/09
=====
- Remove the GtkEventBox and use an XfceHVBox instead
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xfce4-smartbookmark-plugin-0.4.6/compile
new/xfce4-smartbookmark-plugin-0.5.0/compile
--- old/xfce4-smartbookmark-plugin-0.4.6/compile 2013-01-20
21:35:04.000000000 +0100
+++ new/xfce4-smartbookmark-plugin-0.5.0/compile 1970-01-01
01:00:00.000000000 +0100
@@ -1,142 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
-
-scriptversion=2005-05-14.22
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-# Written by Tom Tromey <[email protected]>.
-#
-# 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, 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 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <[email protected]> or send patches to
-# <[email protected]>.
-
-case $1 in
- '')
- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
- exit 1;
- ;;
- -h | --h*)
- cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
-
-Report bugs to <[email protected]>.
-EOF
- exit $?
- ;;
- -v | --v*)
- echo "compile $scriptversion"
- exit $?
- ;;
-esac
-
-ofile=
-cfile=
-eat=
-
-for arg
-do
- if test -n "$eat"; then
- eat=
- else
- case $1 in
- -o)
- # configure might choose to run compile as `compile cc -o foo foo.c'.
- # So we strip `-o arg' only if arg is an object.
- eat=1
- case $2 in
- *.o | *.obj)
- ofile=$2
- ;;
- *)
- set x "$@" -o "$2"
- shift
- ;;
- esac
- ;;
- *.c)
- cfile=$1
- set x "$@" "$1"
- shift
- ;;
- *)
- set x "$@" "$1"
- shift
- ;;
- esac
- fi
- shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
- # If no `-o' option was seen then we might have been invoked from a
- # pattern rule where we don't need one. That is ok -- this is a
- # normal compilation that the losing compiler can handle. If no
- # `.c' file was seen then we are probably linking. That is also
- # ok.
- exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
-# that we are using for the .o file. Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
-while true; do
- if mkdir "$lockdir" >/dev/null 2>&1; then
- break
- fi
- sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
- mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
- mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xfce4-smartbookmark-plugin-0.4.6/configure.ac
new/xfce4-smartbookmark-plugin-0.5.0/configure.ac
--- old/xfce4-smartbookmark-plugin-0.4.6/configure.ac 2015-03-09
22:26:37.000000000 +0100
+++ new/xfce4-smartbookmark-plugin-0.5.0/configure.ac 2016-11-01
15:38:38.000000000 +0100
@@ -5,8 +5,8 @@
dnl Version information
m4_define([smartbookmark_version_major], [0])
-m4_define([smartbookmark_version_minor], [4])
-m4_define([smartbookmark_version_micro], [6])
+m4_define([smartbookmark_version_minor], [5])
+m4_define([smartbookmark_version_micro], [0])
m4_define([smartbookmark_version],
[smartbookmark_version_major.smartbookmark_version_minor.smartbookmark_version_micro])
@@ -28,11 +28,11 @@
LT_INIT([disable-static])
dnl Check for i18n support
-XDT_I18N([ar ast bg ca cs da de el en_AU en_GB es eu fr gl hr hu id is it ja
ko lt lv ms nb nl oc pl pt pt_BR ru sk sq sr sv th tr ug uk ur ur_PK zh_CN
zh_TW ])
+XDT_I18N([ar ast bg ca cs da de el en_AU en_GB es eu fr gl he hr hu id is it
ja ko lt lv ms nb nl oc pl pt pt_BR ru sk sq sr sv th tr ug uk ur ur_PK zh_CN
zh_TW ])
dnl Check for required packages
-XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
-XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.8.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.12.0])
+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-2.0], [4.12.0])
XDT_FEATURE_DEBUG()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xfce4-smartbookmark-plugin-0.4.6/po/Makefile.in.in
new/xfce4-smartbookmark-plugin-0.5.0/po/Makefile.in.in
--- old/xfce4-smartbookmark-plugin-0.4.6/po/Makefile.in.in 2015-03-09
22:26:38.000000000 +0100
+++ new/xfce4-smartbookmark-plugin-0.5.0/po/Makefile.in.in 2016-11-01
15:38:39.000000000 +0100
@@ -33,8 +33,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
libdir = @libdir@
-DATADIRNAME = @DATADIRNAME@
-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+localedir = @localedir@
subdir = po
install_sh = @install_sh@
# Automake >= 1.8 provides @mkdir_p@.
@@ -81,7 +80,7 @@
.po.pox:
$(MAKE) $(GETTEXT_PACKAGE).pot
- $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
+ $(MSGMERGE) $* $(GETTEXT_PACKAGE).pot -o $*.pox
.po.mo:
$(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $<
@@ -109,7 +108,7 @@
install-data-yes: all
linguas="$(USE_LINGUAS)"; \
for lang in $$linguas; do \
- dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
+ dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
$(mkdir_p) $$dir; \
if test -r $$lang.gmo; then \
$(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
@@ -143,8 +142,8 @@
uninstall:
linguas="$(USE_LINGUAS)"; \
for lang in $$linguas; do \
- rm -f
$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
- rm -f
$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
+ rm -f
$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+ rm -f
$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
done
check: all $(GETTEXT_PACKAGE).pot
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xfce4-smartbookmark-plugin-0.4.6/po/ca.po
new/xfce4-smartbookmark-plugin-0.5.0/po/ca.po
--- old/xfce4-smartbookmark-plugin-0.4.6/po/ca.po 2013-01-03
22:26:41.000000000 +0100
+++ new/xfce4-smartbookmark-plugin-0.5.0/po/ca.po 2016-10-29
08:45:09.000000000 +0200
@@ -1,54 +1,56 @@
-# Catalan translation of xfce4-smartbookmark-plugin.
-# Copyright (C) 2006
-# This file is distributed under the same license as the
xfce4-smartbookmark-plugin package.
-# Pau Ruŀlan Ferragut <[email protected]>, 2006.
-# Carles Muñoz Gorriz <[email protected]>, 2008.
-#
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# Carles Muñoz Gorriz <[email protected]>, 2008
+# Davidmp <[email protected]>, 2016
+# Pau Ruŀlan Ferragut <[email protected]>, 2006
+# Robert Antoni Buj i Gelonch <[email protected]>, 2016
msgid ""
msgstr ""
-"Project-Id-Version: xfce4-smartbookmark-plugin 0.4.1\n"
+"Project-Id-Version: Xfce Panel Plugins\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-03 22:26+0100\n"
-"PO-Revision-Date: 2008-11-16 13:39+0100\n"
-"Last-Translator: Carles Muñoz Gorriz <[email protected]>\n"
-"Language-Team: Catalan\n"
-"Language: \n"
+"POT-Creation-Date: 2013-07-03 21:17+0200\n"
+"PO-Revision-Date: 2016-05-04 11:59+0000\n"
+"Last-Translator: Robert Antoni Buj i Gelonch <[email protected]>\n"
+"Language-Team: Catalan
(http://www.transifex.com/xfce/xfce-panel-plugins/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../src/smartbookmark.c:90
#, c-format
msgid "Failed to send %s to your preferred browser"
-msgstr ""
+msgstr "Ha fallat enviar %s al vostre navegador preferit"
-#: ../src/smartbookmark.c:296
+#: ../src/smartbookmark.c:259
msgid "Smartbookmark"
msgstr "Smartbookmark"
-#: ../src/smartbookmark.c:301
+#: ../src/smartbookmark.c:264
msgid "Preferences"
msgstr "Preferències"
#. text label
-#: ../src/smartbookmark.c:316
+#: ../src/smartbookmark.c:279
msgid "Label:"
msgstr "Etiqueta:"
#. size label
-#: ../src/smartbookmark.c:331
+#: ../src/smartbookmark.c:294
msgid "Size:"
msgstr "Mida:"
#. Hide label option
-#: ../src/smartbookmark.c:342
+#: ../src/smartbookmark.c:305
msgid "Hide label"
-msgstr "Amaga etiqueta"
+msgstr "Oculta l'etiqueta"
#. url label
-#: ../src/smartbookmark.c:353
+#: ../src/smartbookmark.c:316
msgid "URL: "
msgstr "URL: "
@@ -58,4 +60,4 @@
#: ../src/smartbookmark.desktop.in.h:2
msgid "Query websites from the Xfce panel"
-msgstr "Accedeix a llocs web des de el quadre de Xfce"
+msgstr "Consulteu els llocs web des del plafó de Xfce"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xfce4-smartbookmark-plugin-0.4.6/po/el.po
new/xfce4-smartbookmark-plugin-0.5.0/po/el.po
--- old/xfce4-smartbookmark-plugin-0.4.6/po/el.po 2013-01-03
22:26:42.000000000 +0100
+++ new/xfce4-smartbookmark-plugin-0.5.0/po/el.po 2016-04-27
11:35:02.000000000 +0200
@@ -1,50 +1,53 @@
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# Efstathios Iosifidis <[email protected]>, 2015
msgid ""
msgstr ""
-"Project-Id-Version: xfce4-smartbookmark-plugin\n"
+"Project-Id-Version: Xfce Panel Plugins\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-03 22:26+0100\n"
-"PO-Revision-Date: \n"
-"Last-Translator: George Vasilakos <[email protected]>\n"
-"Language-Team: Greek <[email protected]>\n"
-"Language: el\n"
+"POT-Creation-Date: 2013-07-03 21:17+0200\n"
+"PO-Revision-Date: 2015-03-19 09:16+0000\n"
+"Last-Translator: Efstathios Iosifidis <[email protected]>\n"
+"Language-Team: Greek
(http://www.transifex.com/projects/p/xfce-panel-plugins/language/el/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-Language: Greek\n"
-"X-Poedit-Country: GREECE\n"
#: ../src/smartbookmark.c:90
#, c-format
msgid "Failed to send %s to your preferred browser"
-msgstr ""
+msgstr "Αποτυχία αποστολής της %s στον προτιμώμενο φυλλομετρητή"
-#: ../src/smartbookmark.c:296
+#: ../src/smartbookmark.c:259
msgid "Smartbookmark"
msgstr "Smartbookmark"
-#: ../src/smartbookmark.c:301
+#: ../src/smartbookmark.c:264
msgid "Preferences"
msgstr "Προτιμήσεις"
#. text label
-#: ../src/smartbookmark.c:316
+#: ../src/smartbookmark.c:279
msgid "Label:"
msgstr "Ετικέτα:"
#. size label
-#: ../src/smartbookmark.c:331
+#: ../src/smartbookmark.c:294
msgid "Size:"
msgstr "Μέγεθος:"
#. Hide label option
-#: ../src/smartbookmark.c:342
+#: ../src/smartbookmark.c:305
msgid "Hide label"
msgstr "Απόκρυψη ετικετας"
#. url label
-#: ../src/smartbookmark.c:353
+#: ../src/smartbookmark.c:316
msgid "URL: "
msgstr "URL:"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xfce4-smartbookmark-plugin-0.4.6/po/he.po
new/xfce4-smartbookmark-plugin-0.5.0/po/he.po
--- old/xfce4-smartbookmark-plugin-0.4.6/po/he.po 1970-01-01
01:00:00.000000000 +0100
+++ new/xfce4-smartbookmark-plugin-0.5.0/po/he.po 2016-04-27
11:35:02.000000000 +0200
@@ -0,0 +1,60 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# Elishai Eliyahu <[email protected]>, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: Xfce Panel Plugins\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-07-03 21:17+0200\n"
+"PO-Revision-Date: 2016-02-07 19:31+0000\n"
+"Last-Translator: Elishai Eliyahu <[email protected]>\n"
+"Language-Team: Hebrew
(http://www.transifex.com/xfce/xfce-panel-plugins/language/he/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../src/smartbookmark.c:90
+#, c-format
+msgid "Failed to send %s to your preferred browser"
+msgstr "נכשל לשלוח %s לדפדפן המועדף עליך"
+
+#: ../src/smartbookmark.c:259
+msgid "Smartbookmark"
+msgstr "סימנייה חכמה"
+
+#: ../src/smartbookmark.c:264
+msgid "Preferences"
+msgstr "העדפות"
+
+#. text label
+#: ../src/smartbookmark.c:279
+msgid "Label:"
+msgstr "תווית:"
+
+#. size label
+#: ../src/smartbookmark.c:294
+msgid "Size:"
+msgstr "גודל:"
+
+#. Hide label option
+#: ../src/smartbookmark.c:305
+msgid "Hide label"
+msgstr "הסתר תווית"
+
+#. url label
+#: ../src/smartbookmark.c:316
+msgid "URL: "
+msgstr "URL: "
+
+#: ../src/smartbookmark.desktop.in.h:1
+msgid "SmartBookmark"
+msgstr "סימנייה חכמה"
+
+#: ../src/smartbookmark.desktop.in.h:2
+msgid "Query websites from the Xfce panel"
+msgstr "תשאל אתרים מפאנל Xfce "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xfce4-smartbookmark-plugin-0.4.6/po/lt.po
new/xfce4-smartbookmark-plugin-0.5.0/po/lt.po
--- old/xfce4-smartbookmark-plugin-0.4.6/po/lt.po 2013-01-03
22:26:45.000000000 +0100
+++ new/xfce4-smartbookmark-plugin-0.5.0/po/lt.po 2016-04-27
11:35:02.000000000 +0200
@@ -1,54 +1,54 @@
# 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.
-# Algimantas Margevičius <[email protected]>, 2012.
-#
+#
+# Translators:
+# Algimantas Margevičius <[email protected]>, 2012
+# Moo, 2015
msgid ""
msgstr ""
-"Project-Id-Version: smartbookmark\n"
+"Project-Id-Version: Xfce Panel Plugins\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-03 22:26+0100\n"
-"PO-Revision-Date: 2012-04-21 14:39+0300\n"
-"Last-Translator: Algimantas Margevičius <[email protected]>\n"
-"Language-Team: Lietuvių <>\n"
-"Language: \n"
+"POT-Creation-Date: 2013-07-03 21:17+0200\n"
+"PO-Revision-Date: 2015-09-20 20:10+0000\n"
+"Last-Translator: Moo\n"
+"Language-Team: Lithuanian
(http://www.transifex.com/xfce/xfce-panel-plugins/language/lt/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
-"%100<10 || n%100>=20) ? 1 : 2)\n"
+"Language: lt\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 &&
(n%100<10 || n%100>=20) ? 1 : 2);\n"
#: ../src/smartbookmark.c:90
#, c-format
msgid "Failed to send %s to your preferred browser"
-msgstr ""
+msgstr "Nepavyko nusiųsti %s į jūsų pageidautiną naršyklę"
-#: ../src/smartbookmark.c:296
+#: ../src/smartbookmark.c:259
msgid "Smartbookmark"
msgstr "Išmani žymelė"
-#: ../src/smartbookmark.c:301
+#: ../src/smartbookmark.c:264
msgid "Preferences"
-msgstr "Nustatymai"
+msgstr "Nuostatos"
#. text label
-#: ../src/smartbookmark.c:316
+#: ../src/smartbookmark.c:279
msgid "Label:"
msgstr "Etiketė:"
#. size label
-#: ../src/smartbookmark.c:331
+#: ../src/smartbookmark.c:294
msgid "Size:"
msgstr "Dydis:"
#. Hide label option
-#: ../src/smartbookmark.c:342
+#: ../src/smartbookmark.c:305
msgid "Hide label"
msgstr "Slėpti etiketę"
#. url label
-#: ../src/smartbookmark.c:353
+#: ../src/smartbookmark.c:316
msgid "URL: "
msgstr "URL: "
@@ -58,4 +58,4 @@
#: ../src/smartbookmark.desktop.in.h:2
msgid "Query websites from the Xfce panel"
-msgstr "Užklauskite tinklalapius tiesiai iš Xfce skydelio"
+msgstr "Užklauskite svetaines tiesiai iš Xfce skydelio"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xfce4-smartbookmark-plugin-0.4.6/po/sv.po
new/xfce4-smartbookmark-plugin-0.5.0/po/sv.po
--- old/xfce4-smartbookmark-plugin-0.4.6/po/sv.po 2015-03-09
21:48:22.000000000 +0100
+++ new/xfce4-smartbookmark-plugin-0.5.0/po/sv.po 2016-04-27
11:35:02.000000000 +0200
@@ -9,9 +9,9 @@
"Project-Id-Version: Xfce Panel Plugins\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-07-03 21:17+0200\n"
-"PO-Revision-Date: 2014-02-23 13:32+0000\n"
-"Last-Translator: PavelNicklasson <[email protected]>\n"
-"Language-Team: Swedish
(http://www.transifex.com/projects/p/xfce/language/sv/)\n"
+"PO-Revision-Date: 2015-07-19 17:23+0000\n"
+"Last-Translator: Påvel Nicklasson <[email protected]>\n"
+"Language-Team: Swedish
(http://www.transifex.com/p/xfce-panel-plugins/language/sv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xfce4-smartbookmark-plugin-0.4.6/src/smartbookmark.c
new/xfce4-smartbookmark-plugin-0.5.0/src/smartbookmark.c
--- old/xfce4-smartbookmark-plugin-0.4.6/src/smartbookmark.c 2013-02-18
22:14:36.000000000 +0100
+++ new/xfce4-smartbookmark-plugin-0.5.0/src/smartbookmark.c 2016-10-29
08:45:09.000000000 +0200
@@ -55,7 +55,7 @@
gchar *label_text;
gchar *url;
gint size;
-
+
gboolean hide_label;
/* options dialog */
@@ -96,51 +96,44 @@
}
-/* redraw the plugin */
-static void update_search(t_search *search) {
- DBG ("Update search");
- 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->box));
- if (!search->hide_label) {
- gtk_widget_show(search->label);
- }
+/* callback: apply the new value to the url string */
+static void url_entry_changed_cb(GtkWidget *widget, t_search *search)
+{
+ DBG ("url_entry_changed_cb");
+ search->url = g_strdup(gtk_entry_get_text(GTK_ENTRY(search->url_entry)));
}
-/* apply the new values to: url, label_text, size */
-static void search_apply_options_cb(t_search *search)
+/* callback: apply the new value to the label_text string */
+static void text_entry_changed_cb(GtkWidget *widget, t_search *search)
{
- DBG ("Apply options");
- search->url = g_strdup(gtk_entry_get_text(GTK_ENTRY(search->url_entry)));
+ DBG ("text_entry_changed_cb");
search->label_text =
g_strdup(gtk_entry_get_text(GTK_ENTRY(search->label_entry)));
- search->size =
(gint)(gtk_spin_button_get_value(GTK_SPIN_BUTTON(search->size_spinner)));
- search->hide_label =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(search->hide_check));
- gtk_entry_set_width_chars(GTK_ENTRY(search->entry), search->size);
- update_search(search);
+ gtk_label_set_text(GTK_LABEL(search->label), search->label_text);
}
-/* callback: apply the new value to the url string */
-static void url_entry_activate_cb(GtkWidget *widget, t_search *search)
+/* callback: apply the new size to the entry widget */
+static void entry_size_changed_cb(GtkWidget *widget, t_search *search)
{
- DBG ("Activate url_entry");
- search->url = g_strdup(gtk_entry_get_text(GTK_ENTRY(search->url_entry)));
- update_search(search);
+ DBG ("entry_size_changed_cb");
+ search->size =
gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(search->size_spinner));
+ gtk_entry_set_width_chars(GTK_ENTRY(search->entry), search->size);
}
-/* callback: apply the new value to the label_text string */
-static void text_entry_activate_cb(GtkWidget *widget, t_search *search)
+static gboolean hide_check_toggled_cb(GtkWidget *widget, gboolean is_active,
t_search *search)
{
- DBG ("text_entry_activate_cb");
- search->label_text =
g_strdup(gtk_entry_get_text(GTK_ENTRY(search->label_entry)));
- update_search(search);
+ DBG ("hide_check_toggled_cb");
+ search->hide_label = is_active;
+ gtk_widget_set_sensitive (GTK_WIDGET(search->label_entry), !is_active);
+ gtk_widget_set_visible (search->label, !is_active);
+ gtk_switch_set_state(GTK_SWITCH(search->hide_check), is_active);
+ return TRUE;
}
static gboolean entry_buttonpress_cb(GtkWidget *entry, GdkEventButton *event,
XfcePanelPlugin *plugin)
{
GtkWidget *toplevel = gtk_widget_get_toplevel (entry);
- if (event->button != 3 && toplevel && toplevel->window) {
+ if (event->button != 3 && toplevel && gtk_widget_get_window(toplevel)) {
xfce_panel_plugin_focus_widget (plugin, entry);
}
@@ -153,9 +146,8 @@
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:
+ case GDK_KEY_Return:
+ case GDK_KEY_KP_Enter:
key = gtk_entry_get_text(GTK_ENTRY(entry));
if (do_search(search->url, key)) {
@@ -173,13 +165,12 @@
static t_search *search_new(XfcePanelPlugin *plugin)
{
t_search *search;
- GtkWidget *align;
gchar* filename;
-
+
search = g_new0(t_search, 1);
- 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(align), search->box);
+ search->box = gtk_box_new(!xfce_panel_plugin_get_orientation(plugin), 0);
+ gtk_widget_set_halign(GTK_WIDGET(search->box), GTK_ALIGN_CENTER);
+ gtk_widget_set_valign(GTK_WIDGET(search->box), GTK_ALIGN_CENTER);
/* default options */
search->url = "http://bugs.debian.org/";;
@@ -200,8 +191,8 @@
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), align);
- gtk_widget_show_all(align);
+ gtk_container_add( GTK_CONTAINER(plugin), search->box);
+ gtk_widget_show_all(search->box);
if (search->hide_label) {
gtk_widget_hide(search->label);
@@ -229,7 +220,7 @@
{
XfceRc* rcfile;
gchar *filename = xfce_panel_plugin_save_location(plugin, TRUE);
-
+
if( (filename!=NULL) && (rcfile = xfce_rc_simple_open(filename, FALSE)) )
{
xfce_rc_set_group(rcfile, NULL);
@@ -239,12 +230,12 @@
xfce_rc_write_bool_entry(rcfile, "hidelabel", search->hide_label);
xfce_rc_flush(rcfile);
xfce_rc_close(rcfile);
- }
+ }
}
static void search_set_size(XfcePanelPlugin *plugin,gint size, t_search
*search)
{
- /*
+ /*
g_print("Not Unimplemented yet : search_set_size");
do the resize of entry :) */
};
@@ -252,71 +243,64 @@
/* options dialog */
static void search_create_options(XfcePanelPlugin *plugin, t_search *search)
{
- GtkWidget *hbox, *vbox, *header;
+ GtkWidget *grid, *vbox;
xfce_panel_plugin_block_menu(plugin);
GtkWidget *urllabel, *textlabel, *sizelabel;
DBG ("search_create_options");
search->opt_dialog =
xfce_titled_dialog_new_with_buttons(_("Smartbookmark"),
- NULL, GTK_DIALOG_NO_SEPARATOR,
- GTK_STOCK_CLOSE, GTK_RESPONSE_OK,
+ GTK_WINDOW
(gtk_widget_get_toplevel (GTK_WIDGET (plugin))),
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ "gtk-close", GTK_RESPONSE_OK,
NULL);
-
+
xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (search->opt_dialog),
_("Preferences"));
gtk_window_set_icon_name (GTK_WINDOW (search->opt_dialog),
"system-search");
- gtk_container_set_border_width(GTK_CONTAINER (search->opt_dialog), 2);
-
- vbox = gtk_vbox_new(FALSE, 0);
- gtk_widget_show(vbox);
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(search->opt_dialog)->vbox),
vbox);
-
- DBG ("Creating hbox");
- hbox = gtk_hbox_new(FALSE, 0);
- gtk_widget_show(hbox);
- gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5);
+ vbox = gtk_dialog_get_content_area (GTK_DIALOG(search->opt_dialog));
+
+ grid = gtk_grid_new();
+ gtk_grid_set_column_spacing (GTK_GRID(grid), 5);
+ gtk_grid_set_row_spacing (GTK_GRID(grid), 5);
+ gtk_container_set_border_width(GTK_CONTAINER(grid), 6);
+ gtk_box_pack_start(GTK_BOX(vbox), grid, FALSE, FALSE, 0);
/* text label */
textlabel = gtk_label_new(_("Label:"));
gtk_widget_show(textlabel);
- gtk_box_pack_start(GTK_BOX(hbox), textlabel, FALSE, FALSE, 5);
+ gtk_grid_attach(GTK_GRID(grid), textlabel, 0, 0, 1, 1);
/* text entry */
search->label_entry = gtk_entry_new();
gtk_widget_show(search->label_entry);
- gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(search->label_entry), FALSE,
FALSE, 0);
+ gtk_grid_attach(GTK_GRID(grid), GTK_WIDGET(search->label_entry), 1, 0, 1,
1);
+ gtk_widget_set_sensitive (GTK_WIDGET(search->label_entry),
!search->hide_label);
/* text field */
if(search->label_text)
gtk_entry_set_text(GTK_ENTRY(search->label_entry), search->label_text);
//DBG("connect signal");
- g_signal_connect (GTK_WIDGET(search->label_entry), "activate", G_CALLBACK
(text_entry_activate_cb), search);
+ g_signal_connect (GTK_WIDGET(search->label_entry), "changed", G_CALLBACK
(text_entry_changed_cb), search);
+
+ /* Hide label option */
+ search->hide_check = gtk_switch_new();
+ gtk_widget_set_tooltip_text(GTK_WIDGET(search->hide_check),_("Hide
label"));
+ gtk_switch_set_active(GTK_SWITCH(search->hide_check),
+ search->hide_label);
+ gtk_grid_attach(GTK_GRID(grid), GTK_WIDGET(search->hide_check), 2, 0, 1,
1);
+ g_signal_connect (GTK_WIDGET(search->hide_check), "state-set", G_CALLBACK
(hide_check_toggled_cb), search);
/* size label */
sizelabel = gtk_label_new(_("Size:"));
- gtk_widget_show(sizelabel);
- gtk_box_pack_start(GTK_BOX(hbox), sizelabel, FALSE, FALSE, 5);
-
+ gtk_grid_attach(GTK_GRID(grid), sizelabel, 0, 1, 1, 1);
/* size spinner */
- GtkObject* spinner_adj = gtk_adjustment_new (search->size, 2.0, 10.0, 1.0,
5.0, 0);
+ GtkAdjustment* spinner_adj = gtk_adjustment_new (search->size, 2.0, 30.0,
1.0, 5.0, 0);
search->size_spinner = gtk_spin_button_new(GTK_ADJUSTMENT(spinner_adj),
1.0, 0);
- gtk_box_pack_start(GTK_BOX(hbox), search->size_spinner, FALSE, FALSE, 0);
- gtk_widget_show(search->size_spinner);
+ gtk_grid_attach(GTK_GRID(grid), GTK_WIDGET(search->size_spinner), 1, 1, 1,
1);
+ g_signal_connect (GTK_WIDGET(search->size_spinner), "value-changed",
G_CALLBACK (entry_size_changed_cb), search);
- /* Hide label option */
- search->hide_check = gtk_check_button_new_with_label(_("Hide label"));
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(search->hide_check),
- search->hide_label);
- gtk_box_pack_start(GTK_BOX(hbox), search->hide_check, FALSE, FALSE, 5);
- gtk_widget_show(search->hide_check);
-
- DBG ("Creating second hbox");
- hbox = gtk_hbox_new(FALSE, 0);
- gtk_widget_show(hbox);
- gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5);
/* url label */
urllabel = gtk_label_new(_("URL: "));
gtk_label_set_use_markup(GTK_LABEL(urllabel), TRUE);
- gtk_widget_show(urllabel);
- gtk_box_pack_start(GTK_BOX(hbox), urllabel, FALSE, FALSE, 5);
+ gtk_grid_attach(GTK_GRID(grid), urllabel, 0, 2, 1, 1);
/* url entry */
search->url_entry = gtk_entry_new();
gtk_entry_set_width_chars(GTK_ENTRY(search->url_entry), 42);
@@ -324,11 +308,11 @@
/* url field */
if(search->url!=NULL)
gtk_entry_set_text(GTK_ENTRY(search->url_entry), search->url);
- g_signal_connect (GTK_WIDGET(search->url_entry), "activate", G_CALLBACK
(url_entry_activate_cb), search);
- gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(search->url_entry), FALSE,
FALSE, 0);
-
+ g_signal_connect (GTK_WIDGET(search->url_entry), "changed", G_CALLBACK
(url_entry_changed_cb), search);
+ gtk_grid_attach(GTK_GRID(grid), GTK_WIDGET(search->url_entry), 1, 2, 2, 1);
+
+ gtk_widget_show_all(search->opt_dialog);
gtk_dialog_run (GTK_DIALOG(search->opt_dialog));
- search_apply_options_cb(search);
gtk_widget_destroy(search->opt_dialog);
xfce_panel_plugin_unblock_menu(plugin);
search_write_config(plugin, search);
@@ -354,4 +338,3 @@
g_signal_connect (plugin, "configure-plugin",
G_CALLBACK (search_create_options), search);
}
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/xfce4-smartbookmark-plugin-0.4.6/src/smartbookmark.desktop.in
new/xfce4-smartbookmark-plugin-0.5.0/src/smartbookmark.desktop.in
--- old/xfce4-smartbookmark-plugin-0.4.6/src/smartbookmark.desktop.in
2012-12-30 16:44:42.000000000 +0100
+++ new/xfce4-smartbookmark-plugin-0.5.0/src/smartbookmark.desktop.in
2016-04-27 13:50:46.000000000 +0200
@@ -5,3 +5,4 @@
Icon=system-search
X-XFCE-Module=smartbookmark
X-XFCE-Internal=FALSE
+X-XFCE-API=2.0
