Changeset eac542b8dbbb0cd226442fbe8494256371810a8a

Timestamp:

07/19/09 00:21:28 (3 years ago)

Author:

Leo Antunes <leo@…>

Children:

c5606aa8a15998dd28faee8a3141cb8ac83b8d24

Parents:

ebf9132bb918ff995e2b561867be329ec3e9a9ee

git-committer:

Leo Antunes <leo@…> (07/19/09 00:21:28)

Message:

add option to activate only if Available

Files:

• ChangeLog (modified) (1 diff)
• awayonlock.c (modified) (6 diffs)
• callback.c (modified) (3 diffs)
• i18n/pidgin-awayonlock.pot (modified) (2 diffs)
• i18n/pt_BR.po (modified) (6 diffs)
• prefs.c (modified) (3 diffs)
• prefs.h (modified) (2 diffs)

ChangeLog

@@ +1 @@
+Version 0.3 (??-??-2009):
+
+        - add option to activate only if Available
+
 Version 0.2.2 (2009-07-14):
 

awayonlock.c

@@ -2 +2 @@
  awayonlock - plugin to set away status on screensaver activation
  Copyright (C) 2009  Leo Antunes <leo@costela.net>
- 
+
  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 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
@@ -21 +21 @@
 #define PURPLE_PLUGINS
 
-#define AWAYONLOCK_VERSION "0.2.2"
+#define AWAYONLOCK_VERSION "0.3"
 #define AWAYONLOCK_PLUGIN_ID "core-costela-awayonlock"
 
@@ -54 +54 @@
 
         purple_debug(PURPLE_DEBUG_INFO, PACKAGE, N_("plugin_load called\n"));
-        
+
         dbus_conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
