X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Fvalues.c;h=17319a582ef3afc7f3b0b9863430671981fdf9e0;hb=9460d9624a5cf24126bc39605bc47d43330fcdf4;hp=a888d0a50c7adc4a7f6a927827d30e265592943b;hpb=ac64a83b84c8e3216a86f95476997c10329d977f;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/gtk/src/values.c b/gtk/src/values.c index a888d0a5..17319a58 100644 --- a/gtk/src/values.c +++ b/gtk/src/values.c @@ -15,6 +15,7 @@ #include #include #include +#include #include "values.h" static void dict_delete_key(gpointer data); @@ -96,7 +97,7 @@ debug_show_value(GValue *gval) } else if (tp == G_TYPE_INT64) { - g_message("Type %s value %ld", "int64", g_value_get_int64(gval)); + g_message("Type %s value %" PRId64, "int64", g_value_get_int64(gval)); } else if (tp == G_TYPE_DOUBLE) { @@ -252,6 +253,10 @@ ghb_value_cmp(const GValue *vala, const GValue *valb) GType typa; GType typb; + if ((vala == NULL && valb != NULL) || (vala != NULL && valb == NULL)) + { + return 1; + } typa = G_VALUE_TYPE(vala); typb = G_VALUE_TYPE(valb); if (typa != typb)