Applications
/
libublsettings-gtk3
8
0
Fork 1
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'master' (#76) from YanTheKaller/libublsettings-gtk3:master into master

Browse Source 
Reviewed-on: #76
master v1.70
Dmitry Razumov 3 weeks ago
parent 787086976a e77f71df3a
commit 504d0aca4d
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File

2
locale/ubl-timezone_ru.po
Unescape View File

@ -1311,7 +1311,7 @@ msgid "Atyrau"
msgstr "Атырау" msgstr "Атырау"
msgid "Oral" msgid "Oral"
msgstr "Оральный" msgstr "Уральск"
msgid "Vientiane" msgid "Vientiane"
msgstr "Вьентьян" msgstr "Вьентьян"

1
source/libublsettings-gtk3-menu.c
Unescape View File

@ -44,6 +44,7 @@ rmb_menu_window *yon_rmb_menu_setup(GtkWidget *target_widget, int (show_function
GtkWidget *label = gtk_label_new(button_label); GtkWidget *label = gtk_label_new(button_label);
gtk_box_pack_start(GTK_BOX(content_box),label,0,0,0); gtk_box_pack_start(GTK_BOX(content_box),label,0,0,0);
g_object_set_data(G_OBJECT(menu_item),"Label",label);
if (function){ if (function){
g_signal_connect(G_OBJECT(menu_item),"activate",function,data); g_signal_connect(G_OBJECT(menu_item),"activate",function,data);

11
source/libublsettings-gtk3-packages.c
Unescape View File

@ -318,7 +318,7 @@ yon_packages_info *yon_packages_get_info_struct(enum YON_PACKAGES_DB_TYPE type,
int parsed_size=0; int parsed_size=0;
config_str parsed = NULL; config_str parsed = NULL;
for (int i=0;i<size;i++){ for (int i=0;i<size;i++){
yon_char_parsed_add_or_create_if_exists(parsed,&parsed_size,((alpm_depend_t*)provides_list->data)->name); yon_char_parsed_add_or_create_if_exists(parsed,&parsed_size,((alpm_depend_t*)alpm_list_nth(provides_list,i)->data)->name);
} }
package_info->provides = yon_char_parsed_to_string(parsed,parsed_size, " "); package_info->provides = yon_char_parsed_to_string(parsed,parsed_size, " ");
// alpm_list_free(provides_list); // alpm_list_free(provides_list);
@ -330,7 +330,8 @@ yon_packages_info *yon_packages_get_info_struct(enum YON_PACKAGES_DB_TYPE type,
int parsed_size=0; int parsed_size=0;
config_str parsed = NULL; config_str parsed = NULL;
for (int i=0;i<size;i++){ for (int i=0;i<size;i++){
yon_char_parsed_add_or_create_if_exists(parsed,&parsed_size,((alpm_depend_t*)depends_list->data)->name);
yon_char_parsed_add_or_create_if_exists(parsed,&parsed_size,((alpm_depend_t*)alpm_list_nth(depends_list,i)->data)->name);
} }
package_info->depends = yon_char_parsed_to_string(parsed,parsed_size, " "); package_info->depends = yon_char_parsed_to_string(parsed,parsed_size, " ");
// alpm_list_free(depends_list); // alpm_list_free(depends_list);
@ -342,7 +343,7 @@ yon_packages_info *yon_packages_get_info_struct(enum YON_PACKAGES_DB_TYPE type,
int parsed_size=0; int parsed_size=0;
config_str parsed = NULL; config_str parsed = NULL;
for (int i=0;i<size;i++){ for (int i=0;i<size;i++){
yon_char_parsed_add_or_create_if_exists(parsed,&parsed_size,((alpm_depend_t*)optdepends_list->data)->name); yon_char_parsed_add_or_create_if_exists(parsed,&parsed_size,((alpm_depend_t*)alpm_list_nth(optdepends_list,i)->data)->name);
} }
package_info->optional_depends = yon_char_parsed_to_string(parsed,parsed_size, " "); package_info->optional_depends = yon_char_parsed_to_string(parsed,parsed_size, " ");
// alpm_list_free(optdepends_list); // alpm_list_free(optdepends_list);
@ -354,7 +355,7 @@ yon_packages_info *yon_packages_get_info_struct(enum YON_PACKAGES_DB_TYPE type,
int parsed_size=0; int parsed_size=0;
config_str parsed = NULL; config_str parsed = NULL;
for (int i=0;i<size;i++){ for (int i=0;i<size;i++){
yon_char_parsed_add_or_create_if_exists(parsed,&parsed_size,((alpm_depend_t*)conflicts_list->data)->name); yon_char_parsed_add_or_create_if_exists(parsed,&parsed_size,((alpm_depend_t*)alpm_list_nth(conflicts_list,i)->data)->name);
} }
package_info->conflicts = yon_char_parsed_to_string(parsed,parsed_size, " "); package_info->conflicts = yon_char_parsed_to_string(parsed,parsed_size, " ");
// alpm_list_free(conflicts_list); // alpm_list_free(conflicts_list);
@ -366,7 +367,7 @@ yon_packages_info *yon_packages_get_info_struct(enum YON_PACKAGES_DB_TYPE type,
int parsed_size=0; int parsed_size=0;
config_str parsed = NULL; config_str parsed = NULL;
for (int i=0;i<size;i++){ for (int i=0;i<size;i++){
yon_char_parsed_add_or_create_if_exists(parsed,&parsed_size,((alpm_depend_t*)replaces_list->data)->name); yon_char_parsed_add_or_create_if_exists(parsed,&parsed_size,((alpm_depend_t*)alpm_list_nth(replaces_list,i)->data)->name);
} }
package_info->replaces = yon_char_parsed_to_string(parsed,parsed_size, " "); package_info->replaces = yon_char_parsed_to_string(parsed,parsed_size, " ");
// alpm_list_free(replaces_list); // alpm_list_free(replaces_list);

2
source/libublsettings-gtk3.h
Unescape View File

@ -140,7 +140,7 @@ void yon_window_config_add_listener(GtkWidget *widget, char *param_name, char *w
* Параметр [param_name] добавляется в раздел [section] конфига утилиты со значением [tracked value]. * Параметр [param_name] добавляется в раздел [section] конфига утилиты со значением [tracked value].
* Тип указывается в [type] * Тип указывается в [type]
*/ */
void yon_window_config_add_custom_parameter(char *param_name, char *section, void *tracked_value, enum YON_TYPE val_type); __attribute__((__deprecated__)) void yon_window_config_add_custom_parameter(char *param_name, char *section, void *tracked_value, enum YON_TYPE val_type);
void yon_window_config_add_instant_parameter(char *param_name, char *section, void *tracked_value, enum YON_TYPE val_type); void yon_window_config_add_instant_parameter(char *param_name, char *section, void *tracked_value, enum YON_TYPE val_type);

Write Preview
Loading…
Cancel
Save