-        
-        if(dbus_conn == NULL) { 
+
+        if(dbus_conn == NULL) {
                 purple_debug(PURPLE_DEBUG_ERROR, PACKAGE, N_("failed to get DBus connection\n"));
                 purple_notify_error(plugin, "Away-on-lock", _("Failed to get a DBus connection."), g_strdup_printf("DBus error: %s\n",error->message));
                 return FALSE;
         }
-        
+
 
         /*
@@ -136 +136 @@
         0,
         N_("http://costela.net/projects/awayonlock"),
-        
+
         plugin_load,
         plugin_unload,
@@ -154 +154 @@
 {
         bindtextdomain(PACKAGE, LOCALEDIR);
-        
+
         info.name = _("Away-on-lock");
         info.summary = _("Sets you as away when your screensaver is activated");
@@ -160 +160 @@
         info.author = _("Leo Antunes <leo@costela.net>");
 
-        purple_prefs_add_none("/plugins/core/awayonlock");
-        purple_prefs_add_string("/plugins/core/awayonlock/status", NULL);
+        purple_prefs_add_none(AWAYONLOCK_PREF_ROOT);
+        purple_prefs_add_string(AWAYONLOCK_PREF_STATUS, NULL);
+        purple_prefs_add_bool(AWAYONLOCK_PREF_AVAILABLE_ONLY, 0);
 }
 

callback.c

@@ -2 +2 @@
  awayonlock - plugin to set away status on screensaver activation
  Copyright (C) 2009  Leo Antunes <leo@costela.net>
- 
+
  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 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
@@ -44 +44 @@
         }
 
+        gboolean available_only = purple_prefs_get_bool(AWAYONLOCK_PREF_AVAILABLE_ONLY);
 
         PurpleSavedStatus *status_current = purple_savedstatus_get_current();
 
-        if(screensaver_status && (purple_savedstatus_get_type(status_current) != PURPLE_STATUS_OFFLINE && purple_savedstatus_get_type(status_current) != PURPLE_STATUS_INVISIBLE) && ! purple_savedstatus_is_idleaway()) {
+        if(screensaver_status && ! purple_savedstatus_is_idleaway() && ((!available_only && purple_savedstatus_get_type(status_current) != PURPLE_STATUS_OFFLINE && purple_savedstatus_get_type(status_current) != PURPLE_STATUS_INVISIBLE) || purple_savedstatus_get_type(status_current) == PURPLE_STATUS_AVAILABLE)) {
                 status_saved = status_current;
-                purple_debug(PURPLE_DEBUG_INFO, PACKAGE, N_("setting status as away and storing '%s'\n"), purple_savedstatus_get_title(status_saved));
+                purple_debug(PURPLE_DEBUG_INFO, PACKAGE, N_("setting status as '%s' and storing '%s'\n"), purple_savedstatus_get_title(status_idle), purple_savedstatus_get_title(status_saved));
                 purple_savedstatus_activate(status_idle);
         }
@@ -57 +58 @@
                 status_saved = NULL;
         }
+        else {
+                purple_debug(PURPLE_DEBUG_INFO, PACKAGE, N_("ignoring...\n"));
+        }
 }
 

i18n/pidgin-awayonlock.pot

@@ -9 +9 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-01 22:51+0200\n"
+"POT-Creation-Date: 2009-07-19 00:16+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -50 +50 @@
 msgid "Default away status"
 msgstr ""
+
+#: prefs.c:65
+msgid "Activate only if available"
+msgstr ""

i18n/pt_BR.po

@@ -1 +1 @@
 # #-#-#-#-#  pidgin-awayonlock.pot (PACKAGE VERSION)  #-#-#-#-#
-# 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.
+# pidgin plugin to set as away on screensaver activation.
+# Copyright (C) 2009
+# This file is distributed under the same license as the awayonlock package.
+# Leo Antunes <leo@costela.net>.
 #
 # #-#-#-#-#  pt_BR.po (PACKAGE VERSION)  #-#-#-#-#
-# Portuguese translations for PACKAGE package.
-# Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#  <leo@costela.net>, 2009.
+# Portuguese translations for awayonlock package.
+# Copyright (C) 2009 Leo Antunes <leo@costela.net>
+# This file is distributed under the same license as the awayonlock package.
+# Leo Antunes <leo@costela.net>, 2009.
 #
 #, fuzzy
@@ -16 +16 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-01 22:51+0200\n"
+"POT-Creation-Date: 2009-07-19 00:16+0200\n"
 "PO-Revision-Date: 2009-01-31 22:13+0100\n"
 "Last-Translator:  <leo@costela.net>\n"
@@ -26 +26 @@
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: awayonlock.c:157
-msgid "Away-on-lock"
-msgstr ""
-
-#: prefs.c:44
-msgid "Default away status"
-msgstr "Status ausente padrão"
+#: awayonlock.c:61
+msgid "Failed to get a DBus connection."
+msgstr "Falha ao conseguir uma conexão DBus"
 
 #: awayonlock.c:77
@@ -38 +34 @@
 msgstr "Falha ao criar um Proxy DBus"
 
-#: awayonlock.c:61
-msgid "Failed to get a DBus connection."
-msgstr "Falha ao conseguir uma conexão DBus"
-
-#: awayonlock.c:160
-msgid "Leo Antunes <leo@costela.net>"
+#: awayonlock.c:157
+msgid "Away-on-lock"
 msgstr ""
 
@@ -49 +41 @@
 msgid "Sets you as away when your screensaver is activated"
 msgstr "Define status como ausente quando o salva-tela é ativado"
-
-#: prefs.c:42
-msgid "Status to set on screensaver activation"
-msgstr "Status para usar quando o salva-tela for ativado"
 
 #: awayonlock.c:159
@@ -61 +49 @@
 "Este plugin define o status atual como o status ausente padrão quando o "
 "salva-tela é ativado"
+
+#: awayonlock.c:160
+msgid "Leo Antunes <leo@costela.net>"
+msgstr ""
+
+#: prefs.c:42
+msgid "Status to set on screensaver activation"
+msgstr "Status para usar quando o salva-tela for ativado"
+
+#: prefs.c:44
+msgid "Default away status"
+msgstr "Status ausente padrão"
+
+#: prefs.c:65
+msgid "Activate only if available"
+msgstr "Ativar somente quando disponível"

prefs.c

@@ -2 +2 @@
  awayonlock - plugin to set away status on screensaver activation
  Copyright (C) 2009  Leo Antunes <leo@costela.net>
- 
+
  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 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
@@ -54 +54 @@
                         purple_plugin_pref_add_choice(ppref, (gchar *)purple_savedstatus_get_title(statuses->data), creation_time);
                         /*
-                         * FIXME: memleak! how can we free this after the frame has 
-                         * been destroyed? Alternatively, how could we pass a
-                         * pointer to the original creation_time inside the
-                         * PurpleSavedStatus struct?
+                         * FIXME: memleak! how can we free this after the frame has
+                         * been destroyed?
                          */
                         //g_free(creation_time);
@@ -64 +62 @@
         purple_plugin_pref_frame_add(frame, ppref);
         g_list_free(statuses);
+
+        ppref = purple_plugin_pref_new_with_name_and_label(AWAYONLOCK_PREF_AVAILABLE_ONLY, _("Activate only if available"));
+        purple_plugin_pref_frame_add(frame, ppref);
 
         return frame;

prefs.h

@@ -2 +2 @@
  awayonlock - plugin to set away status on screensaver activation
  Copyright (C) 2009  Leo Antunes <leo@costela.net>
- 
+
  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 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
@@ -26 +26 @@
 #include <savedstatuses.h>
 
+#define AWAYONLOCK_PREF_ROOT "/plugins/core/awayonlock"
 #define AWAYONLOCK_PREF_STATUS "/plugins/core/awayonlock/status"
+#define AWAYONLOCK_PREF_AVAILABLE_ONLY "/plugins/core/awayonlock/available_only"
 
 PurplePluginPrefFrame* get_prefs_frame(PurplePlugin*);