Mercurial > pidgin.yaz
changeset 12286:255e6912607b
[gaim-migrate @ 14590]
Mostly whitespace, but a couple small typo fixes, and an A;B -> B;A; swap to
be consistent in plugins/notify.c
committer: Tailor Script <tailor@pidgin.im>
| author | Etan Reisner <pidgin@unreliablesource.net> |
|---|---|
| date | Thu, 01 Dec 2005 21:13:48 +0000 |
| parents | af257d8679fe |
| children | e4a9be312854 |
| files | configure.ac plugins/notify.c src/account.c src/account.h src/blist.h src/gtkaccount.c src/gtkconv.c src/gtkrequest.c src/gtkroomlist.c src/gtkstatusbox.c src/protocols/jabber/jabber.c |
| diffstat | 11 files changed, 30 insertions(+), 37 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Thu Dec 01 20:09:27 2005 +0000 +++ b/configure.ac Thu Dec 01 21:13:48 2005 +0000 @@ -312,7 +312,7 @@ AC_ARG_ENABLE(mono, [ --disable-mono compile without Mono runtime support],,enable_mono=yes) AC_ARG_ENABLE(plugins, [ --disable-plugins compile without plugin support],,enable_plugins=yes) AC_ARG_ENABLE(perl, [ --disable-perl compile without perl scripting],,enable_perl=yes) -AC_ARG_ENABLE(tcl, [ --disable-tcl compile without Tcl scripting],,enable_tcl=yes) +AC_ARG_ENABLE(tcl, [ --disable-tcl compile without Tcl scripting],,enable_tcl=yes) AC_ARG_WITH(tclconfig, [ --with-tclconfig=DIR directory containing tclConfig.sh]) AC_ARG_ENABLE(tk, [ --disable-tk compile without Tcl support for Tk],,enable_tk=yes) AC_ARG_WITH(tkconfig, [ --with-tkconfig=DIR directory containing tkConfig.sh])
--- a/plugins/notify.c Thu Dec 01 20:09:27 2005 +0000 +++ b/plugins/notify.c Thu Dec 01 21:13:48 2005 +0000 @@ -313,13 +313,13 @@ if (gaim_prefs_get_bool("/plugins/gtk/X11/notify/notify_click")) { /* TODO similarly should really find a way to allow for clicking in other * places of the window */ - id = g_signal_connect(G_OBJECT(gtkconv->imhtml), "button-press-event", - G_CALLBACK(unnotify_cb), conv); - imhtml_ids = g_slist_append(imhtml_ids, GUINT_TO_POINTER(id)); - id = g_signal_connect(G_OBJECT(gtkconv->entry), "button-press-event", G_CALLBACK(unnotify_cb), conv); entry_ids = g_slist_append(entry_ids, GUINT_TO_POINTER(id)); + + id = g_signal_connect(G_OBJECT(gtkconv->imhtml), "button-press-event", + G_CALLBACK(unnotify_cb), conv); + imhtml_ids = g_slist_append(imhtml_ids, GUINT_TO_POINTER(id)); } if (gaim_prefs_get_bool("/plugins/gtk/X11/notify/notify_type")) { @@ -408,11 +408,9 @@ gaimwin = GAIM_GTK_CONVERSATION(conv)->win; - handle_urgent(gaimwin, FALSE); gaim_conversation_set_data(conv, "notify-message-count", GINT_TO_POINTER(0)); - return; #if 0 @@ -517,6 +515,7 @@ GDK_WINDOW_XWINDOW(win->window->window)); if(!hints) hints = XAllocWMHints(); + if (add) hints->flags |= XUrgencyHint; else
--- a/src/account.c Thu Dec 01 20:09:27 2005 +0000 +++ b/src/account.c Thu Dec 01 21:13:48 2005 +0000 @@ -1031,8 +1031,8 @@ void gaim_account_notify_added(GaimAccount *account, const char *id, - const char *remote_user, const char *alias, - const char *message) + const char *remote_user, const char *alias, + const char *message) { GaimAccountUiOps *ui_ops;
--- a/src/account.h Thu Dec 01 20:09:27 2005 +0000 +++ b/src/account.h Thu Dec 01 21:13:48 2005 +0000 @@ -49,7 +49,7 @@ void (*status_changed)(GaimAccount *account, GaimStatus *status); /* Someone we don't have on our list added us. Will prompt to add them. */ void (*request_add)(GaimAccount *account, const char *remote_user, - const char *id, const char *alis, + const char *id, const char *alias, const char *message); }; @@ -142,7 +142,7 @@ * This will present a dialog informing the user that he was added to the * remote user's buddy list. * - * @param account The account that was added. + * @param account The account that was added. * @param remote_user The name of the user that added this account. * @param id The optional ID of the local account. Rarely used. * @param alias The optional alias of the user.
--- a/src/blist.h Thu Dec 01 20:09:27 2005 +0000 +++ b/src/blist.h Thu Dec 01 21:13:48 2005 +0000 @@ -841,9 +841,9 @@ /** * Retrieves the extended menu items for a buddy list node. - * @param n The blist node for which to obtain the extended menu items. - * @return list of GaimBlistNodeAction items, as harvested by the - * blist-node-extended-menu signal. + * @param n The blist node for which to obtain the extended menu items. + * @return A list of GaimBlistNodeAction items, as harvested by the + * blist-node-extended-menu signal. */ GList *gaim_blist_node_get_extended_menu(GaimBlistNode *n);
--- a/src/gtkaccount.c Thu Dec 01 20:09:27 2005 +0000 +++ b/src/gtkaccount.c Thu Dec 01 21:13:48 2005 +0000 @@ -2531,7 +2531,7 @@ make_info(GaimAccount *account, GaimConnection *gc, const char *remote_user, const char *id, const char *alias, const char *msg) { - return g_strdup_printf(_("%s%s%s%s has made %s his or her buddy%s%s."), + return g_strdup_printf(_("%s%s%s%s has made %s his or her buddy%s%s"), remote_user, (alias != NULL ? " (" : ""), (alias != NULL ? alias : ""), @@ -2568,7 +2568,6 @@ g_free(buffer); } - static void gaim_gtk_accounts_request_add(GaimAccount *account, const char *remote_user, const char *id, const char *alias,
--- a/src/gtkconv.c Thu Dec 01 20:09:27 2005 +0000 +++ b/src/gtkconv.c Thu Dec 01 21:13:48 2005 +0000 @@ -2865,8 +2865,7 @@ if (win->menu.send_to != NULL) gtk_widget_destroy(win->menu.send_to); - - /* Build the Send As menu */ + /* Build the Send To menu */ win->menu.send_to = gtk_menu_item_new_with_mnemonic(_("_Send To")); gtk_widget_show(win->menu.send_to);
--- a/src/gtkrequest.c Thu Dec 01 20:09:27 2005 +0000 +++ b/src/gtkrequest.c Thu Dec 01 21:13:48 2005 +0000 @@ -649,12 +649,12 @@ g_free(label_text); - if (default_action == GAIM_DEFAULT_ACTION_NONE) { + if (default_action == GAIM_DEFAULT_ACTION_NONE) { GTK_WIDGET_SET_FLAGS(img, GTK_CAN_DEFAULT); GTK_WIDGET_SET_FLAGS(img, GTK_CAN_FOCUS); gtk_widget_grab_focus(img); gtk_widget_grab_default(img); - } else + } else gtk_dialog_set_default_response(GTK_DIALOG(dialog), default_action); /* Show everything. */
--- a/src/gtkroomlist.c Thu Dec 01 20:09:27 2005 +0000 +++ b/src/gtkroomlist.c Thu Dec 01 21:13:48 2005 +0000 @@ -629,7 +629,7 @@ static void gaim_gtk_roomlist_add_room(GaimRoomlist *list, GaimRoomlistRoom *room) { - GaimGtkRoomlist *rl= list->ui_data; + GaimGtkRoomlist *rl = list->ui_data; GtkTreeRowReference *rr, *parentrr = NULL; GtkTreePath *path; GtkTreeIter iter, parent, child;
--- a/src/gtkstatusbox.c Thu Dec 01 20:09:27 2005 +0000 +++ b/src/gtkstatusbox.c Thu Dec 01 21:13:48 2005 +0000 @@ -141,7 +141,7 @@ if (status_no != -1) { gtk_widget_set_sensitive(GTK_WIDGET(status_box), FALSE); gtk_combo_box_set_active(GTK_COMBO_BOX(status_box), status_no); - + message = gaim_status_get_attr_string(newstatus, "message"); if (!message || !*message) @@ -187,7 +187,7 @@ statusbox, GAIM_CALLBACK(account_status_changed_cb)); statusbox->status_changed_signal = 0; } - + if (statusbox->account) statusbox->status_changed_signal = gaim_signal_connect(gaim_accounts_get_handle(), "account-status-changed", statusbox, GAIM_CALLBACK(account_status_changed_cb), @@ -397,7 +397,7 @@ gtk_combo_box_set_model(GTK_COMBO_BOX(status_box), NULL); gtk_list_store_clear(status_box->dropdown_store); gtk_combo_box_set_model(GTK_COMBO_BOX(status_box), GTK_TREE_MODEL(status_box->dropdown_store)); - + account = GTK_GAIM_STATUS_BOX(status_box)->account; if (account == NULL) { @@ -498,7 +498,7 @@ static gboolean button_released_cb(GtkWidget *widget, GdkEventButton *event, GtkGaimStatusBox *box) { - + if (event->button != 1) return FALSE; gtk_combo_box_popdown(GTK_COMBO_BOX(box)); @@ -542,7 +542,7 @@ status_box->cell_view = gtk_cell_view_new(); status_box->vsep = gtk_vseparator_new(); status_box->arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE); - + status_box->store = gtk_list_store_new(NUM_COLUMNS, G_TYPE_INT, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); status_box->dropdown_store = gtk_list_store_new(NUM_COLUMNS, G_TYPE_INT, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); gtk_combo_box_set_model(GTK_COMBO_BOX(status_box), GTK_TREE_MODEL(status_box->dropdown_store)); @@ -583,7 +583,7 @@ status_box->toolbar = gtk_imhtmltoolbar_new(); gtk_imhtmltoolbar_attach(GTK_IMHTMLTOOLBAR(status_box->toolbar), status_box->imhtml); status_box->hsep = gtk_hseparator_new(); - + buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(status_box->imhtml)); g_signal_connect(G_OBJECT(status_box->toggle_button), "button-press-event", G_CALLBACK(button_pressed_cb), status_box); @@ -607,10 +607,9 @@ gtk_box_pack_start(GTK_BOX(status_box->vbox), status_box->sw, TRUE, TRUE, 0); - g_signal_connect(G_OBJECT(status_box->imhtml), "scroll_event", + g_signal_connect(G_OBJECT(status_box->imhtml), "scroll_event", G_CALLBACK(scroll_event_cb), status_box->imhtml); - #if GTK_CHECK_VERSION(2,6,0) gtk_combo_box_set_row_separator_func(GTK_COMBO_BOX(status_box), dropdown_store_row_separator_func, NULL, NULL); #endif @@ -658,14 +657,13 @@ gtk_widget_size_request(GTK_GAIM_STATUS_BOX(widget)->vbox, &box_req); if (box_req.height > 1) requisition->height = requisition->height + box_req.height + 6; - + if (GTK_GAIM_STATUS_BOX(widget)->typing) { gtk_widget_size_request(GTK_GAIM_STATUS_BOX(widget)->toolbar, &box_req); requisition->height = requisition->height + box_req.height; } - + requisition->width = 1; - } static void @@ -685,7 +683,6 @@ box_alc.width -= 6; box_alc.x += 3; - gtk_widget_size_allocate((GTK_GAIM_STATUS_BOX(widget))->vbox, &box_alc); parent_alc.height = MAX(1,req.height); @@ -698,7 +695,6 @@ widget->allocation = *allocation; } - static gboolean gtk_gaim_status_box_expose_event(GtkWidget *widget, GdkEventExpose *event)
--- a/src/protocols/jabber/jabber.c Thu Dec 01 20:09:27 2005 +0000 +++ b/src/protocols/jabber/jabber.c Thu Dec 01 21:13:48 2005 +0000 @@ -1169,17 +1169,17 @@ GaimPluginAction *act; act = gaim_plugin_action_new(_("Set User Info..."), - jabber_setup_set_info); + jabber_setup_set_info); m = g_list_append(m, act); /* if (js->protocol_options & CHANGE_PASSWORD) { */ act = gaim_plugin_action_new(_("Change Password..."), - jabber_password_change); + jabber_password_change); m = g_list_append(m, act); /* } */ act = gaim_plugin_action_new(_("Search for Users..."), - jabber_user_search_begin); + jabber_user_search_begin); m = g_list_append(m, act); return m;