Tue, 17 Oct 2006 08:13:41 +0000
[gaim-migrate @ 17495]
This should fix the statusbox issues that were keeping us from releasing beta
4 (and which were just really annoying). Thakn sadrul for most of this, I just
added the if (index == -1) bit. Anyway, the way this works now is that for
saved/popular statuses the primitive underlying that status is where the
dropdown for the statusbox starts. If we don't like that we can change it but
I'm not sure we'll find something better.
Also, this might plug a couple leaks, I'm not really sure but it certainly
looks right.
Up next, the patch to make the docklet use the per-protocol statuses in the
top section.
/* * Extra conversation placement options for Gaim * * Gaim is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this * source distribution. * * 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 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "internal.h" #include "gtkgaim.h" #include "conversation.h" #include "version.h" #include "gtkplugin.h" #include "gtkconv.h" #include "gtkconvwin.h" static void conv_placement_by_number(GaimGtkConversation *conv) { GaimGtkWindow *win = NULL; GList *wins = NULL; if (gaim_prefs_get_bool("/plugins/gtk/extplacement/placement_number_separate")) win = gaim_gtk_conv_window_last_with_type(gaim_conversation_get_type(conv->active_conv)); else if ((wins = gaim_gtk_conv_windows_get_list()) != NULL) win = g_list_last(wins)->data; if (win == NULL) { win = gaim_gtk_conv_window_new(); gaim_gtk_conv_window_add_gtkconv(win, conv); gaim_gtk_conv_window_show(win); } else { int max_count = gaim_prefs_get_int("/plugins/gtk/extplacement/placement_number"); int count = gaim_gtk_conv_window_get_gtkconv_count(win); if (count < max_count) gaim_gtk_conv_window_add_gtkconv(win, conv); else { GList *l = NULL; for (l = gaim_gtk_conv_windows_get_list(); l != NULL; l = l->next) { win = l->data; if (gaim_prefs_get_bool("/plugins/gtk/extplacement/placement_number_separate") && gaim_conversation_get_type(gaim_gtk_conv_window_get_active_conversation(win)) != gaim_conversation_get_type(conv->active_conv)) continue; count = gaim_gtk_conv_window_get_gtkconv_count(win); if (count < max_count) { gaim_gtk_conv_window_add_gtkconv(win, conv); return; } } win = gaim_gtk_conv_window_new(); gaim_gtk_conv_window_add_gtkconv(win, conv); gaim_gtk_conv_window_show(win); } } } static gboolean plugin_load(GaimPlugin *plugin) { gaim_gtkconv_placement_add_fnc("number", _("By conversation count"), &conv_placement_by_number); gaim_prefs_trigger_callback("/gaim/gtk/conversations/placement"); return TRUE; } static gboolean plugin_unload(GaimPlugin *plugin) { gaim_gtkconv_placement_remove_fnc("number"); gaim_prefs_trigger_callback("/gaim/gtk/conversations/placement"); return TRUE; } static GaimPluginPrefFrame * get_plugin_pref_frame(GaimPlugin *plugin) { GaimPluginPrefFrame *frame; GaimPluginPref *ppref; frame = gaim_plugin_pref_frame_new(); ppref = gaim_plugin_pref_new_with_label(_("Conversation Placement")); gaim_plugin_pref_frame_add(frame, ppref); ppref = gaim_plugin_pref_new_with_name_and_label( "/plugins/gtk/extplacement/placement_number", _("Number of conversations per window")); gaim_plugin_pref_set_bounds(ppref, 1, 50); gaim_plugin_pref_frame_add(frame, ppref); ppref = gaim_plugin_pref_new_with_name_and_label( "/plugins/gtk/extplacement/placement_number_separate", _("Separate IM and Chat windows when placing by number")); gaim_plugin_pref_frame_add(frame, ppref); return frame; } static GaimPluginUiInfo prefs_info = { get_plugin_pref_frame, 0, /* page_num (Reserved) */ NULL /* frame (Reserved) */ }; static GaimPluginInfo info = { GAIM_PLUGIN_MAGIC, GAIM_MAJOR_VERSION, GAIM_MINOR_VERSION, GAIM_PLUGIN_STANDARD, /**< type */ GAIM_GTK_PLUGIN_TYPE, /**< ui_requirement */ 0, /**< flags */ NULL, /**< dependencies */ GAIM_PRIORITY_DEFAULT, /**< priority */ "gtk-extplacement", /**< id */ N_("ExtPlacement"), /**< name */ VERSION, /**< version */ N_("Extra conversation placement options."), /**< summary */ /** description */ N_("Restrict the number of conversations per windows," " optionally separating IMs and Chats"), "Stu Tomlinson <stu@nosnilmot.com>", /**< author */ GAIM_WEBSITE, /**< homepage */ plugin_load, /**< load */ plugin_unload, /**< unload */ NULL, /**< destroy */ NULL, /**< ui_info */ NULL, /**< extra_info */ &prefs_info, /**< prefs_info */ NULL /**< actions */ }; static void init_plugin(GaimPlugin *plugin) { gaim_prefs_add_none("/plugins/gtk/extplacement"); gaim_prefs_add_int("/plugins/gtk/extplacement/placement_number", 4); gaim_prefs_add_bool("/plugins/gtk/extplacement/placement_number_separate", FALSE); } GAIM_INIT_PLUGIN(extplacement, init_plugin, info)