← Back to branch summary

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

« back to all changes in this revision

Viewing changes to gnome/src/config/preferencesdialog.c

  • Committer: Package Import Robot
  • Author(s): Whoopie
  • Date: 2012-03-22 10:29:10 UTC
  • mfrom: (4.1.12 sid)
  • Revision ID: package-import@ubuntu.com-20120322102910-tb8hugi2su1tguwh
Tags: 1.0.2-1ubuntu1
https://launchpad.net/bugs/913018
* Apply some upstream patches to fix FTBFS (LP: #913018):
  - debian/patches/05_glib_includes.patch: fix glib includes.
  - debian/patches/06_use_XkbKeycodeToKeysym.patch: use 
    XkbKeycodeToKeysym instead of (deprecated) XKeycodeToKeysym.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gnome/src/config/preferencesdialog.c
32
32
 *  as that of the covered work.
33
33
 */
34
34
 
 
35
#include <glib/gi18n.h>
35
36
#include <gtk/gtk.h>
36
37
#include <stdlib.h>
37
38
#include <stdio.h>
346
347
    };
347
348
    GdkPixbuf *pixbuf;
348
349
    GtkTreeIter iter;
349
 
    gint i, nb_entries;
350
350
 
351
351
    GtkListStore *store = gtk_list_store_new(3, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_INT);
352
 
    nb_entries = sizeof(browser_entries_full) / sizeof(browser_entries_full[0]);
 
352
    gint nb_entries = sizeof(browser_entries_full) / sizeof(browser_entries_full[0]);
 
353
    /* Skip address book entry if that plugin is not installed */
 
354
    if (!addrbook)
 
355
        --nb_entries;
353
356
 
354
 
    for (i = 0; i < nb_entries; i++) {
 
357
    for (gint i = 0; i < nb_entries; ++i) {
355
358
        gtk_list_store_append (store, &iter);
356
359
        pixbuf = get_icon(browser_entries_full[i].icon_name, widget);
357
360
        gtk_list_store_set(store, &iter,