Revision: 6513
Author: [email protected]
Date: Thu Jul 15 11:03:59 2010
Log: * helper/pref-gtk.c (create_pref_treeview):
* helper/pref-gtk-custom-widgets.c (custom_pathname_button_clicked_cb)
(choose_olist_clicked_cb, choose_key_clicked_cb):
* helper/im-switcher-gtk.c (create_switcher_treeview):
* helper/candwin-gtk.c (candidate_window_init):
* gtk/uim-cand-win-gtk.c (uim_cand_win_gtk_init):
- Cast to pointer, Don't set a null pointer constant.
http://code.google.com/p/uim/source/detail?r=6513
Modified:
/trunk/gtk/uim-cand-win-gtk.c
/trunk/helper/candwin-gtk.c
/trunk/helper/dict-dict.c
/trunk/helper/im-switcher-gtk.c
/trunk/helper/pref-gtk-custom-widgets.c
/trunk/helper/pref-gtk.c
=======================================
--- /trunk/gtk/uim-cand-win-gtk.c Sun Jul 4 19:17:55 2010
+++ /trunk/gtk/uim-cand-win-gtk.c Thu Jul 15 11:03:59 2010
@@ -212,22 +212,22 @@
G_CALLBACK(tree_selection_changed), cwin);
renderer = gtk_cell_renderer_text_new();
- g_object_set(renderer, "scale", 0.8, NULL);
+ g_object_set(renderer, "scale", 0.8, (const gchar *)NULL);
column = gtk_tree_view_column_new_with_attributes("No",
renderer,
"text", COLUMN_HEADING,
- NULL);
+ (GtkCellRenderer *)NULL);
gtk_tree_view_append_column(GTK_TREE_VIEW(cwin->view), column);
gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
renderer = gtk_cell_renderer_text_new();
- g_object_set(renderer, "scale", 1.2, NULL);
+ g_object_set(renderer, "scale", 1.2, (const gchar *)NULL);
/* g_object_set(renderer, "size-points", 20.0, NULL); */
column = gtk_tree_view_column_new_with_attributes("Text",
renderer,
"text", COLUMN_CANDIDATE,
- NULL);
+ (GtkCellRenderer *)NULL);
gtk_tree_view_append_column(GTK_TREE_VIEW(cwin->view), column);
gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(cwin->view), TRUE);
gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(cwin->view), FALSE);
=======================================
--- /trunk/helper/candwin-gtk.c Sun Jul 4 19:17:55 2010
+++ /trunk/helper/candwin-gtk.c Thu Jul 15 11:03:59 2010
@@ -413,24 +413,24 @@
G_CALLBACK(tree_selection_changed), cwin);
renderer = gtk_cell_renderer_text_new();
- g_object_set(renderer, "scale", 0.8, NULL);
+ g_object_set(renderer, "scale", 0.8, (const gchar *)NULL);
column = gtk_tree_view_column_new_with_attributes("No",
renderer,
"text",
COLUMN_HEADING,
- NULL);
+ (GtkCellRenderer *)NULL);
gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
gtk_tree_view_append_column(GTK_TREE_VIEW(cwin->view), column);
renderer = gtk_cell_renderer_text_new();
- g_object_set(renderer, "scale", 1.2, NULL);
+ g_object_set(renderer, "scale", 1.2, (const gchar *)NULL);
/* g_object_set(renderer, "size-points", 20.0, NULL); */
column = gtk_tree_view_column_new_with_attributes("Text",
renderer,
"text",
COLUMN_CANDIDATE,
- NULL);
+ (GtkCellRenderer *)NULL);
gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
gtk_tree_view_append_column(GTK_TREE_VIEW(cwin->view), column);
=======================================
--- /trunk/helper/dict-dict.c Sun Apr 4 20:35:54 2010
+++ /trunk/helper/dict-dict.c Thu Jul 15 11:03:59 2010
@@ -52,6 +52,7 @@
#ifdef USE_CANNA
&uim_dict_class_canna,
#endif
+ NULL
};
static unsigned int nr_classes = sizeof(classes) / sizeof(uim_dict_class
*);
=======================================
--- /trunk/helper/im-switcher-gtk.c Thu Jul 15 00:21:23 2010
+++ /trunk/helper/im-switcher-gtk.c Thu Jul 15 11:03:59 2010
@@ -308,7 +308,7 @@
column = gtk_tree_view_column_new_with_attributes(_("InputMethodName"),
renderer,
"text", NAME_COLUMN,
- NULL);
+ (GtkCellRenderer *)NULL);
gtk_tree_view_column_set_sort_column_id(column, 0);
gtk_tree_view_append_column(GTK_TREE_VIEW(switcher_tree_view), column);
@@ -317,7 +317,7 @@
column = gtk_tree_view_column_new_with_attributes(_("Language"),
renderer,
"text", LANG_COLUMN,
- NULL);
+ (GtkCellRenderer *)NULL);
gtk_tree_view_column_set_sort_column_id(column, 1);
gtk_tree_view_append_column(GTK_TREE_VIEW(switcher_tree_view), column);
@@ -326,7 +326,7 @@
column = gtk_tree_view_column_new_with_attributes(_("Description"),
renderer,
"text", DESC_COLUMN,
- NULL);
+ (GtkCellRenderer *)NULL);
gtk_tree_view_column_set_sort_column_id(column, 2);
gtk_tree_view_append_column(GTK_TREE_VIEW(switcher_tree_view), column);
=======================================
--- /trunk/helper/pref-gtk-custom-widgets.c Sun Apr 4 20:35:54 2010
+++ /trunk/helper/pref-gtk-custom-widgets.c Thu Jul 15 11:03:59 2010
@@ -451,7 +451,7 @@
action,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
- NULL);
+ (const gchar *)NULL);
if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) {
char *filename;
@@ -1222,7 +1222,7 @@
column = gtk_tree_view_column_new_with_attributes(_("Enabled items"),
renderer,
"text", 0,
- NULL);
+ (GtkCellRenderer *)NULL);
gtk_tree_view_append_column(GTK_TREE_VIEW(tree_view), column);
g_object_unref(store);
@@ -1326,7 +1326,7 @@
column = gtk_tree_view_column_new_with_attributes(_("Disabled items"),
renderer,
"text", 0,
- NULL);
+ (GtkCellRenderer *)NULL);
gtk_tree_view_append_column(GTK_TREE_VIEW(tree_view), column);
g_object_unref(store);
@@ -1778,7 +1778,7 @@
column = gtk_tree_view_column_new_with_attributes(_("Key preference"),
renderer,
"text", 0,
- NULL);
+ (GtkCellRenderer *)NULL);
gtk_tree_view_append_column(GTK_TREE_VIEW(view), column);
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
=======================================
--- /trunk/helper/pref-gtk.c Thu Jul 15 00:08:59 2010
+++ /trunk/helper/pref-gtk.c Thu Jul 15 11:03:59 2010
@@ -278,7 +278,7 @@
column = gtk_tree_view_column_new_with_attributes(_("Group"),
renderer,
"text", GROUP_COLUMN,
- NULL);
+ (GtkCellRenderer *)NULL);
gtk_tree_view_column_set_sort_column_id(column, 0);
gtk_tree_view_append_column(GTK_TREE_VIEW(pref_tree_view), column);
