Changeset e3cc7b23a6aba21796577ff44a9a3f9d855080cb

Timestamp:

07/22/09 23:26:25 (3 years ago)

Author:

Leo Antunes <leo@…>

Children:

d1a41d2b9e8293b7310d616fd8ccd24ddf38d9be

Parents:

c5606aa8a15998dd28faee8a3141cb8ac83b8d24

git-committer:

Leo Antunes <leo@…> (07/22/09 23:26:25)

Message:

KScreensaver support + close DBus on load error

- support KScreensaver (thanks Daniel Eckl for pointing out

that it indeed DOES use DBus)

- correct description to include current functionality
- avoid dangling DBus connection on error during load

Files:

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

ChangeLog

@@ +1 @@
+Version 0.4 (2009-07-22):
+
+        - support KScreensaver (thanks Daniel Eckl for pointing out
+          that it indeed DOES use DBus)
+        - correct description to include current functionality
+        - avoid dangling DBus connection on error during load
+
 Version 0.3 (2009-07-19):
 

awayonlock.c

@@ -21 +21 @@
 #define PURPLE_PLUGINS
 
-#define AWAYONLOCK_VERSION "0.3"
+#define AWAYONLOCK_VERSION "0.4"
 #define AWAYONLOCK_PLUGIN_ID "core-costela-awayonlock"
 
