comparison: pidgin/gtkconv.c
pidgin/gtkconv.c
- changeset 35850
- 1abeda205d6c
- parent 35842
- 82fdaf2769b5
- child 35900
- b422038b7269
- child 37136
- cfa7c57f9ca5
equal
deleted
inserted
replaced
| 35849:77efee65c5f4 | 35850:1abeda205d6c |
|---|---|
| 4167 | 4167 |
| 4168 if (g_hash_table_lookup_extended(e2ee_stock, stock_name, NULL, (gpointer*)&image)) | 4168 if (g_hash_table_lookup_extended(e2ee_stock, stock_name, NULL, (gpointer*)&image)) |
| 4169 return image; | 4169 return image; |
| 4170 | 4170 |
| 4171 g_snprintf(filename, sizeof(filename), "%s.png", stock_name); | 4171 g_snprintf(filename, sizeof(filename), "%s.png", stock_name); |
| 4172 path = g_build_filename(DATADIR, "pixmaps", "pidgin", "e2ee", "16", | 4172 path = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin", |
| 4173 filename, NULL); | 4173 "e2ee", "16", filename, NULL); |
| 4174 image = purple_image_new_from_file(path, FALSE); | 4174 image = purple_image_new_from_file(path, FALSE); |
| 4175 g_free(path); | 4175 g_free(path); |
| 4176 | 4176 |
| 4177 g_hash_table_insert(e2ee_stock, g_strdup(stock_name), image); | 4177 g_hash_table_insert(e2ee_stock, g_strdup(stock_name), image); |
| 4178 return image; | 4178 return image; |
| 8958 purple_signal_connect(purple_conversations_get_handle(), "wrote-chat-msg", handle, | 8958 purple_signal_connect(purple_conversations_get_handle(), "wrote-chat-msg", handle, |
| 8959 PURPLE_CALLBACK(wrote_msg_update_unseen_cb), NULL); | 8959 PURPLE_CALLBACK(wrote_msg_update_unseen_cb), NULL); |
| 8960 | 8960 |
| 8961 purple_theme_manager_register_type(g_object_new(PIDGIN_TYPE_CONV_THEME_LOADER, "type", "conversation", NULL)); | 8961 purple_theme_manager_register_type(g_object_new(PIDGIN_TYPE_CONV_THEME_LOADER, "type", "conversation", NULL)); |
| 8962 #ifdef _WIN32 | 8962 #ifdef _WIN32 |
| 8963 theme_dir = g_build_filename(DATADIR, "theme", NULL); | 8963 theme_dir = g_build_filename(PURPLE_DATADIR, "theme", NULL); |
| 8964 #else | 8964 #else |
| 8965 theme_dir = g_build_filename(DATADIR, "pidgin", "theme", NULL); | 8965 theme_dir = g_build_filename(PURPLE_DATADIR, "pidgin", "theme", NULL); |
| 8966 #endif | 8966 #endif |
| 8967 default_conv_theme = purple_theme_manager_load_theme(theme_dir, "conversation"); | 8967 default_conv_theme = purple_theme_manager_load_theme(theme_dir, "conversation"); |
| 8968 g_free(theme_dir); | 8968 g_free(theme_dir); |
| 8969 | 8969 |
| 8970 #if !GTK_CHECK_VERSION(3,0,0) | 8970 #if !GTK_CHECK_VERSION(3,0,0) |
