← Back to branch summary

~ubuntu-branches/ubuntu/wily/sflphone/wily

« back to all changes in this revision

Viewing changes to gnome/src/dialpad.c

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2015-01-07 14:51:16 UTC
  • mfrom: (4.3.5 sid)
  • Revision ID: package-import@ubuntu.com-20150107145116-yxnafinf4lrdvrmx
Tags: 1.4.1-0.1ubuntu1
* Merge with Debian, remaining changes:
 - Drop soprano, nepomuk build-dep
* Drop ubuntu patches, now upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
gnome/src/dialpad.c
56
56
}
57
57
 
58
58
GtkWidget *
59
 
get_numpad_button(const gchar* number, gboolean twolines, const gchar * letters, SFLPhoneClient *client)
 
59
get_numpad_button(const gchar* number, const gchar * letters, SFLPhoneClient *client)
60
60
{
61
61
    GtkWidget *button = gtk_button_new();
62
62
    GtkWidget *label = gtk_label_new("1");
63
63
    gtk_label_set_single_line_mode(GTK_LABEL(label), FALSE);
64
64
    gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_CENTER);
65
 
    gchar *markup = g_markup_printf_escaped("<big><b>%s</b></big>%s%s", number, (twolines == TRUE ? "\n": ""), letters);
 
65
    gchar *markup = g_markup_printf_escaped("<big><b>%s</b></big>\n%s", number, letters);
66
66
    gtk_label_set_markup(GTK_LABEL(label), markup);
67
67
    gtk_container_add(GTK_CONTAINER(button), label);
68
68
    DialpadData * dialpad_data = g_new0(DialpadData, 1);
103
103
 
104
104
    for (int row = 0, entry = 0; row != ROWS; ++row)
105
105
        for (int col = 0; col != COLS; ++col) {
106
 
            GtkWidget *button = get_numpad_button(key_strings[entry], TRUE, key_strings[entry + 1], client);
 
106
            GtkWidget *button = get_numpad_button(key_strings[entry], key_strings[entry + 1], client);
107
107
            gtk_grid_attach(GTK_GRID(grid), button, col, row, 1, 1);
108
108
            entry += 2;
109
109
        }