Fixed name conflict

pull/90/head
parent 98d7ab4e1b
commit 3eccd37f7c

@ -129,7 +129,7 @@ void on_file_chooser_file_activate(GtkFileChooser *self, repo_add_window *window
gtk_widget_destroy(gtk_widget_get_toplevel(GTK_WIDGET(self)));
}
file_chooser_window *yon_file_chooser_window_new(){
file_chooser_window *yon_file_chooser_new(){
file_chooser_window *window = malloc(sizeof(file_chooser_window));
GtkBuilder *builder = gtk_builder_new_from_resource(glade_path_filechooser);
window->Window = yon_gtk_builder_get_widget(builder,"Window");
@ -634,7 +634,7 @@ void on_add_accept(GtkWidget *self, dictionary *dict){
}
void on_add_package(GtkWidget *self, repo_add_window *window){
file_chooser_window *dialog = yon_file_chooser_window_new();
file_chooser_window *dialog = yon_file_chooser_new();
yon_gtk_window_setup(GTK_WINDOW(dialog->Window),GTK_WINDOW(window->MainWindow),CHOSE_PACKAGES_TITLE_LABEL,icon_path,"filechooserWindow");
gtk_label_set_text(GTK_LABEL(dialog->HeadLabel),CHOSE_PACKAGES_TITLE_LABEL);
gtk_widget_show(dialog->Window);
@ -958,7 +958,7 @@ void on_move_add_accept(GtkWidget *self, dictionary *dict){
void on_move_add_package(GtkWidget *self, repo_add_window *window){
if (gtk_combo_box_get_active(GTK_COMBO_BOX(window->MoveTargetArchEntry))>-1&&gtk_combo_box_get_active(GTK_COMBO_BOX(window->MoveSourceStorageEntry))>-1){
file_chooser_window *dialog = yon_file_chooser_window_new();
file_chooser_window *dialog = yon_file_chooser_new();
yon_gtk_window_setup(GTK_WINDOW(dialog->Window),GTK_WINDOW(window->MainWindow),CHOSE_PACKAGES_TITLE_LABEL,icon_path,"ChooseMoveFileChooserWindow");
gtk_label_set_text(GTK_LABEL(dialog->HeadLabel),CHOSE_PACKAGES_TITLE_LABEL);
GtkFileFilter *filter = gtk_file_filter_new();
@ -1130,7 +1130,7 @@ repo_add_window *on_move_clicked(GtkWidget *self, main_window *widgets){
void on_remove_add_package(GtkWidget *self, repo_add_window *window){
if (gtk_combo_box_get_active(GTK_COMBO_BOX(window->ArchitectureCombo))>-1){
file_chooser_window *dialog = yon_file_chooser_window_new();
file_chooser_window *dialog = yon_file_chooser_new();
yon_gtk_window_setup(GTK_WINDOW(dialog->Window),GTK_WINDOW(window->MainWindow),CHOSE_PACKAGES_TITLE_LABEL,icon_path,"ChooseMoveFileChooserWindow");
gtk_label_set_text(GTK_LABEL(dialog->HeadLabel),CHOSE_PACKAGES_TITLE_LABEL);
GtkFileFilter *filter = gtk_file_filter_new();

@ -40,7 +40,7 @@
#define LOAD_SUCCESS_LABEL _("Repository data has been loaded successfully")
#define SAVE_SUCCESS_LABEL _("Saving has succeeded")
#define SAVE_SUCCESSFUL_LABEL _("Saving has succeeded")
#define GENERAL_TAB_LABEL _("General")
#define PUBLICATION_TAB_LABEL _("Publication")

Loading…
Cancel
Save