Mercurial > pidgin.yaz

comparison pidgin/gtkconv-theme-loader.c @ 32649:1caf13175039

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Be a bit stricter about types in Info.plist.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Mon, 19 Sep 2011 20:36:05 +0000
parents a56483e407d4
children 8716216050ee
comparison
equal deleted inserted replaced
32648:a56483e407d4 32649:1caf13175039
132 return NULL; 132 return NULL;
133 } 133 }
134 134
135 /* Check for required keys: CFBundleName */ 135 /* Check for required keys: CFBundleName */
136 val = g_hash_table_lookup(info, "CFBundleName"); 136 val = g_hash_table_lookup(info, "CFBundleName");
137 if (!val) { 137 if (!val || !G_VALUE_HOLDS_STRING(val)) {
138 purple_debug_error("gtkconv-theme-loader", 138 purple_debug_error("gtkconv-theme-loader",
139 "%s/Contents/Info.plist missing required key CFBundleName.\n", 139 "%s/Contents/Info.plist missing required string key CFBundleName.\n",
140 dir); 140 dir);
141 g_hash_table_destroy(info); 141 g_hash_table_destroy(info);
142 return NULL; 142 return NULL;
143 } 143 }
144 CFBundleName = g_value_get_string(val); 144 CFBundleName = g_value_get_string(val);
145 145
146 /* Check for required keys: CFBundleIdentifier */ 146 /* Check for required keys: CFBundleIdentifier */
147 val = g_hash_table_lookup(info, "CFBundleIdentifier"); 147 val = g_hash_table_lookup(info, "CFBundleIdentifier");
148 if (!val) { 148 if (!val || !G_VALUE_HOLDS_STRING(val)) {
149 purple_debug_error("gtkconv-theme-loader", 149 purple_debug_error("gtkconv-theme-loader",
150 "%s/Contents/Info.plist missing required key CFBundleIdentifier.\n", 150 "%s/Contents/Info.plist missing required string key CFBundleIdentifier.\n",
151 dir); 151 dir);
152 g_hash_table_destroy(info); 152 g_hash_table_destroy(info);
153 return NULL; 153 return NULL;
154 } 154 }
155 CFBundleIdentifier = g_value_get_string(val); 155 CFBundleIdentifier = g_value_get_string(val);
156 156
157 /* Check for required keys: MessageViewVersion */ 157 /* Check for required keys: MessageViewVersion */
158 val = g_hash_table_lookup(info, "MessageViewVersion"); 158 val = g_hash_table_lookup(info, "MessageViewVersion");
159 if (!val) { 159 if (!val || !G_VALUE_HOLDS_INT(val)) {
160 purple_debug_error("gtkconv-theme-loader", 160 purple_debug_error("gtkconv-theme-loader",
161 "%s/Contents/Info.plist missing required key MessageViewVersion.\n", 161 "%s/Contents/Info.plist missing required integer key MessageViewVersion.\n",
162 dir); 162 dir);
163 g_hash_table_destroy(info); 163 g_hash_table_destroy(info);
164 return NULL; 164 return NULL;
165 } 165 }
166 166