← Back to branch summary

~noskcaj/ubuntu/saucy/sflphone/merge-1.2.3-2

« back to all changes in this revision

Viewing changes to gnome/src/widget/imwidget.c

  • Committer: Package Import Robot
  • Author(s): Francois Marier
  • Date: 2012-02-18 21:47:09 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20120218214709-6362d71gqdsdkrj5
Tags: 1.0.2-1
http://bugs.debian.org/658987
* New upstream release
  - remove logging patch (applied upstream)
  - update s390 patch since it was partially applied upstream
* Include the Evolution plugin as a separate binary package

* Fix compilation issues on SH4 (closes: #658987)
* Merge Ubuntu's binutils-gold linking fix

Show diffs side-by-side

added added

removed removed

Lines of Context:
gnome/src/widget/imwidget.c
238
238
    im->info_bar = gtk_info_bar_new();
239
239
 
240
240
    /* A bar with the entry text and the button to send the message */
241
 
    GtkWidget *box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
 
241
    GtkWidget *box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
242
242
    gtk_text_view_set_editable(GTK_TEXT_VIEW(im->textarea), TRUE);
243
243
    gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(textscrollwin), GTK_POLICY_NEVER, GTK_POLICY_NEVER);
244
244
    gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(webscrollwin), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
269
269
     */
270
270
    gtk_orientable_set_orientation (GTK_ORIENTABLE (im),
271
271
                                    GTK_ORIENTATION_VERTICAL);
 
272
 
272
273
}
273
274
 
274
275
GType
344
345
    gchar *msg1;
345
346
 
346
347
    if (im_widget_call)
347
 
        msg1 = g_strdup_printf("Calling %s  %s", im_widget_call->_peer_number, im_widget_call->_peer_name);
 
348
        msg1 = g_strdup_printf("Calling %s  %s", im_widget_call->_peer_number, im_widget_call->_display_name);
348
349
    else if (im_widget_conf)
349
350
        msg1 = g_strdup_printf("Conferencing");
350
351
    else