static void modest_window_mgr_init (ModestWindowMgr *obj);
static void modest_window_mgr_finalize (GObject *obj);
-/* static void on_window_destroy (ModestWindow *window, */
-/* ModestWindowMgr *self); */
static gboolean on_window_destroy (ModestWindow *window,
GdkEvent *event,
ModestWindowMgr *self);
priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
uid = modest_tny_folder_get_header_unique_id (header);
-
- if (!has_uid (priv->preregistered_uids, uid))
+
+
+ if (!has_uid (priv->preregistered_uids, uid)) {
+ g_debug ("registering new uid %s", uid);
priv->preregistered_uids = append_uid (priv->preregistered_uids, uid);
+ } else
+ g_debug ("already had uid %s", uid);
g_free (uid);
}
priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
uid = modest_tny_folder_get_header_unique_id (header);
- if (has_uid (priv->preregistered_uids, uid))
+ if (!has_uid (priv->preregistered_uids, uid)) {
+ g_debug ("trying to unregister non-existing uid %s", uid);
+ priv->preregistered_uids = append_uid (priv->preregistered_uids, uid);
+ } else
+ g_debug ("unregistering uid %s", uid);
+
+ if (has_uid (priv->preregistered_uids, uid)) {
priv->preregistered_uids = remove_uid (priv->preregistered_uids, uid);
+ if (has_uid (priv->preregistered_uids, uid))
+ g_debug ("BUG: uid %s NOT removed", uid);
+ else
+ g_debug ("uid %s removed", uid);
+ }
g_free (uid);
}
{
ModestWindowMgrPrivate *priv;
gchar* uid;
- gboolean retval = FALSE;
+ gboolean has_header, has_window = FALSE;
GList *item = NULL;
g_return_val_if_fail (MODEST_IS_WINDOW_MGR (self), FALSE);
uid = modest_tny_folder_get_header_unique_id (header);
- /* first, look for the window */
- /* note, the UID cannot be in both the window list and the preregistered uid list */
- if (priv->window_list) {
- item = g_list_find_custom (priv->window_list,
- uid, (GCompareFunc) compare_msguids);
- if (item)
- retval = TRUE;
- if (win)
- *win = item ? MODEST_WINDOW(item->data) : NULL;
- }
+ if (win)
+ *win = NULL;
+/* g_debug ("windows in list: %d", g_list_length (priv->window_list)); */
+/* g_debug ("headers in list: %d", g_slist_length (priv->preregistered_uids)); */
- /* IF It's not in the window list. maybe it's in our uid list... */
- retval = retval || has_uid (priv->preregistered_uids, uid);
+ has_header = has_uid (priv->preregistered_uids, uid);
+
+ item = g_list_find_custom (priv->window_list, uid, (GCompareFunc) compare_msguids);
+ if (item) {
+ has_window = TRUE;
+ if (win) {
+ if (!MODEST_IS_MSG_VIEW_WINDOW(item->data))
+ g_debug ("not a valid window!");
+ else {
+ g_debug ("found a window");
+ *win = MODEST_WINDOW (item->data);
+ }
+ }
+ }
g_free (uid);
-
- return retval;
+ return has_header || has_window;
}
g_warning ("Trying to register an already registered window");
return;
}
-
+
/* Check that it's not a second main window */
if (MODEST_IS_MAIN_WINDOW (window)) {
if (priv->main_window) {
/* remove from the list of pre-registered uids */
if (MODEST_IS_MSG_VIEW_WINDOW(window)) {
+ const gchar *uid = modest_msg_view_window_get_message_uid
+ (MODEST_MSG_VIEW_WINDOW (window));
+
+ g_debug ("registering window for %s", uid);
+
+ if (!has_uid (priv->preregistered_uids, uid))
+ g_debug ("weird: no uid for window (%s)", uid);
+
priv->preregistered_uids =
remove_uid (priv->preregistered_uids,
modest_msg_view_window_get_message_uid
modest_window_show_toolbar (window, show);
}
-/* static void */
-/* on_window_destroy (ModestWindow *window, ModestWindowMgr *self) */
static gboolean
on_window_destroy (ModestWindow *window,
GdkEvent *event,
if (response != GTK_RESPONSE_CANCEL)
modest_ui_actions_on_save_to_drafts (NULL, MODEST_MSG_EDIT_WINDOW (window));
- }
+ }
}
}
{
GList *win;
ModestWindowMgrPrivate *priv;
- gint *tmp, handler_id;
+ gulong *tmp, handler_id;
g_return_if_fail (MODEST_IS_WINDOW_MGR (self));
g_return_if_fail (MODEST_IS_WINDOW (window));
priv->viewer_handlers = NULL;
}
+ /* Remove the viewer window handler from the hash table. The
+ HashTable could not exist if the main window was closeed
+ when there were other windows remaining */
+ if (MODEST_IS_MSG_VIEW_WINDOW (window) && priv->viewer_handlers) {
+ tmp = (gulong *) g_hash_table_lookup (priv->viewer_handlers, window);
+ g_signal_handler_disconnect (window, *tmp);
+ g_hash_table_remove (priv->viewer_handlers, window);
+ }
+
/* Save state */
modest_window_save_state (window);
/* Disconnect the "delete-event" handler, we won't need it anymore */
g_signal_handler_disconnect (window, handler_id);
+ /* Disconnect all the window signals */
+ modest_window_disconnect_signals (window);
+
/* Destroy the window */
gtk_widget_destroy (win->data);