pidgin/pidgin

use g_list_index instead of manually searching a list and a bunch of whitespace fixes

2020-04-07, Gary Kramlich
4cdb2a681dc1
Parents 65fd2cd524e5
Children 3f2e9e346f6f
use g_list_index instead of manually searching a list and a bunch of whitespace fixes
4 files changed, 46 insertions(+), 55 deletions(-)
  • +14 -23
    pidgin/pidginaccountactionsmenu.c
  • +10 -10
    pidgin/pidginaccountsmenu.c
  • +16 -16
    pidgin/pidginbuddylistmenu.c
  • +6 -6
    pidgin/pidginpluginsmenu.c
    • --- a/pidgin/pidginaccountactionsmenu.c Tue Apr 07 02:32:53 2020 -0500
    +++ b/pidgin/pidginaccountactionsmenu.c Tue Apr 07 18:28:26 2020 -0500
    @@ -88,7 +88,7 @@
    {
    PurpleConnection *connection = NULL;
    PurpleProtocol *protocol = NULL;
    - GList *children = NULL, *l = NULL;
    + GList *children = NULL;
    gboolean show_separator = FALSE;
    gint position = 0;
    @@ -111,20 +111,11 @@
    /* we're pretty sure we're going to insert some items into the menu, so we
    * need to figure out where to put them. GtkMenu stores its children in
    - * order, so we just need to walk them to find the proper position.
    + * order, so we just need to get the index of the set_mood item to find the
    + * proper position.
    */
    children = gtk_container_get_children(GTK_CONTAINER(menu));
    - for(l = children, position = 0; l != NULL; l = l->next, position++) {
    - /* check if the widget is the `set_mood` item and if so, bail out of the
    - * loop.
    - */
    - if(l->data == menu->set_mood) {
    - /* and push position past the set_mood item */
    - position++;
    -
    - break;
    - }
    - }
    + position = g_list_index(children, menu->set_mood) + 1;
    g_list_free(children);
    protocol = purple_connection_get_protocol(connection);
    @@ -244,10 +235,10 @@
    GObjectClass *obj_class = G_OBJECT_CLASS(klass);
    GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
    - gtk_widget_class_set_template_from_resource(
    - widget_class,
    - "/im/pidgin/Pidgin/Accounts/actionsmenu.ui"
    - );
    + gtk_widget_class_set_template_from_resource(
    + widget_class,
    + "/im/pidgin/Pidgin/Accounts/actionsmenu.ui"
    + );
    obj_class->get_property = pidgin_account_actions_menu_get_property;
    obj_class->set_property = pidgin_account_actions_menu_set_property;
    @@ -272,12 +263,12 @@
    gtk_widget_class_bind_template_child(widget_class, PidginAccountActionsMenu,
    set_mood);
    - gtk_widget_class_bind_template_callback(widget_class,
    - pidgin_account_actions_menu_edit_cb);
    - gtk_widget_class_bind_template_callback(widget_class,
    - pidgin_account_actions_menu_disable_cb);
    - gtk_widget_class_bind_template_callback(widget_class,
    - pidgin_account_actions_menu_set_mood_cb);
    + gtk_widget_class_bind_template_callback(widget_class,
    + pidgin_account_actions_menu_edit_cb);
    + gtk_widget_class_bind_template_callback(widget_class,
    + pidgin_account_actions_menu_disable_cb);
    + gtk_widget_class_bind_template_callback(widget_class,
    + pidgin_account_actions_menu_set_mood_cb);
    }
    /******************************************************************************
    --- a/pidgin/pidginaccountsmenu.c Tue Apr 07 02:32:53 2020 -0500
    +++ b/pidgin/pidginaccountsmenu.c Tue Apr 07 18:28:26 2020 -0500
    @@ -224,18 +224,18 @@
    obj_class->finalize = pidgin_accounts_menu_finalize;
    - gtk_widget_class_set_template_from_resource(
    - widget_class,
    - "/im/pidgin/Pidgin/Accounts/menu.ui"
    - );
    + gtk_widget_class_set_template_from_resource(
    + widget_class,
    + "/im/pidgin/Pidgin/Accounts/menu.ui"
    + );
    - gtk_widget_class_bind_template_child(widget_class, PidginAccountsMenu,
    - disabled_menu);
    - gtk_widget_class_bind_template_child(widget_class, PidginAccountsMenu,
    - separator);
    + gtk_widget_class_bind_template_child(widget_class, PidginAccountsMenu,
    + disabled_menu);
    + gtk_widget_class_bind_template_child(widget_class, PidginAccountsMenu,
    + separator);
    - gtk_widget_class_bind_template_callback(widget_class,
    - pidgin_accounts_menu_open_manager_cb);
    + gtk_widget_class_bind_template_callback(widget_class,
    + pidgin_accounts_menu_open_manager_cb);
    }
    /******************************************************************************
    --- a/pidgin/pidginbuddylistmenu.c Tue Apr 07 02:32:53 2020 -0500
    +++ b/pidgin/pidginbuddylistmenu.c Tue Apr 07 18:28:26 2020 -0500
    @@ -57,23 +57,23 @@
    pidgin_buddy_list_menu_class_init(PidginBuddyListMenuClass *klass) {
    GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
    - gtk_widget_class_set_template_from_resource(
    - widget_class,
    - "/im/pidgin/Pidgin/BuddyList/menu.ui"
    - );
    + gtk_widget_class_set_template_from_resource(
    + widget_class,
    + "/im/pidgin/Pidgin/BuddyList/menu.ui"
    + );
    - gtk_widget_class_bind_template_child(widget_class, PidginBuddyListMenu,
    - sort_buddies);
    - gtk_widget_class_bind_template_child(widget_class, PidginBuddyListMenu,
    - accounts);
    - gtk_widget_class_bind_template_child(widget_class, PidginBuddyListMenu,
    - accounts_menu);
    - gtk_widget_class_bind_template_child(widget_class, PidginBuddyListMenu,
    - plugins);
    - gtk_widget_class_bind_template_child(widget_class, PidginBuddyListMenu,
    - plugins_menu);
    - gtk_widget_class_bind_template_child(widget_class, PidginBuddyListMenu,
    - menu_tray);
    + gtk_widget_class_bind_template_child(widget_class, PidginBuddyListMenu,
    + sort_buddies);
    + gtk_widget_class_bind_template_child(widget_class, PidginBuddyListMenu,
    + accounts);
    + gtk_widget_class_bind_template_child(widget_class, PidginBuddyListMenu,
    + accounts_menu);
    + gtk_widget_class_bind_template_child(widget_class, PidginBuddyListMenu,
    + plugins);
    + gtk_widget_class_bind_template_child(widget_class, PidginBuddyListMenu,
    + plugins_menu);
    + gtk_widget_class_bind_template_child(widget_class, PidginBuddyListMenu,
    + menu_tray);
    }
    /******************************************************************************
    --- a/pidgin/pidginpluginsmenu.c Tue Apr 07 02:32:53 2020 -0500
    +++ b/pidgin/pidginpluginsmenu.c Tue Apr 07 18:28:26 2020 -0500
    @@ -284,13 +284,13 @@
    obj_class->finalize = pidgin_plugins_menu_finalize;
    - gtk_widget_class_set_template_from_resource(
    - widget_class,
    - "/im/pidgin/Pidgin/Plugins/menu.ui"
    - );
    + gtk_widget_class_set_template_from_resource(
    + widget_class,
    + "/im/pidgin/Pidgin/Plugins/menu.ui"
    + );
    - gtk_widget_class_bind_template_child(widget_class, PidginPluginsMenu,
    - separator);
    + gtk_widget_class_bind_template_child(widget_class, PidginPluginsMenu,
    + separator);
    }
    /******************************************************************************