@@ -48 +48 @@
 
 static gboolean plugin_load(PurplePlugin *plugin) {
+        DBusGProxy *dbus_proxy_gnome = NULL;
         DBusGProxy *dbus_proxy = NULL;
         GError *error = NULL;
@@ -65 +66 @@
 
         /*
-         * Gnome-screensaver specific stuff
-         */
-        dbus_proxy = dbus_g_proxy_new_for_name( dbus_conn,
+         * Gnome-screensaver 2.26 specific stuff
+         */
+        dbus_proxy_gnome = dbus_g_proxy_new_for_name( dbus_conn,
                         "org.gnome.ScreenSaver",
                         "/org/gnome/ScreenSaver",
@@ -73 +74 @@
                         );
 
+        if(dbus_proxy_gnome == NULL) {
+                purple_debug(PURPLE_DEBUG_ERROR, PACKAGE, N_("failed to get DBus proxy\n"));
+                purple_notify_error(plugin, "Away-on-lock", _("Failed to create a DBus Proxy."), NULL);
+                dbus_g_connection_unref(dbus_conn);
+                return FALSE;
+        }
+
+        dbus_g_proxy_add_signal( dbus_proxy_gnome,
+                        "ActiveChanged",
+                        G_TYPE_BOOLEAN,
+                        G_TYPE_INVALID
+                        );
+
+        dbus_g_proxy_connect_signal( dbus_proxy_gnome,
+                        "ActiveChanged",
+                        G_CALLBACK(awayonlock_idle_changed_callback),
+                        NULL,
+                        NULL
+                        );
+        /*
+         * END Gnome-screensaver specific stuff
+         */
+
+        /*
+         * freedesktop stuff
+         */
+        dbus_proxy = dbus_g_proxy_new_for_name( dbus_conn,
+                        "org.freedesktop.ScreenSaver",
+                        "/ScreenSaver",
+                        "org.freedesktop.ScreenSaver"
+                        );
+
         if(dbus_proxy == NULL) {
                 purple_debug(PURPLE_DEBUG_ERROR, PACKAGE, N_("failed to get DBus proxy\n"));
                 purple_notify_error(plugin, "Away-on-lock", _("Failed to create a DBus Proxy."), NULL);
-
+                dbus_g_connection_unref(dbus_conn);
                 return FALSE;
         }
@@ -93 +126 @@
                         );
         /*
-         * END Gnome-screensaver specific stuff
+         * END freedesktop stuff
          */
 
@@ -156 +189 @@
 
         info.name = _("Away-on-lock");
-        info.summary = _("Sets you as away when your screensaver is activated");
-        info.description = _("This plugin sets your status to the default away status whenever your screensaver gets activated.");
+        info.summary = _("Changes your status when your screensaver gets activated");
+        info.description = _("This plugin changes your status to a preselected saved status or the default away status whenever your screensaver gets activated. It doesn't interfere if you're already marked as auto-away and can also avoid changing your status if you've manually marked yourself as any non-available status.");
         info.author = _("Leo Antunes <leo@costela.net>");
 

i18n/pidgin-awayonlock.pot

@@ -9 +9 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 00:16+0200\n"
+"POT-Creation-Date: 2009-07-22 23:19+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -17 +17 @@
 "Content-Transfer-Encoding: 8bit\n"
 
-#: awayonlock.c:61
+#: awayonlock.c:62
 msgid "Failed to get a DBus connection."
 msgstr ""
 
-#: awayonlock.c:77
+#: awayonlock.c:78 awayonlock.c:110
 msgid "Failed to create a DBus Proxy."
 msgstr ""
 
-#: awayonlock.c:157
+#: awayonlock.c:190
 msgid "Away-on-lock"
 msgstr ""
 
-#: awayonlock.c:158
-msgid "Sets you as away when your screensaver is activated"
+#: awayonlock.c:191
+msgid "Changes your status when your screensaver gets activated"
 msgstr ""
 
-#: awayonlock.c:159
+#: awayonlock.c:192
 msgid ""
-"This plugin sets your status to the default away status whenever your "
-"screensaver gets activated."
+"This plugin changes your status to a preselected saved status or the default "
+"away status whenever your screensaver gets activated. It doesn't interfere "
+"if you're already marked as auto-away and can also avoid changing your "
+"status if you've manually marked yourself as any non-available status."
 msgstr ""
 
-#: awayonlock.c:160
+#: awayonlock.c:193
 msgid "Leo Antunes <leo@costela.net>"
 msgstr ""

i18n/pt_BR.po

@@ -16 +16 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 00:16+0200\n"
+"POT-Creation-Date: 2009-07-22 23:19+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:61
+#: awayonlock.c:62
 msgid "Failed to get a DBus connection."
 msgstr "Falha ao conseguir uma conexão DBus"
 
-#: awayonlock.c:77
+#: awayonlock.c:78 awayonlock.c:110
 msgid "Failed to create a DBus Proxy."
 msgstr "Falha ao criar um Proxy DBus"
 
-#: awayonlock.c:157
+#: awayonlock.c:190
 msgid "Away-on-lock"
 msgstr ""
 
-#: awayonlock.c:158
-msgid "Sets you as away when your screensaver is activated"
+#: awayonlock.c:191
+#, fuzzy
+msgid "Changes your status when your screensaver gets activated"
 msgstr "Define status como ausente quando o salva-tela é ativado"
 
-#: awayonlock.c:159
+#: awayonlock.c:192
 msgid ""
-"This plugin sets your status to the default away status whenever your "
-"screensaver gets activated."
+"This plugin changes your status to a preselected saved status or the default "
+"away status whenever your screensaver gets activated. It doesn't interfere "
+"if you're already marked as auto-away and can also avoid changing your "
+"status if you've manually marked yourself as any non-available status."
 msgstr ""
-"Este plugin define o status atual como o status ausente padrão quando o "
-"salva-tela é ativado"
+"Este plugin altera seu status para um status ausente pre-selecionado ou para "
+"o status ausente padrão quando o salva-tela é ativado. Ele não interfere caso "
+"você já esteja marcado como auto-ausente e pode também evitar alterar seu "
+"status caso você tenha manualmente se marcado como qualquer status não-disponível."
 
-#: awayonlock.c:160
+#: awayonlock.c:193
 msgid "Leo Antunes <leo@costela.net>"
 msgstr ""
@@ -65 +70 @@
 msgid "Activate only if available"
 msgstr "Ativar somente quando disponível"
+
+#~ msgid ""
+#~ "This plugin sets your status to the default away status whenever your "
+#~ "screensaver gets activated."
+#~ msgstr ""
+#~ "Este plugin define o status atual como o status ausente padrão quando o "
+#~ "salva-tela é ativado"