pidgin/ljfisher-ssl-client-auth

Merge heads.

2012-07-08, Elliott Sales de Andrade
4cfd8ccc84d4
Parents ed1b60bdd43932318963e724
Children cd284b4ca152
Merge heads.
3 files changed, 21 insertions(+), 35 deletions(-)
  • +15 -19
    pidgin/gtkconv.c
  • +5 -13
    pidgin/gtkconvwin.h
  • +1 -3
    pidgin/gtkdialogs.c
    • --- a/pidgin/gtkconv.c Sun Jul 08 12:36:02 2012 +0200
    +++ b/pidgin/gtkconv.c Sun Jul 08 17:37:44 2012 -0400
    @@ -1217,9 +1217,9 @@
    purple_prpl_initiate_media(account,
    purple_conversation_get_name(conv),
    - action == win->audio_call ? PURPLE_MEDIA_AUDIO :
    - action == win->video_call ? PURPLE_MEDIA_VIDEO :
    - action == win->audio_video_call ? PURPLE_MEDIA_AUDIO |
    + action == win->menu.audio_call ? PURPLE_MEDIA_AUDIO :
    + action == win->menu.video_call ? PURPLE_MEDIA_VIDEO :
    + action == win->menu.audio_video_call ? PURPLE_MEDIA_AUDIO |
    PURPLE_MEDIA_VIDEO : PURPLE_MEDIA_NONE);
    }
    #endif
    @@ -3362,25 +3362,25 @@
    purple_prpl_get_media_caps(account,
    purple_conversation_get_name(conv));
    - gtk_action_set_sensitive(win->audio_call,
    + gtk_action_set_sensitive(win->menu.audio_call,
    caps & PURPLE_MEDIA_CAPS_AUDIO
    ? TRUE : FALSE);
    - gtk_action_set_sensitive(win->video_call,
    + gtk_action_set_sensitive(win->menu.video_call,
    caps & PURPLE_MEDIA_CAPS_VIDEO
    ? TRUE : FALSE);
    - gtk_action_set_sensitive(win->audio_video_call,
    + gtk_action_set_sensitive(win->menu.audio_video_call,
    caps & PURPLE_MEDIA_CAPS_AUDIO_VIDEO
    ? TRUE : FALSE);
    } else if (purple_conversation_get_type(conv)
    == PURPLE_CONV_TYPE_CHAT) {
    /* for now, don't care about chats... */
    - gtk_action_set_sensitive(win->audio_call, FALSE);
    - gtk_action_set_sensitive(win->video_call, FALSE);
    - gtk_action_set_sensitive(win->audio_video_call, FALSE);
    + gtk_action_set_sensitive(win->menu.audio_call, FALSE);
    + gtk_action_set_sensitive(win->menu.video_call, FALSE);
    + gtk_action_set_sensitive(win->menu.audio_video_call, FALSE);
    } else {
    - gtk_action_set_sensitive(win->audio_call, FALSE);
    - gtk_action_set_sensitive(win->video_call, FALSE);
    - gtk_action_set_sensitive(win->audio_video_call, FALSE);
    + gtk_action_set_sensitive(win->menu.audio_call, FALSE);
    + gtk_action_set_sensitive(win->menu.video_call, FALSE);
    + gtk_action_set_sensitive(win->menu.audio_video_call, FALSE);
    }
    #endif
    }
    @@ -3608,13 +3608,13 @@
    "/Conversation/ConversationMenu/ViewLog");
    #ifdef USE_VV
    - win->audio_call =
    + win->menu.audio_call =
    gtk_ui_manager_get_action(win->menu.ui,
    "/Conversation/ConversationMenu/MediaMenu/AudioCall");
    - win->video_call =
    + win->menu.video_call =
    gtk_ui_manager_get_action(win->menu.ui,
    "/Conversation/ConversationMenu/MediaMenu/VideoCall");
    - win->audio_video_call =
    + win->menu.audio_video_call =
    gtk_ui_manager_get_action(win->menu.ui,
    "/Conversation/ConversationMenu/MediaMenu/AudioVideoCall");
    #endif
    @@ -9923,10 +9923,6 @@
    purple_prefs_disconnect_by_handle(win);
    window_list = g_list_remove(window_list, win);
    - /* Close the "Find" dialog if it's open */
    - if (win->dialogs.search)
    - gtk_widget_destroy(win->dialogs.search);
    -
    if (win->gtkconvs) {
    while (win->gtkconvs) {
    gboolean last = (win->gtkconvs->next == NULL);
    --- a/pidgin/gtkconvwin.h Sun Jul 08 12:36:02 2012 +0200
    +++ b/pidgin/gtkconvwin.h Sun Jul 08 17:37:44 2012 -0400
    @@ -46,10 +46,15 @@
    struct
    {
    + GtkUIManager *ui;
    GtkWidget *menubar;
    GtkAction *view_log;
    + GtkAction *audio_call;
    + GtkAction *video_call;
    + GtkAction *audio_video_call;
    +
    GtkAction *send_file;
    GtkAction *get_attention;
    GtkAction *add_pounce;
    @@ -75,16 +80,8 @@
    GtkWidget *typing_icon;
    - GtkUIManager *ui;
    -
    } menu;
    - struct
    - {
    - GtkWidget *search;
    -
    - } dialogs;
    -
    /* Tab dragging stuff. */
    gboolean in_drag;
    gboolean in_predrag;
    @@ -95,11 +92,6 @@
    gint drag_motion_signal;
    gint drag_leave_signal;
    -
    - /* Media menu options. */
    - GtkAction *audio_call;
    - GtkAction *video_call;
    - GtkAction *audio_video_call;
    };
    /*@}*/
    --- a/pidgin/gtkdialogs.c Sun Jul 08 12:36:02 2012 +0200
    +++ b/pidgin/gtkdialogs.c Sun Jul 08 17:37:44 2012 -0400
    @@ -458,9 +458,7 @@
    gtk_box_pack_start(GTK_BOX(vbox), logo, FALSE, FALSE, 0);
    frame = pidgin_create_webview(FALSE, &webview, NULL, NULL);
    - /* TODO WEBKIT: Compile now and fix it later when we have a proper replacement for this function
    - gtk_imhtml_set_format_functions(GTK_IMHTML(imhtml), GTK_IMHTML_ALL ^ GTK_IMHTML_SMILEY);
    - */
    + gtk_webview_set_format_functions(GTK_WEBVIEW(webview), GTK_WEBVIEW_ALL ^ GTK_WEBVIEW_SMILEY);
    gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0);
    gtk_webview_append_html(GTK_WEBVIEW(webview), string->str);