Fixed errors and warnings

.gitignore

@@ -15,4 +15,5 @@ css/
 images/
 locale/
 ui/
-ubl-settings-manager_ru.pos
+ubl-settings-manager_ru.pos
+deleted

README.md

@@ -1,5 +1,5 @@
 # ubl-settings-manager
-# Выполнить
+# Менеджер настроек UBLinux
 # Build
 In order to build ubl-settings-manager you will need:
 

VERSION.md

@@ -1 +1 @@
-VERSION 1.2
+VERSION 1.3

source/ubl-settings-manager.c

@@ -27,11 +27,6 @@ int removalsize=0;
 char *local;
 config main_config;
 
-char *cats[2]={"XFCE","GTK"};
-char *ubcatsPersonal[2]={"X-UBL-SettingsManager","X-UBL-PersonalSettings"};
-char *ubcatsSystem[2]={"X-UBL-SettingsManager","X-UBL-SystemSettings"};
-char *ubcatsHardware[2]={"X-UBL-SettingsManager","X-UBL-HardwareSettings"};
-char *ubcatsMisc[1]={NULL};
 int gnld=0;
 int stld=0;
 int cmld=0;
@@ -75,15 +70,14 @@ void on_Item_activated(GtkIconView* self, GtkTreePath* path, actionWidgets *appl
     
     apps *tempapp=get_app_by_name(applist->applist,name,applist->appssize);
     if (!tempapp){}else{
-        char arg[100];
+        char *arg=NULL;
-        memset(arg,0,100);
+        arg=yon_char_get_augumented("--socket-id=",yon_char_from_int((int)gtk_socket_get_id(GTK_SOCKET(applist->socket))));
-        sprintf(arg,"--socket-id=%d",gtk_socket_get_id(GTK_SOCKET(applist->socket)),gtk_socket_get_id(GTK_SOCKET(applist->socketbutton)));
         
         if (tempapp[0].Type==1){
             if (tempapp->Pluggable==1)
                 if (tempapp->DualPluggable==1){
-                    char *dualarg=malloc(strlen("--socket-id= --socket-ext-id= --socket-trd-id=")+30);
+                    char *dualarg=NULL;
-                    sprintf(dualarg,"--socket-id=%d --socket-ext-id=%d --socket-trd-id=%d",gtk_socket_get_id(GTK_SOCKET(applist->socket)),gtk_socket_get_id(GTK_SOCKET(applist->socketbutton)),gtk_socket_get_id(GTK_SOCKET(applist->ThirdSocket)));
+                    dualarg=yon_char_get_augumented("--socket-id=",yon_char_get_augumented(yon_char_from_int((int)gtk_socket_get_id(GTK_SOCKET(applist->socket))),yon_char_get_augumented(" --socket-ext-id=",yon_char_get_augumented(yon_char_from_int((int)gtk_socket_get_id(GTK_SOCKET(applist->socketbutton))),yon_char_get_augumented(" --socket-trd-id=",yon_char_from_int((int)gtk_socket_get_id(GTK_SOCKET(applist->ThirdSocket))))))));
                     launch_app_with_arguments(tempapp[0].Exec,dualarg);
                 } else
                     launch_app_with_arguments(tempapp[0].Exec,arg);
@@ -104,17 +98,15 @@ void on_gnome_Item_activated(GtkIconView* self, GtkTreePath* path, actionWidgets
     gtk_tree_model_get(gtk_icon_view_get_model(self),&iter,0,&name,-1);
     
     apps *tempapp=get_app_by_name(applist->applist,name,applist->appssize);
-    char arg[100];
+    char *arg=NULL;
-    memset(arg,0,100);
+    arg=yon_char_get_augumented("--socket-id=",yon_char_from_int((int)gtk_socket_get_id(GTK_SOCKET(applist->socket))));
-    sprintf(arg,"--socket-id=%d",gtk_socket_get_id(GTK_SOCKET(applist->socket)));
-    
     if (tempapp[0].Type==1){
         if (tempapp->Pluggable==1){
             
             if (tempapp->DualPluggable==1){
-                char *dualarg=malloc(strlen("--socket-id= --socket-ext-id= --socket-trd-id=")+30);
+                    char *dualarg=NULL;
-                sprintf(dualarg,"--socket-id=%d --socket-ext-id=%d --socket-trd-id=%d",gtk_socket_get_id(GTK_SOCKET(applist->socket)),gtk_socket_get_id(GTK_SOCKET(applist->socketbutton)),gtk_socket_get_id(GTK_SOCKET(applist->ThirdSocket)));
+                    dualarg=yon_char_get_augumented("--socket-id=",yon_char_get_augumented(yon_char_from_int((int)gtk_socket_get_id(GTK_SOCKET(applist->socket))),yon_char_get_augumented(" --socket-ext-id=",yon_char_get_augumented(yon_char_from_int((int)gtk_socket_get_id(GTK_SOCKET(applist->socketbutton))),yon_char_get_augumented(" --socket-trd-id=",yon_char_from_int((int)gtk_socket_get_id(GTK_SOCKET(applist->ThirdSocket))))))));
-                if (launch_app_with_arguments(tempapp[0].Exec,dualarg)==32512)
+                    if (launch_app_with_arguments(tempapp[0].Exec,dualarg)==32512)
                     gtk_widget_show(applist->infoWarningWindow);
             } 
             else{
@@ -144,7 +136,7 @@ void on_item_selection_changed(GtkIconView *IV, actionWidgets *widgets){
 void on_ButtonOpenHelp_activated(GtkWidget *button, GtkBuilder *builder){
     if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder,"AlwaysOpenHelpCheckbox"))))
     {
-        system("xdg-open http://ublinux.com");
+        if(system("xdg-open http://ublinux.com")){};
     } else 
     {
     GtkWidget *window = GTK_WIDGET(gtk_builder_get_object(builder,"HelpSureWindow"));
@@ -167,7 +159,7 @@ void on_CancelHelpButton_activated(GtkWidget *button,GtkBuilder *builder){
 };
 
 void on_ReadHelpButton_activated(GtkWidget *button, GtkBuilder *builder){
-    system("xdg-open http://ublinux.com");
+    if(system("xdg-open http://ublinux.com")){};
     GtkWidget *window = GTK_WIDGET(gtk_builder_get_object(builder,"HelpSureWindow"));
     gtk_widget_hide(window);
 };
@@ -705,22 +697,14 @@ int reload_list(IVGraphicals *section){
 }
 
 void update_double_clicks(dictionary *widgetsD){
-    printf("%s\n","1");
     for (dictionary *dict=widgetsD->first;dict!=NULL;dict=dict->next){
-    printf("%s\n","2");
         actionWidgets *widgets=(actionWidgets*)dict->data;
-    printf("%s\n","3");
         for (dictionary *ivdct=widgets->ICSys->first;ivdct!=NULL;ivdct=ivdct->next){
-    printf("%s\n","4");
             IVGraphicals *IV=(IVGraphicals*)ivdct->data;
-    printf("%s\n","5");
             if (strcmp(dict->key,"Gnome")==0){
-    printf("%s\n","6");
                 gtk_icon_view_set_activate_on_single_click(GTK_ICON_VIEW(IV->IV),!main_config.GnomeDoubleClick);
-    printf("%s\n","7");
             } else{
                 gtk_icon_view_set_activate_on_single_click(GTK_ICON_VIEW(IV->IV),!main_config.MainDoubleClick);
-    printf("%s\n","8");
             }
         }
     }
@@ -1453,6 +1437,19 @@ dictionary * yon_dictionary_create_conneced(dictionary *targetdict){
     return targetdict->next;
 }
 
+char *yon_char_from_int(int int_to_convert)
+{
+    int i = 1;
+    float convert_check = (float)int_to_convert;
+    for (i = 1; convert_check > 10; i++)
+    {
+        convert_check = convert_check / 10;
+    }
+    char *ch = malloc(i * sizeof(char) + 1);
+    sprintf(ch, "%d", int_to_convert);
+    return ch;
+};
+
 void yon_segment_show(actionWidgets *widgets, SectionSettingSegment *sgm){
     gtk_box_pack_start(GTK_BOX(widgets->SectionSettingsPack),sgm->MainFrame,FALSE,FALSE,5);
     g_signal_connect(G_OBJECT(sgm->ButtonEdit),"clicked",G_CALLBACK(on_sections_edit), widgets);
@@ -1770,11 +1767,11 @@ int main(int argc, char *argv[]){
         if (socket_find=='l') 
             main_config.lock_settings=1; 
         if (socket_find=='h') {
-            printf(cmdHelpText);
+            printf("%s\n",cmdHelpText);
             exit(0);
             }
         if (socket_find=='v') {
-            printf(cmdVersionText);
+            printf("%s\n",cmdVersionText);
             exit(0);
             }
     }

source/ubl-settings-manager.h

@@ -21,7 +21,7 @@
 #define ubl_settings_infoPath "ubl-settings-info"
 #define ubl_settings_infoPathLaunch "ubl-settings-info --socket-id="
 typedef char* string;
-string version_application = "1.2";
+string version_application = "1.3";
 
 
 typedef struct apps{
@@ -245,5 +245,6 @@ void yon_time_reg_for_average(dictionary *listofregs, int size, time_t tm);
 void yon_dictionary_switch_to_last(dictionary **dict);
 dictionary *yon_dictionary_create_conneced(dictionary *targetdict);
 int yon_get_icon_size(int size);
+char *yon_char_from_int(int int_to_convert);
 
 #endif