← Back to branch summary

~ubuntu-branches/ubuntu/precise/empathy/precise-proposed-201205180810

« back to all changes in this revision

Viewing changes to libempathy-gtk/empathy-contact-dialogs.c

  • Committer: Bazaar Package Importer
  • Author(s): Brian Curtis, Brian Curtis, Ken VanDine
  • Date: 2011-06-01 10:35:24 UTC
  • mfrom: (1.1.70 upstream) (6.3.44 experimental)
  • Revision ID: james.westby@ubuntu.com-20110601103524-wx3wgp71394730jt
Tags: 3.1.1-1ubuntu1
[ Brian Curtis ]
* Merge with Debian experimental, remaining Ubuntu changes:
* debian/control:
  - Drop geoclue/mapping build-depends (they are in Universe)
  - Add Vcz-Bzr link
  - Add Suggests on telepathy-idle
  - Bump telepathy-butterfly, telepathy-haze to recommends
  - Don't recommend the freedesktop sound theme we have an ubuntu one
  - Add build depend for libunity-dev
* debian/rules:
  - Use autoreconf.mk
  - Disable map and location
* debian/empathy.install:
  - Install message indicator configuration
* debian/indicators/empathy:
  - Message indicator configuration
* debian/patches/01_lpi.patch:
  - Add Launchpad integration
* debian/patches/10_use_notify_osd_icons.patch:
  - Use the notify-osd image for new messages
* debian/patches/34_start_raised_execpt_in_session.patch
  - If not started with the session, we should always raise
* debian/patches/36_chat_window_default_size.patch:
  - Make the default chat window size larger
* debian/patches/37_facebook_default.patch:
  - Make facebook the default chat account type
* debian/patches/38_lp_569289.patch
  - Set freenode as default IRC network for new IRC accounts 
* debian/patches/41_unity_launcher_progress.patch
  - Display file transfer progress in the unity launcher

[ Ken VanDine ]
* debian/control
  - build depend on libgcr-3-dev instead of libgcr-dev
  - dropped build depends for libindicate, we will use telepathy-indicator
  - Depend on dconf-gsettings-backend | gsettings-backend
  - Added a Recommends for telepathy-indicator
* +debian/empathy.gsettings-override
  - Added an override for notifications-focus
* debian/patches/series
  - commented out 23_idomessagedialog_for_voip_and_ft.patch, until ido has 
    been ported to gtk3

Show diffs side-by-side

added added

removed removed

Lines of Context:
libempathy-gtk/empathy-contact-dialogs.c
112
112
 
113
113
void
114
114
empathy_subscription_dialog_show (EmpathyContact *contact,
 
115
                                  const gchar *message,
115
116
                                  GtkWindow     *parent)
116
117
{
117
118
        GtkBuilder *gui;
118
119
        GtkWidget *dialog;
119
120
        GtkWidget *hbox_subscription;
 
121
        GtkWidget *vbox;
120
122
        GtkWidget *contact_widget;
121
123
        GtkWidget *block_user_button;
122
124
        GList     *l;
146
148
        g_free (filename);
147
149
        g_object_unref (gui);
148
150
 
 
151
        vbox = gtk_vbox_new (FALSE, 6);
 
152
 
 
153
        gtk_box_pack_end (GTK_BOX (hbox_subscription), vbox,
 
154
                          TRUE, TRUE, 0);
 
155
 
149
156
        /* Contact info widget */
150
157
        contact_widget = empathy_contact_widget_new (contact,
151
158
                                                     EMPATHY_CONTACT_WIDGET_NO_SET_ALIAS |
152
159
                                                     EMPATHY_CONTACT_WIDGET_EDIT_ALIAS |
153
 
                                                     EMPATHY_CONTACT_WIDGET_EDIT_GROUPS);
154
 
        gtk_box_pack_end (GTK_BOX (hbox_subscription),
 
160
                                                     EMPATHY_CONTACT_WIDGET_EDIT_GROUPS |
 
161
                                                     EMPATHY_CONTACT_WIDGET_SHOW_DETAILS);
 
162
        gtk_box_pack_start (GTK_BOX (vbox),
155
163
                          contact_widget,
156
164
                          TRUE, TRUE,
157
165
                          0);
 
166
 
 
167
        if (!tp_str_empty (message)) {
 
168
                GtkWidget *label;
 
169
                gchar *tmp;
 
170
 
 
171
                label = gtk_label_new ("");
 
172
                tmp = g_strdup_printf ("<i>%s</i>", message);
 
173
 
 
174
                gtk_label_set_markup (GTK_LABEL (label), tmp);
 
175
                g_free (tmp);
 
176
                gtk_widget_show (label);
 
177
 
 
178
                gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
179
        }
 
180
 
158
181
        gtk_widget_show (contact_widget);
 
182
        gtk_widget_show (vbox);
159
183
 
160
184
        g_object_set_data (G_OBJECT (dialog), "contact_widget", contact_widget);
161
185
        subscription_dialogs = g_list_prepend (subscription_dialogs, dialog);