[Xfce4-commits] xfdesktop:master More Pre-GTK3 stuff
Updating branch refs/heads/master
to 0e4f1538b2b899947d9f27e6bc93aa42f192cd72 (commit)
from e6bd7954ab1e9e4fe3a102399a40730bdd61370b (commit)
commit 0e4f1538b2b899947d9f27e6bc93aa42f192cd72
Author: Eric Koegel eric.koe...@gmail.com
Date: Mon Sep 16 09:45:38 2013 +0300
More Pre-GTK3 stuff
Switch to using GDK_KEY_, gseal a drag action, and add GTK_LIBS for
the xfdesktop-settings app.
settings/Makefile.am |3 ++-
src/xfdesktop-file-icon-manager.c | 26 +-
2 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/settings/Makefile.am b/settings/Makefile.am
index 640dd6a..b8f68cf 100644
--- a/settings/Makefile.am
+++ b/settings/Makefile.am
@@ -29,7 +29,8 @@ xfdesktop_settings_LDADD =
\
$(LIBEXO_LIBS)
\
$(GTHREAD_LIBS)
\
$(LIBWNCK_LIBS)
\
- $(LIBX11_LIBS)
+ $(LIBX11_LIBS)
\
+ $(GTK_LIBS)
if HAVE_CYGWIN
xfdesktop_settings_LDADD += \
diff --git a/src/xfdesktop-file-icon-manager.c
b/src/xfdesktop-file-icon-manager.c
index 46342d5..0ae54c2 100644
--- a/src/xfdesktop-file-icon-manager.c
+++ b/src/xfdesktop-file-icon-manager.c
@@ -2176,15 +2176,15 @@ xfdesktop_file_icon_manager_key_press(GtkWidget *widget,
gboolean force_delete = FALSE;
switch(evt-keyval) {
-case GDK_Delete:
-case GDK_KP_Delete:
+case GDK_KEY_Delete:
+case GDK_KEY_KP_Delete:
if(evt-state GDK_SHIFT_MASK)
force_delete = TRUE;
xfdesktop_file_icon_manager_delete_selected(fmanager,
force_delete);
break;
-case GDK_c:
-case GDK_C:
+case GDK_KEY_c:
+case GDK_KEY_C:
if(!(evt-state GDK_CONTROL_MASK)
|| (evt-state (GDK_SHIFT_MASK|GDK_MOD1_MASK|GDK_MOD4_MASK)))
{
@@ -2198,8 +2198,8 @@ xfdesktop_file_icon_manager_key_press(GtkWidget *widget,
}
break;
-case GDK_x:
-case GDK_X:
+case GDK_KEY_x:
+case GDK_KEY_X:
if(!(evt-state GDK_CONTROL_MASK)
|| (evt-state (GDK_SHIFT_MASK|GDK_MOD1_MASK|GDK_MOD4_MASK)))
{
@@ -2213,8 +2213,8 @@ xfdesktop_file_icon_manager_key_press(GtkWidget *widget,
}
return TRUE;
-case GDK_v:
-case GDK_V:
+case GDK_KEY_v:
+case GDK_KEY_V:
if(!(evt-state GDK_CONTROL_MASK)
|| (evt-state (GDK_SHIFT_MASK|GDK_MOD1_MASK|GDK_MOD4_MASK)))
{
@@ -2225,19 +2225,19 @@ xfdesktop_file_icon_manager_key_press(GtkWidget *widget,
}
return TRUE;
-case GDK_r:
-case GDK_R:
+case GDK_KEY_r:
+case GDK_KEY_R:
if(!(evt-state GDK_CONTROL_MASK)
|| (evt-state (GDK_SHIFT_MASK|GDK_MOD1_MASK|GDK_MOD4_MASK)))
{
return FALSE;
}
/* fall through */
-case GDK_F5:
+case GDK_KEY_F5:
xfdesktop_file_icon_manager_refresh_icons(fmanager);
return TRUE;
-case GDK_F2:
+case GDK_KEY_F2:
selected =
xfdesktop_icon_view_get_selected_items(fmanager-priv-icon_view);
if(g_list_length(selected) == 1) {
XfdesktopFileIcon *icon = XFDESKTOP_FILE_ICON(selected-data);
@@ -3345,7 +3345,7 @@
xfdesktop_file_icon_manager_propose_drop_action(XfdesktopIconViewManager *manage
const gchar *src_name, *dest_name;
if(info == TARGET_TEXT_URI_LIST action == GDK_ACTION_COPY
- (context-actions GDK_ACTION_MOVE) != 0) {
+ (gdk_drag_context_get_actions(context) GDK_ACTION_MOVE) != 0)
{
if(drop_icon) {
file_icon = XFDESKTOP_FILE_ICON(drop_icon);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfdesktop:master Fix FSF Address
Updating branch refs/heads/master to 41929e74d8ea59366e0368fcd0ca7a90b70f918d (commit) from 0e4f1538b2b899947d9f27e6bc93aa42f192cd72 (commit) commit 41929e74d8ea59366e0368fcd0ca7a90b70f918d Author: Eric Koegel eric.koe...@gmail.com Date: Mon Sep 16 10:17:02 2013 +0300 Fix FSF Address common/xfdesktop-common.c |4 ++-- common/xfdesktop-common.h |4 ++-- common/xfdesktop-thumbnailer.c |4 ++-- common/xfdesktop-thumbnailer.h |4 ++-- settings/main.c |4 ++-- src/main.c |4 ++-- src/menu.c |4 ++-- src/menu.h |4 ++-- src/windowlist.c|4 ++-- src/windowlist.h|4 ++-- src/xfce-backdrop.c |4 ++-- src/xfce-backdrop.h |4 ++-- src/xfce-desktop-menu.c |4 ++-- src/xfce-desktop-menu.h |4 ++-- src/xfce-desktop.c |4 ++-- src/xfce-desktop.h |4 ++-- src/xfce-workspace.c|4 ++-- src/xfce-workspace.h|4 ++-- src/xfdesktop-app-menu-item.c |7 +++ src/xfdesktop-app-menu-item.h |7 +++ src/xfdesktop-clipboard-manager.c |6 +++--- src/xfdesktop-clipboard-manager.h |6 +++--- src/xfdesktop-file-icon-manager.c |4 ++-- src/xfdesktop-file-icon-manager.h |4 ++-- src/xfdesktop-file-icon.c |4 ++-- src/xfdesktop-file-icon.h |4 ++-- src/xfdesktop-file-utils.c |4 ++-- src/xfdesktop-file-utils.h |4 ++-- src/xfdesktop-icon-view-manager.c |4 ++-- src/xfdesktop-icon-view-manager.h |4 ++-- src/xfdesktop-icon-view.c |4 ++-- src/xfdesktop-icon-view.h |4 ++-- src/xfdesktop-icon.c|4 ++-- src/xfdesktop-icon.h|4 ++-- src/xfdesktop-notify.c |7 +++ src/xfdesktop-notify.h |7 +++ src/xfdesktop-regular-file-icon.c |4 ++-- src/xfdesktop-regular-file-icon.h |4 ++-- src/xfdesktop-special-file-icon.c |4 ++-- src/xfdesktop-special-file-icon.h |4 ++-- src/xfdesktop-volume-icon.c |4 ++-- src/xfdesktop-volume-icon.h |4 ++-- src/xfdesktop-window-icon-manager.c |4 ++-- src/xfdesktop-window-icon-manager.h |4 ++-- src/xfdesktop-window-icon.c |4 ++-- src/xfdesktop-window-icon.h |4 ++-- 46 files changed, 98 insertions(+), 102 deletions(-) diff --git a/common/xfdesktop-common.c b/common/xfdesktop-common.c index f36d9fa..65f0214 100644 --- a/common/xfdesktop-common.c +++ b/common/xfdesktop-common.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ #ifdef HAVE_CONFIG_H diff --git a/common/xfdesktop-common.h b/common/xfdesktop-common.h index 8e5947c..732fbc9 100644 --- a/common/xfdesktop-common.h +++ b/common/xfdesktop-common.h @@ -15,8 +15,8 @@ * 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. + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * * Random portions taken from or inspired by the original xfdesktop for xfce4: * Copyright (C) 2002-2003 Jasper Huijsmans (huysm...@users.sourceforge.net) diff --git a/common/xfdesktop-thumbnailer.c b/common/xfdesktop-thumbnailer.c index 2c735df..1cb93f9 100644 --- a/common/xfdesktop-thumbnailer.c +++ b/common/xfdesktop-thumbnailer.c @@ -16,8 +16,8 @@ * 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. + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * * xfdesktop-thumbnailer is based on thumbnailer code from Ristretto * Copyright (c) Stephan Arts 2009-2011 step...@xfce.org diff --git a/common/xfdesktop-thumbnailer.h b/common/xfdesktop-thumbnailer.h index c7ea4c5..96876b0 100644 --- a/common/xfdesktop-thumbnailer.h +++ b/common/xfdesktop-thumbnailer.h @@ -16,8 +16,8 @@ *
[Xfce4-commits] xfce4-mailwatch-plugin:master Update TODO list
Updating branch refs/heads/master to c08e32024aa3653186e5b4d77ef7fbe790a1690b (commit) from ca47c0a028fde6c69aaeacb763de0198ac559376 (commit) commit c08e32024aa3653186e5b4d77ef7fbe790a1690b Author: Ján Sučan su...@runbox.com Date: Mon Sep 16 12:38:13 2013 +0200 Update TODO list TODO | 12 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/TODO b/TODO index 243466b..73abfad 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,8 @@ -* for the threaded code, use joinable threads rather than waiting on thread - pointers. though the upside of the current approach is that i could - process gtk events in that loop if i wanted -* gio/thunar-vfs file monitoring support for the local mail spool options +* Comment the code. + +* For the threaded code, use joinable threads rather than waiting on + thread pointers. Though the upside of the current approach is that + we could process gtk events in that loop if we wanted. + +* gio/thunar-vfs file monitoring support for the local mail spool + options. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-mailwatch-plugin:master Fix comparing of signed and unsigned integer
Updating branch refs/heads/master
to c1151ebf140f53eb64eea26316dfb4a2f2716a8f (commit)
from c08e32024aa3653186e5b4d77ef7fbe790a1690b (commit)
commit c1151ebf140f53eb64eea26316dfb4a2f2716a8f
Author: Ján Sučan su...@runbox.com
Date: Mon Sep 16 12:45:00 2013 +0200
Fix comparing of signed and unsigned integer
libmailwatch-core/mailwatch-mailbox-gmail.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libmailwatch-core/mailwatch-mailbox-gmail.c
b/libmailwatch-core/mailwatch-mailbox-gmail.c
index 7f39c4d..fde3233 100644
--- a/libmailwatch-core/mailwatch-mailbox-gmail.c
+++ b/libmailwatch-core/mailwatch-mailbox-gmail.c
@@ -497,7 +497,7 @@ gmail_config_timeout_spinbutton_changed_cb(GtkSpinButton
*sb,
gpointer user_data)
{
XfceMailwatchGMailMailbox *gmailbox =
XFCE_MAILWATCH_GMAIL_MAILBOX(user_data);
-gint value = gtk_spin_button_get_value_as_int(sb) * 60;
+guint value = (guint) gtk_spin_button_get_value_as_int(sb) * 60;
if(value == gmailbox-timeout)
return FALSE;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-mailwatch-plugin:master Fix 'uninitialized variable' warnings
Updating branch refs/heads/master
to e5a1b9c44e5c8faeb3d19c18b05691e7f187ed56 (commit)
from c1151ebf140f53eb64eea26316dfb4a2f2716a8f (commit)
commit e5a1b9c44e5c8faeb3d19c18b05691e7f187ed56
Author: Ján Sučan su...@runbox.com
Date: Mon Sep 16 13:07:16 2013 +0200
Fix 'uninitialized variable' warnings
panel-plugin/mailwatch-plugin.c |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/panel-plugin/mailwatch-plugin.c b/panel-plugin/mailwatch-plugin.c
index 35beaa8..68f1fde 100644
--- a/panel-plugin/mailwatch-plugin.c
+++ b/panel-plugin/mailwatch-plugin.c
@@ -765,9 +765,10 @@ mailwatch_iconbtn_clicked_cb(GtkWidget *w,
XfceMailwatchPlugin *mwp)
if(gtk_dialog_run(GTK_DIALOG(chooser)) == GTK_RESPONSE_ACCEPT) {
gchar *filename =
exo_icon_chooser_dialog_get_icon(EXO_ICON_CHOOSER_DIALOG(chooser));
if(filename) {
-GtkWidget *label, *image, *vbox;
-GdkPixbuf **icon_pix;
-gchar **icon_path;
+GtkWidget *image, *vbox;
+GtkWidget *label = NULL;
+GdkPixbuf **icon_pix = NULL;
+gchar **icon_path = NULL;
switch(icon_type) {
case ICON_TYPE_NORMAL:
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfdesktop:master I18n: Update translation is (95%).
Updating branch refs/heads/master to b44bec7cd9e8de3b9175fc7054fd81c3587db2dc (commit) from 41929e74d8ea59366e0368fcd0ca7a90b70f918d (commit) commit b44bec7cd9e8de3b9175fc7054fd81c3587db2dc Author: Sveinn í Felli svei...@nett.is Date: Mon Sep 16 18:31:48 2013 +0200 I18n: Update translation is (95%). 188 translated messages, 8 untranslated messages. Transifex (https://www.transifex.com/projects/p/xfce/). po/is.po | 30 +++--- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/po/is.po b/po/is.po index d3cfe5e..38e065a 100644 --- a/po/is.po +++ b/po/is.po @@ -9,7 +9,7 @@ msgstr Project-Id-Version: Xfdesktop\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2013-08-31 06:32+0200\n -PO-Revision-Date: 2013-09-13 16:21+\n +PO-Revision-Date: 2013-09-16 13:50+\n Last-Translator: Sveinn í Felli svei...@nett.is\n Language-Team: Icelandic (http://www.transifex.com/projects/p/xfce/language/is/)\n MIME-Version: 1.0\n @@ -47,34 +47,34 @@ msgstr b%s/b\nTegund: %s\nStærð: %s #: ../settings/main.c:667 #, c-format msgid Wallpaper for Monitor %d (%s) -msgstr +msgstr Bakgrunnsmynd fyrir skjá %d (%s) #: ../settings/main.c:670 #, c-format msgid Wallpaper for Monitor %d -msgstr +msgstr Bakgrunnsmynd fyrir skjá %d #: ../settings/main.c:676 #, c-format msgid Wallpaper for %s on Monitor %d (%s) -msgstr +msgstr Bakgrunnsmynd fyrir %s á skjá %d (%s) #: ../settings/main.c:680 #, c-format msgid Wallpaper for %s on Monitor %d -msgstr +msgstr Bakgrunnsmynd fyrir %s á skjá %d #. Single monitor and single workspace #: ../settings/main.c:687 #, c-format msgid Wallpaper for my desktop -msgstr +msgstr Bakgrunnsmynd fyrir skjáborðið mitt #. Single monitor and per workspace wallpaper #: ../settings/main.c:690 #, c-format msgid Wallpaper for %s -msgstr +msgstr Bakgrunnsmynd fyrir %s #: ../settings/main.c:982 msgid Image selection is unavailable while the image style is set to None. @@ -221,7 +221,7 @@ msgstr Beita á öll _vinnusvæði #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:23 msgid _Change the background (in minutes): -msgstr +msgstr S_kipta um bakgrunn (bið í mínútum) #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:24 msgid @@ -397,7 +397,7 @@ msgstr Láta gluggalista spretta upp (við músarbendil) #: ../src/main.c:246 msgid Automatically arrange all the icons on the desktop -msgstr +msgstr Raða táknmyndum sjálfvirkt á skjáborðinu #: ../src/main.c:248 msgid Cause xfdesktop to quit @@ -465,19 +465,19 @@ msgstr Fjarlægja vinnusvæði %d msgid Do you really want to remove workspace %d?\n Note: You are currently on workspace %d. -msgstr +msgstr Viltu í alvörunni fjarlægja vinnusvæði %d?\nATH: Þú ert núna á vinnusvæði %d. #: ../src/windowlist.c:77 #, c-format msgid Remove Workspace '%s' -msgstr +msgstr Fjarlægja vinnusvæði '%s' #: ../src/windowlist.c:78 #, c-format msgid Do you really want to remove workspace '%s'?\n Note: You are currently on workspace '%s'. -msgstr +msgstr Viltu í alvörunni fjarlægja vinnusvæði '%s'?\nATH: Þú ert núna á vinnusvæði '%s'. #. Popup a dialog box confirming that the user wants to remove a #. * workspace @@ -775,7 +775,7 @@ msgstr Mistókst að keyra \%s\ #: ../src/xfdesktop-file-utils.c:1206 msgid The application chooser could not be opened -msgstr +msgstr Ekki var hægt að opna forritaveljarann #: ../src/xfdesktop-file-utils.c:1264 ../src/xfdesktop-file-utils.c:1278 #: ../src/xfdesktop-file-utils.c:1340 ../src/xfdesktop-file-utils.c:1356 @@ -820,7 +820,7 @@ msgstr Aftengingu lokið #: ../src/xfdesktop-notify.c:224 ../src/xfdesktop-notify.c:408 #, c-format msgid The device \%s\ has been safely removed from the system. -msgstr +msgstr Tækið \%s\ hefur verið fjarlægt úr kerfinu á öruggan hátt. #. TRANSLATORS: Please use the same translation here as in Thunar #: ../src/xfdesktop-notify.c:313 @@ -835,7 +835,7 @@ msgstr Verið er að spýta út tækinu \%s\. Þetta getur tekið smátíma #: ../src/xfdesktop-notify.c:406 msgid Eject Finished -msgstr +msgstr Útspýtingu lokið #: ../src/xfdesktop-regular-file-icon.c:569 #, c-format ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master I18n: Update translation is (86%).
Updating branch refs/heads/master to d0308187cea84da55d35ea1c88f0641d1cd83ddb (commit) from f7f177df61329c5db6eb842e26f68346823c40de (commit) commit d0308187cea84da55d35ea1c88f0641d1cd83ddb Author: Sveinn í Felli svei...@nett.is Date: Mon Sep 16 18:30:17 2013 +0200 I18n: Update translation is (86%). 636 translated messages, 98 untranslated messages. Transifex (https://www.transifex.com/projects/p/xfce/). po/is.po | 412 +++--- 1 file changed, 206 insertions(+), 206 deletions(-) diff --git a/po/is.po b/po/is.po index d773c58..4532af0 100644 --- a/po/is.po +++ b/po/is.po @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Sveinn í Felli svei...@nett.is, 2011-2012 +# Sveinn í Felli svei...@nett.is, 2011-2013 # Sveinn í Felli svei...@nett.is, 2013 msgid msgstr Project-Id-Version: Thunar\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2013-07-30 00:30+0200\n -PO-Revision-Date: 2013-09-13 16:30+\n +PO-Revision-Date: 2013-09-16 13:51+\n Last-Translator: Sveinn í Felli svei...@nett.is\n Language-Team: Icelandic (http://www.transifex.com/projects/p/xfce/language/is/)\n MIME-Version: 1.0\n @@ -557,16 +557,16 @@ msgstr #: ../thunar/thunar-dbus-service.c:1046 #, c-format msgid A destination directory must be specified -msgstr +msgstr Það verður að tilgreina úttaksmöppu #: ../thunar/thunar-dbus-service.c:1249 #, c-format msgid At least one filename must be specified -msgstr +msgstr Að minnsta kosti eitt skráarheiti verður að vera tilgreint #: ../thunar/thunar-details-view.c:134 msgid Configure _Columns... -msgstr +msgstr Stilla _dálka... #: ../thunar/thunar-details-view.c:134 msgid Configure the columns in the detailed list view @@ -574,25 +574,25 @@ msgstr #: ../thunar/thunar-details-view.c:392 msgid Detailed directory listing -msgstr +msgstr Ítarlegur listi með innihaldi möppu #: ../thunar/thunar-details-view.c:393 msgid Details view -msgstr +msgstr Ítarleg sýn #. create a new dialog window #: ../thunar/thunar-dialogs.c:93 #, c-format msgid Rename \%s\ -msgstr +msgstr Endurnefna \%s\ #: ../thunar/thunar-dialogs.c:100 msgid _Rename -msgstr +msgstr Endu_rnefna #: ../thunar/thunar-dialogs.c:264 msgid translator-credits -msgstr Sveinn í Felli, svei...@nett.is +msgstr Sveinn í Felli, svei...@nett.is #: ../thunar/thunar-dialogs.c:425 msgid _Yes @@ -1131,87 +1131,87 @@ msgstr[1] Opna völdu skrárnar með sjálfgefnu forritunum #: ../thunar/thunar-launcher.c:1023 #, c-format msgid Open With \%s\ -msgstr +msgstr Opna með \%s\ #: ../thunar/thunar-launcher.c:1580 ../thunar/thunar-shortcuts-view.c:1689 #: ../thunar/thunar-shortcuts-view.c:1926 ../thunar/thunar-tree-view.c:1959 #, c-format msgid Failed to mount \%s\ -msgstr +msgstr Mistókst að tengja \%s\ #: ../thunar/thunar-launcher.c:1697 msgid Desktop (Create Link) msgid_plural Desktop (Create Links) -msgstr[0] -msgstr[1] +msgstr[0] Skjáborð (búa til tengil) +msgstr[1] Skjáborð (búa til tengla) #: ../thunar/thunar-launcher.c:1698 msgid Create a link to the selected file on the desktop msgid_plural Create links to the selected files on the desktop -msgstr[0] -msgstr[1] +msgstr[0] Búa til tengil í völdu skrána á skjáborðinu +msgstr[1] Búa til tengil í völdu skrárnar á skjáborðinu #: ../thunar/thunar-launcher.c:1732 ../thunar/thunar-launcher.c:1784 #, c-format msgid Send the selected file to \%s\ msgid_plural Send the selected files to \%s\ -msgstr[0] -msgstr[1] +msgstr[0] Senda valda skrá til \%s\ +msgstr[1] Senda valdar skrár til \%s\ #: ../thunar/thunar-list-model.c:2198 #, c-format msgid %d item (%s), Free space: %s msgid_plural %d items (%s), Free space: %s -msgstr[0] -msgstr[1] +msgstr[0] %d atriði (%s), Laust pláss: %s +msgstr[1] %d atriði (%s), Laust pláss: %s #. just the standard text #: ../thunar/thunar-list-model.c:2205 #, c-format msgid %d item, Free space: %s msgid_plural %d items, Free space: %s -msgstr[0] -msgstr[1] +msgstr[0] %d atriði, Laust pláss: %s +msgstr[1] %d atriði, Laust pláss: %s #: ../thunar/thunar-list-model.c:2214 #, c-format msgid %d item msgid_plural %d items -msgstr[0] -msgstr[1] +msgstr[0] %d atriði +msgstr[1] %d atriði #: ../thunar/thunar-list-model.c:2230 #, c-format msgid \%s\ broken link -msgstr +msgstr \%s\ rofinn tengill #: ../thunar/thunar-list-model.c:2235 #, c-format msgid \%s\ (%s) link to %s -msgstr +msgstr \%s\ (%s) tengill í %s #: ../thunar/thunar-list-model.c:2241 #, c-format msgid \%s\ shortcut -msgstr +msgstr \%s\ flýtileið #: ../thunar/thunar-list-model.c:2245 #, c-format msgid \%s\ mountable -msgstr +msgstr \%s\ tengjanlegt #. I18N, first %s is the display name of the file, 2nd the file size, 3rd the #. content type #: ../thunar/thunar-list-model.c:2252 #, c-format msgid \%s\ (%s) %s -msgstr +msgstr \%s\ (%s) %s
[Xfce4-commits] xfce4-cpufreq-plugin:master I18n: Update translation ar (100%).
Updating branch refs/heads/master to 4763c7b2b542bc33a68c3e797d63e7ccc7a9ff73 (commit) from 96743bb42d8528aa6583fa187a9b8fcbaba6fdfc (commit) commit 4763c7b2b542bc33a68c3e797d63e7ccc7a9ff73 Author: mohammad alhargan malh...@hotmail.com Date: Mon Sep 16 18:31:04 2013 +0200 I18n: Update translation ar (100%). 39 translated messages. Transifex (https://www.transifex.com/projects/p/xfce/). po/ar.po | 128 -- 1 file changed, 57 insertions(+), 71 deletions(-) diff --git a/po/ar.po b/po/ar.po index bc5f340..de44c05 100644 --- a/po/ar.po +++ b/po/ar.po @@ -1,34 +1,38 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# محمد الحرقان malh...@gmail.com, 2013 msgid msgstr -Project-Id-Version: xfce4-cpufreq-plugin\n +Project-Id-Version: Xfce Panel Plugins\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2013-08-18 09:44+0200\n -PO-Revision-Date: 2011-08-12 15:24-\n -Last-Translator: كريم أولاد الشلحة herr.linu...@gmail.com\n -Language-Team: Arabic Xfce Translation Team herr.linu...@gmail.com\n -Language: \n +POT-Creation-Date: 2013-08-30 00:31+0200\n +PO-Revision-Date: 2013-09-16 12:05+\n +Last-Translator: mohammad alhargan malh...@hotmail.com\n +Language-Team: Arabic (http://www.transifex.com/projects/p/xfce/language/ar/)\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -X-Poedit-Language: Arabic\n -X-Poedit-Country: Morocco\n -Plural-Forms: nplurals=2; plural=(n 1);\n +Language: ar\n +Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100=3 n%100=10 ? 3 : n%100=11 n%100=99 ? 4 : 5;\n #: ../panel-plugin/xfce4-cpufreq-configure.c:78 msgid Select font... -msgstr +msgstr اختر خط... #: ../panel-plugin/xfce4-cpufreq-configure.c:80 msgid Select font family and size to use for the labels. -msgstr +msgstr حدد عائلة الخط والحجم ﻻستخدامها للتسميات. #: ../panel-plugin/xfce4-cpufreq-configure.c:84 msgid Right-click to revert to the default font. -msgstr +msgstr انقر بالزر الأيمن للعودة إلى الخط الافتراضي. #: ../panel-plugin/xfce4-cpufreq-configure.c:102 msgid Select font -msgstr +msgstr اختر خط #: ../panel-plugin/xfce4-cpufreq-configure.c:188 msgid Configure CPU Frequency Monitor @@ -40,11 +44,11 @@ msgstr ضبط إضافة تردد المعالج #: ../panel-plugin/xfce4-cpufreq-configure.c:208 msgid bMonitor/b -msgstr bمراقب/b +msgstr bالشاشة/b #: ../panel-plugin/xfce4-cpufreq-configure.c:223 msgid _Update interval: -msgstr +msgstr _فترة التحديث: #: ../panel-plugin/xfce4-cpufreq-configure.c:241 msgid bPanel/b @@ -52,56 +56,50 @@ msgstr bلوحة/b #: ../panel-plugin/xfce4-cpufreq-configure.c:257 msgid _Font: -msgstr +msgstr _خط: #: ../panel-plugin/xfce4-cpufreq-configure.c:275 -#, fuzzy msgid _Display CPU: -msgstr إظهار المعالج: +msgstr _إظهار المعالج: #: ../panel-plugin/xfce4-cpufreq-configure.c:290 msgid min -msgstr +msgstr دقيقة #: ../panel-plugin/xfce4-cpufreq-configure.c:291 msgid avg -msgstr +msgstr متوسط #: ../panel-plugin/xfce4-cpufreq-configure.c:292 msgid max -msgstr +msgstr أقصى #. check buttons for display widgets in panel #: ../panel-plugin/xfce4-cpufreq-configure.c:298 msgid _Keep compact -msgstr +msgstr _الإبقاء مضغوط #: ../panel-plugin/xfce4-cpufreq-configure.c:303 msgid Show text in a single _line -msgstr +msgstr إظهار النص في _سطر واحد #: ../panel-plugin/xfce4-cpufreq-configure.c:308 -#, fuzzy msgid Show CPU _icon msgstr عرض أيقونة المعالج -#: ../panel-plugin/xfce4-cpufreq-configure.c:313 -#, fuzzy +#: ../panel-plugin/xfce4-cpufreq-configure.c:315 msgid Show CPU fre_quency msgstr إعرض تردد المعالج -#: ../panel-plugin/xfce4-cpufreq-configure.c:318 -#, fuzzy +#: ../panel-plugin/xfce4-cpufreq-configure.c:320 msgid Show CPU _governor -msgstr عرض حاكم المعالج +msgstr عرض متحكم المعالج -#: ../panel-plugin/xfce4-cpufreq-linux.c:465 +#: ../panel-plugin/xfce4-cpufreq-linux.c:485 msgid Your system does not support cpufreq.\n The applet only shows the current cpu frequency -msgstr -نظامك لا يدعم تردد المعالج.\n -البريمج يظهر تردد المعالج الحالي فقط +msgstr نظامك لا يدعم تردد المعالج.\nالبريمج يظهر تردد المعالج الحالي فقط #: ../panel-plugin/xfce4-cpufreq-overview.c:73 msgid Scaling driver: @@ -122,7 +120,7 @@ msgstr الحكام المتوفرون: #: ../panel-plugin/xfce4-cpufreq-overview.c:181 msgid Current governor: -msgstr الحاكم الحالي +msgstr الحاكم الحالي: #: ../panel-plugin/xfce4-cpufreq-overview.c:232 msgid CPU Information @@ -134,69 +132,57 @@ msgstr لمحة عامة لكل المعالجات في النظام #: ../panel-plugin/xfce4-cpufreq-plugin.c:60 msgid current min -msgstr +msgstr أقل حالياً #: ../panel-plugin/xfce4-cpufreq-plugin.c:79 msgid current avg -msgstr +msgstr متوسط الحالياً #: ../panel-plugin/xfce4-cpufreq-plugin.c:97 msgid
[Xfce4-commits] parole:bluesabre/gtk3 Add option to hide the menubar to the context-menu
Updating branch refs/heads/bluesabre/gtk3
to d7594d0c7bd9cf706e36b8beb9055ded57e020a0 (commit)
from 080c0cc842363c01880d8ebc91be73ceb6ff1cd5 (commit)
commit d7594d0c7bd9cf706e36b8beb9055ded57e020a0
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Mon Sep 16 22:24:28 2013 +0200
Add option to hide the menubar to the context-menu
src/parole-player.c | 17 -
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/src/parole-player.c b/src/parole-player.c
index d6f70bc..f2c21f2 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -153,7 +153,7 @@ voidparole_player_toggle_playlist_action_cb
(GtkAction *action,
voidparole_player_fullscreen_action_cb (GtkAction *action,
ParolePlayer *player);
-
+
voidparole_player_seekf_cb (GtkWidget *widget,
ParolePlayer *player,
gdouble seek);
@@ -2003,6 +2003,11 @@ void parole_player_fullscreen_action_cb (GtkAction
*action, ParolePlayer *player
parole_player_full_screen (player, !player-priv-full_screen);
}
+void parole_player_hide_menubar_cb (GtkWidget *widget, ParolePlayer *player)
+{
+gtk_widget_set_visible(player-priv-menu_bar,
!gtk_widget_get_visible(player-priv-menu_bar));
+}
+
static void
parole_player_show_menu (ParolePlayer *player, guint button, guint
activate_time)
{
@@ -2035,6 +2040,16 @@ parole_player_show_menu (ParolePlayer *player, guint
button, guint activate_time
mi = gtk_action_create_menu_item(player-priv-media_fullscreen_action);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+/*
+ * Un/Hide menubar
+ */
+mi =
gtk_check_menu_item_new_with_label(gtk_widget_get_visible(player-priv-menu_bar)
? _(Hide menubar) : _(Show menubar));
+g_signal_connect (mi, activate,
+G_CALLBACK (parole_player_hide_menubar_cb), player);
+gtk_widget_show (mi);
+gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+
+
g_signal_connect_swapped (menu, selection-done,
G_CALLBACK (gtk_widget_destroy), menu);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-mailwatch-plugin:master Refactor the code
Updating branch refs/heads/master
to 6ea4f47de894b5d39e9f839b3e1cbf4dfea6afb4 (commit)
from e5a1b9c44e5c8faeb3d19c18b05691e7f187ed56 (commit)
commit 6ea4f47de894b5d39e9f839b3e1cbf4dfea6afb4
Author: Ján Sučan su...@runbox.com
Date: Tue Sep 17 01:37:24 2013 +0200
Refactor the code
panel-plugin/mailwatch-plugin.c | 109 ---
1 file changed, 56 insertions(+), 53 deletions(-)
diff --git a/panel-plugin/mailwatch-plugin.c b/panel-plugin/mailwatch-plugin.c
index 68f1fde..9a5da55 100644
--- a/panel-plugin/mailwatch-plugin.c
+++ b/panel-plugin/mailwatch-plugin.c
@@ -103,7 +103,7 @@ mailwatch_new_messages_changed_cb(XfceMailwatch *mailwatch,
gpointer arg,
XfceMailwatchPlugin *mwp = user_data;
guint new_messages = GPOINTER_TO_UINT( arg );
-if(new_messages == 0 mwp-newmail_icon_visible) {
+if (new_messages == 0 mwp-newmail_icon_visible) {
mwp-newmail_icon_visible = FALSE;
mwp-new_messages = 0;
mailwatch_set_size(mwp-plugin,
@@ -111,14 +111,14 @@ mailwatch_new_messages_changed_cb(XfceMailwatch
*mailwatch, gpointer arg,
mwp);
gtk_widget_set_tooltip_text(mwp-button, _(No new mail));
gtk_widget_trigger_tooltip_query(mwp-button);
-} else if(new_messages 0) {
-if(!mwp-newmail_icon_visible) {
+} else if (new_messages 0) {
+if (!mwp-newmail_icon_visible) {
mwp-newmail_icon_visible = TRUE;
mailwatch_set_size(mwp-plugin,
xfce_panel_plugin_get_size(mwp-plugin),
mwp);
}
-if(new_messages != mwp-new_messages) {
+if (new_messages != mwp-new_messages) {
GString *ttip_str = g_string_sized_new(64);
gchar **mailbox_names = NULL;
guint *new_message_counts = NULL;
@@ -132,8 +132,8 @@ mailwatch_new_messages_changed_cb(XfceMailwatch *mailwatch,
gpointer arg,
xfce_mailwatch_get_new_message_breakdown(mwp-mailwatch,
mailbox_names, new_message_counts);
-for(i = 0; mailbox_names[i]; i++) {
-if(new_message_counts[i] 0) {
+for (i = 0; mailbox_names[i]; i++) {
+if (new_message_counts[i] 0) {
g_string_append_c(ttip_str, '\n');
g_string_append_printf(ttip_str,
Q_(tells how many new messages in
each mailbox|%d in %s),
@@ -149,7 +149,7 @@ mailwatch_new_messages_changed_cb(XfceMailwatch *mailwatch,
gpointer arg,
gtk_widget_trigger_tooltip_query(mwp-button);
g_string_free(ttip_str, TRUE);
-if(mwp-new_messages_command)
+if (mwp-new_messages_command)
xfce_spawn_command_line_on_screen(gdk_screen_get_default(),
mwp-new_messages_command,
FALSE, FALSE, NULL);
@@ -162,7 +162,7 @@ mailwatch_button_press_cb(GtkWidget *w,
GdkEventButton *evt,
gpointer user_data)
{
-if(evt-button == 2)
+if (evt-button == 2)
gtk_button_pressed(GTK_BUTTON(w));
return FALSE;
@@ -174,14 +174,14 @@ mailwatch_button_release_cb(GtkWidget *w, GdkEventButton
*evt,
{
XfceMailwatchPlugin *mwp = user_data;
-if(evt-x = w-allocation.x
-evt-x w-allocation.x + w-allocation.width
-evt-y = w-allocation.y
-evt-y w-allocation.y + w-allocation.height)
+if (evt-x = w-allocation.x
+ evt-x w-allocation.x + w-allocation.width
+ evt-y = w-allocation.y
+ evt-y w-allocation.y + w-allocation.height)
{
-switch(evt-button) {
+switch (evt-button) {
case MOUSE_BUTTON_LEFT:
-if(mwp-click_command *mwp-click_command)
+if (mwp-click_command *mwp-click_command)
xfce_spawn_command_line_on_screen(gdk_screen_get_default(),
mwp-click_command,
FALSE, FALSE, NULL);
@@ -193,7 +193,7 @@ mailwatch_button_release_cb(GtkWidget *w, GdkEventButton
*evt,
}
}
-if(evt-button == MOUSE_BUTTON_MIDDLE)
+if (evt-button == MOUSE_BUTTON_MIDDLE)
gtk_button_released(GTK_BUTTON(w));
return FALSE;
@@ -210,13 +210,13 @@ mailwatch_log_message_cb(XfceMailwatch *mailwatch,
struct tm ltm;
gchar time_str[256] = , *new_message = NULL;
-if(localtime_r(entry-timestamp, ltm))
+if (localtime_r(entry-timestamp, ltm))
strftime(time_str, 256, %x %T:, ltm);
-if(entry-level = XFCE_MAILWATCH_N_LOG_LEVELS)
+if (entry-level = XFCE_MAILWATCH_N_LOG_LEVELS)
entry-level = XFCE_MAILWATCH_N_LOG_LEVELS - 1;
[Xfce4-commits] xfce4-mailwatch-plugin:master Use identifiers instead of magic numbers
Updating branch refs/heads/master
to e287bb91ab2e776766da7810de4cd3c6f2b6cff3 (commit)
from 6ea4f47de894b5d39e9f839b3e1cbf4dfea6afb4 (commit)
commit e287bb91ab2e776766da7810de4cd3c6f2b6cff3
Author: Ján Sučan su...@runbox.com
Date: Tue Sep 17 01:42:33 2013 +0200
Use identifiers instead of magic numbers
panel-plugin/mailwatch-plugin.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/panel-plugin/mailwatch-plugin.c b/panel-plugin/mailwatch-plugin.c
index 9a5da55..c3b4f16 100644
--- a/panel-plugin/mailwatch-plugin.c
+++ b/panel-plugin/mailwatch-plugin.c
@@ -162,7 +162,7 @@ mailwatch_button_press_cb(GtkWidget *w,
GdkEventButton *evt,
gpointer user_data)
{
-if (evt-button == 2)
+if (evt-button == MOUSE_BUTTON_MIDDLE)
gtk_button_pressed(GTK_BUTTON(w));
return FALSE;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-indicator-plugin:master XfceIndicatorButton: add gdk_scroll_mask
Updating branch refs/heads/master
to 82fa77eac573b8610f413587231075a5d83cf253 (commit)
from 25f6fef8209d2caf1d16f32500e74e2fbf1b2fac (commit)
commit 82fa77eac573b8610f413587231075a5d83cf253
Author: Andrzej ndrwr...@gmail.com
Date: Tue Sep 17 04:32:53 2013 +0100
XfceIndicatorButton: add gdk_scroll_mask
Fixes scroll events on indicator buttons.
panel-plugin/indicator-button.c |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/panel-plugin/indicator-button.c b/panel-plugin/indicator-button.c
index 88161a4..16504ee 100644
--- a/panel-plugin/indicator-button.c
+++ b/panel-plugin/indicator-button.c
@@ -46,7 +46,7 @@
static void xfce_indicator_button_finalize(GObject
*object);
static gboolean xfce_indicator_button_button_press(GtkWidget
*widget,
GdkEventButton *event);
-static gboolean xfce_indicator_button_scroll (GtkWidget
*widget,
+static gboolean xfce_indicator_button_scroll_event(GtkWidget
*widget,
GdkEventScroll *event);
static void xfce_indicator_button_menu_deactivate
(XfceIndicatorButton*button,
GtkMenu
*menu);
@@ -94,7 +94,7 @@ xfce_indicator_button_class_init (XfceIndicatorButtonClass
*klass)
widget_class = GTK_WIDGET_CLASS (klass);
widget_class-button_press_event = xfce_indicator_button_button_press;
- widget_class-scroll_event = xfce_indicator_button_scroll;
+ widget_class-scroll_event = xfce_indicator_button_scroll_event;
widget_class-get_preferred_width =
xfce_indicator_button_get_preferred_width;
widget_class-get_preferred_height =
xfce_indicator_button_get_preferred_height;
}
@@ -112,6 +112,8 @@ xfce_indicator_button_init (XfceIndicatorButton *button)
gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE);
gtk_widget_set_name (GTK_WIDGET (button), indicator-button);
+ gtk_widget_add_events (GTK_WIDGET (button), GDK_SCROLL_MASK);
+
button-io = NULL;
button-entry = NULL;
button-plugin = NULL;
@@ -340,7 +342,7 @@ xfce_indicator_button_button_press (GtkWidget *widget,
static gboolean
-xfce_indicator_button_scroll (GtkWidget *widget, GdkEventScroll *event)
+xfce_indicator_button_scroll_event (GtkWidget *widget, GdkEventScroll *event)
{
XfceIndicatorButton *button = XFCE_INDICATOR_BUTTON (widget);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
