Changeset bbdcdb47aa4624e593c227cc18c6192deaf49938

Timestamp:

06/01/09 22:42:56 (3 years ago)

Author:

Leo Antunes <leo@…>

Children:

f61e5d9f981e59d438edb649a97992469056a913

Parents:

c954bfe63faa9d655b8f94c13a9b8e2fbaa6df96

git-committer:

Leo Antunes <leo@…> (06/01/09 22:42:56)

Message:

finally implemented the rest of the prefs

Files:

• ChangeLog (modified) (1 diff)
• awayonlock.c (modified) (6 diffs)
• callback.c (modified) (2 diffs)
• prefs.c (modified) (4 diffs)
• prefs.h (modified) (1 diff)

ChangeLog

@@ -1 @@
-Version 0.2 (2009-??-??):
+Version 0.2 (2009-06-01):
 
-        - solved problem when the auto-away feature got activated before the screensaver
-        - added pref to select which away status should be set by the screensaver
+        - solved problem when pidgin's auto-away got activated before 
+          the screensaver
+        - added pref to select which away status should be set by the 
+          screensaver
         - plugin info finally translatable
 

awayonlock.c

@@ -31 +31 @@
 #include <version.h>
 #include <notify.h>
+#include <savedstatuses.h>
 
 #include "i18n.h"
@@ -37 +38 @@
 
 static DBusGConnection *dbus_conn = NULL;
+
+void *
+awayonlock_get_handle(void)
+{
+        static char* handle = "awayonlock";
+        return handle;
+}
+
 
 static gboolean plugin_load(PurplePlugin *plugin) {
@@ -55 +64 @@
         
 
+        /*
+         * Gnome-screensaver specific stuff
+         */
         dbus_proxy = dbus_g_proxy_new_for_name( dbus_conn,
                         "org.gnome.ScreenSaver",
@@ -73 +85 @@
                         G_TYPE_INVALID
                         );
-        
+
         dbus_g_proxy_connect_signal( dbus_proxy,
                         "SessionIdleChanged",
@@ -80 +92 @@
                         NULL
                         );
+        /*
+         * END Gnome-screensaver specific stuff
+         */
+
+
+        /*
+         * avoid dangling references to savedstatuses in the config
+         */
+        purple_signal_connect(purple_savedstatuses_get_handle(), "savedstatus-deleted",
+                                                awayonlock_get_handle(),
+                                                PURPLE_CALLBACK(prefs_status_deleted_cb),
+                                                NULL
+                                                );
 
         purple_debug(PURPLE_DEBUG_INFO, PACKAGE, N_("plugin_load finished\n"));
@@ -89 +114 @@
         purple_debug(PURPLE_DEBUG_INFO, PACKAGE, N_("plugin_unload called\n"));
         dbus_g_connection_unref(dbus_conn);
+        purple_signals_disconnect_by_handle(awayonlock_get_handle());
         return TRUE;
 }

callback.c

@@ -27 +27 @@
 #include "i18n.h"
 #include "callback.h"
+#include "prefs.h"
 
 static PurpleSavedStatus *status_saved = NULL;
@@ -33 +34 @@
         purple_debug(PURPLE_DEBUG_INFO, PACKAGE, N_("got message from screensaver: active=%u\n"), screensaver_status);
 
-        PurpleSavedStatus *status_idle = purple_savedstatus_get_idleaway();
+        PurpleSavedStatus *status_idle;
+
+        const char *awayonlock_savedstatus = purple_prefs_get_string(AWAYONLOCK_PREF_STATUS);
+        if(g_strcmp0(awayonlock_savedstatus, "") == 0) {
+                status_idle = purple_savedstatus_get_idleaway();
+        }
+        else {
+                status_idle = purple_savedstatus_find_by_creation_time(g_ascii_strtoull(awayonlock_savedstatus,NULL,10));
+        }
+
 
         PurpleSavedStatus *status_current = purple_savedstatus_get_current();

prefs.c

@@ -29 +29 @@
 
 #include "i18n.h"
+#include "prefs.h"
 
 PurplePluginPrefFrame *get_prefs_frame(PurplePlugin *plugin) {
@@ -39 +40 @@
         frame = purple_plugin_pref_frame_new();
 
-        ppref = purple_plugin_pref_new_with_name_and_label("/plugins/core/awayonlock/status",_("Status to set on screensaver activation"));
+        ppref = purple_plugin_pref_new_with_name_and_label(AWAYONLOCK_PREF_STATUS, _("Status to set on screensaver activation"));
         purple_plugin_pref_set_type(ppref, PURPLE_PLUGIN_PREF_CHOICE);
         purple_plugin_pref_add_choice(ppref, _("Default away status"), "");
@@ -49 +50 @@
             statuses = g_list_next(statuses)) {
                 if(! purple_savedstatus_is_transient(statuses->data)) {
-                        purple_plugin_pref_add_choice(ppref, purple_savedstatus_get_title(statuses->data), (char *)purple_savedstatus_get_title(statuses->data));
+                        gchar *creation_time = NULL;
+                        creation_time = g_strdup_printf("%d", purple_savedstatus_get_creation_time(statuses->data));
+                        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?
+                         */
+                        //g_free(creation_time);
                 }
         }
@@ -58 +68 @@
 }
 
+void prefs_status_deleted_cb(PurpleSavedStatus *savedstatus, gpointer data)
+{
+        GList *statuses;
+
+        const char *awayonlock_savedstatus = purple_prefs_get_string(AWAYONLOCK_PREF_STATUS);
+
+        if(g_strcmp0(awayonlock_savedstatus, "") == 0)
+                return; // we use the default, nevermind
+
+        statuses = g_list_copy(purple_savedstatuses_get_all());
+
+        for(statuses = g_list_first(statuses);
+            statuses;
+            statuses = g_list_next(statuses)) {
+                if(purple_savedstatus_get_creation_time(statuses->data) == g_ascii_strtoull(awayonlock_savedstatus,NULL,10)) {
+                        return; // found it, it wasn't deleted
+                }
+        }
+
+        purple_debug(PURPLE_DEBUG_INFO, PACKAGE, N_("our status got deleted, clearing preference\n"));
+        purple_prefs_set_string(AWAYONLOCK_PREF_STATUS, "");
+}
+

prefs.h

@@ -22 +22 @@
 #define _AWAYONLOCK_PREFS_H
 
+#include <glib.h>
+#include <plugin.h>
+#include <savedstatuses.h>
+
+#define AWAYONLOCK_PREF_STATUS "/plugins/core/awayonlock/status"
+
 PurplePluginPrefFrame* get_prefs_frame(PurplePlugin*);
+
+void prefs_status_deleted_cb(PurpleSavedStatus*, gpointer);
 
 static PurplePluginUiInfo prefs = {