← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/denemo/oneiric

« back to all changes in this revision

Viewing changes to src/kbd-interface.c

  • Committer: Bazaar Package Importer
  • Author(s): Alessio Treglia
  • Date: 2010-10-27 08:00:18 UTC
  • mfrom: (1.2.7 upstream) (3.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20101027080018-suwj9ozy99d0a5a2
Tags: 0.8.16-1ubuntu1
https://launchpad.net/bugs/638617
* Merge with Debian testing (LP: #638617), Ubuntu remaining changes:
  - debian/patches/ubuntuize.diff:
    + Provide a Ubuntu-specific customization.
  - debian/patches/fix_desktop.diff:
    + Add missing trailing semicolon.
    + Add MIME types.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/kbd-interface.c
18
18
#include "prefops.h"
19
19
#include "mousing.h"
20
20
 
 
21
#if 0
21
22
static void
22
23
validate_keymap_name (GtkEntry * entry, GtkDialog * dialog)
23
24
{
25
26
  gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog),
26
27
                                     GTK_RESPONSE_ACCEPT, strlen (name) > 0);
27
28
}
 
29
#endif
28
30
 
29
31
static gboolean
30
32
capture_add_binding(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
200
202
static void button_choice_callback(GtkWidget *w, gint *mask ){
201
203
  gint choice =  gtk_toggle_button_get_active((GtkToggleButton *)w);
202
204
  if(choice)
203
 
    *mask = (gint)g_object_get_data((GObject *)w, "mask");
 
205
    *mask = (intptr_t)g_object_get_data((GObject *)w, "mask");
204
206
  g_print("button choice %x\n", *mask);
205
207
}
206
208
#define RESPONSE_LOADED (1)