comparison: pidgin/plugins/pidginrc.c
pidgin/plugins/pidginrc.c
- branch
- string-comparison-r2
- changeset 38265
- ee28d52fe2ca
- parent 38262
- 8c0b26d1d508
equal
deleted
inserted
replaced
| 38264:99356e68aff5 | 38265:ee28d52fe2ca |
|---|---|
| 111 GString *style_string = g_string_new(""); | 111 GString *style_string = g_string_new(""); |
| 112 | 112 |
| 113 if (purple_prefs_get_bool("/plugins/gtk/purplerc/set/gtk-font-name")) { | 113 if (purple_prefs_get_bool("/plugins/gtk/purplerc/set/gtk-font-name")) { |
| 114 const gchar *pref = purple_prefs_get_string("/plugins/gtk/purplerc/gtk-font-name"); | 114 const gchar *pref = purple_prefs_get_string("/plugins/gtk/purplerc/gtk-font-name"); |
| 115 | 115 |
| 116 if (pref != NULL && pref[0] != '\0') { | 116 if (pref && *pref) { |
| 117 g_string_append_printf(style_string, | 117 g_string_append_printf(style_string, |
| 118 "gtk-font-name = \"%s\"\n", | 118 "gtk-font-name = \"%s\"\n", |
| 119 pref); | 119 pref); |
| 120 } | 120 } |
| 121 } | 121 } |
| 122 | 122 |
| 123 if (purple_prefs_get_bool("/plugins/gtk/purplerc/set/gtk-key-theme-name")) { | 123 if (purple_prefs_get_bool("/plugins/gtk/purplerc/set/gtk-key-theme-name")) { |
| 124 const gchar *pref = purple_prefs_get_string("/plugins/gtk/purplerc/gtk-key-theme-name"); | 124 const gchar *pref = purple_prefs_get_string("/plugins/gtk/purplerc/gtk-key-theme-name"); |
| 125 | 125 |
| 126 if (pref != NULL && pref[0] != '\0') { | 126 if (pref && *pref) { |
| 127 g_string_append_printf(style_string, | 127 g_string_append_printf(style_string, |
| 128 "gtk-key-theme-name = \"%s\"\n", | 128 "gtk-key-theme-name = \"%s\"\n", |
| 129 pref); | 129 pref); |
| 130 } | 130 } |
| 131 } | 131 } |
| 139 for (i = 0; i < G_N_ELEMENTS(color_prefs); i++) { | 139 for (i = 0; i < G_N_ELEMENTS(color_prefs); i++) { |
| 140 if (purple_prefs_get_bool(color_prefs_set[i])) { | 140 if (purple_prefs_get_bool(color_prefs_set[i])) { |
| 141 const gchar *pref; | 141 const gchar *pref; |
| 142 | 142 |
| 143 pref = purple_prefs_get_string(color_prefs[i]); | 143 pref = purple_prefs_get_string(color_prefs[i]); |
| 144 if (pref != NULL && pref[0] != '\0') { | 144 if (pref && *pref) { |
| 145 prefbase = g_path_get_basename(color_prefs[i]); | 145 prefbase = g_path_get_basename(color_prefs[i]); |
| 146 g_string_append_printf(style_string, | 146 g_string_append_printf(style_string, |
| 147 "\n\t%s = \"%s\"", | 147 "\n\t%s = \"%s\"", |
| 148 prefbase, pref); | 148 prefbase, pref); |
| 149 g_free(prefbase); | 149 g_free(prefbase); |
| 178 for (i = 0; i < G_N_ELEMENTS(font_prefs); i++) { | 178 for (i = 0; i < G_N_ELEMENTS(font_prefs); i++) { |
| 179 if (purple_prefs_get_bool(font_prefs_set[i])) { | 179 if (purple_prefs_get_bool(font_prefs_set[i])) { |
| 180 const gchar *pref; | 180 const gchar *pref; |
| 181 | 181 |
| 182 pref = purple_prefs_get_string(font_prefs[i]); | 182 pref = purple_prefs_get_string(font_prefs[i]); |
| 183 if (pref != NULL && pref[0] != '\0') { | 183 if (pref && *pref) { |
| 184 prefbase = g_path_get_basename(font_prefs[i]); | 184 prefbase = g_path_get_basename(font_prefs[i]); |
| 185 g_string_append_printf(style_string, | 185 g_string_append_printf(style_string, |
| 186 "style \"%s_style\"\n{\n" | 186 "style \"%s_style\"\n{\n" |
| 187 "\tfont_name = \"%s\"\n}" | 187 "\tfont_name = \"%s\"\n}" |
| 188 "\nwidget \"%s\" " | 188 "\nwidget \"%s\" " |
| 274 g_signal_connect(G_OBJECT(color_dialog), "response", | 274 g_signal_connect(G_OBJECT(color_dialog), "response", |
| 275 G_CALLBACK(purplerc_color_response), data); | 275 G_CALLBACK(purplerc_color_response), data); |
| 276 | 276 |
| 277 pref = purple_prefs_get_string(color_prefs[subscript]); | 277 pref = purple_prefs_get_string(color_prefs[subscript]); |
| 278 | 278 |
| 279 if (pref != NULL && pref[0] != '\0') { | 279 if (pref && *pref) { |
| 280 if (gdk_color_parse(pref, &color)) { | 280 if (gdk_color_parse(pref, &color)) { |
| 281 #if GTK_CHECK_VERSION(2,14,0) | 281 #if GTK_CHECK_VERSION(2,14,0) |
| 282 gtk_color_selection_set_current_color(GTK_COLOR_SELECTION( | 282 gtk_color_selection_set_current_color(GTK_COLOR_SELECTION( |
| 283 gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG(color_dialog))), | 283 gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG(color_dialog))), |
| 284 &color); | 284 &color); |
| 335 g_signal_connect(G_OBJECT(font_dialog), "response", | 335 g_signal_connect(G_OBJECT(font_dialog), "response", |
| 336 G_CALLBACK(purplerc_font_response), data); | 336 G_CALLBACK(purplerc_font_response), data); |
| 337 | 337 |
| 338 pref = purple_prefs_get_string(prefpath); | 338 pref = purple_prefs_get_string(prefpath); |
| 339 | 339 |
| 340 if (pref != NULL && pref[0] != '\0') { | 340 if (pref && *pref) { |
| 341 gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(font_dialog), pref); | 341 gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(font_dialog), pref); |
| 342 } | 342 } |
| 343 | 343 |
| 344 gtk_window_present(GTK_WINDOW(font_dialog)); | 344 gtk_window_present(GTK_WINDOW(font_dialog)); |
| 345 } | 345 } |
