[patch] /usr/portage/dev-ada/gps/files/gps-4.0.2-gtkada.patch

gps-4.0.2-gtkada.patch (text/plain), 4.97 KB, created by gentoo on 2007-09-27 17:24:51 UTC

diff -ur gps-4.0.2-gpl-src/gps-4.0.2/builder/src/builder_module.adb gps-4.0.2/builder/src/builder_module.adb
--- gps-4.0.2-gpl-src/gps-4.0.2/builder/src/builder_module.adb	2006-08-31 17:56:45.000000000 +0200
+++ gps-4.0.2/builder/src/builder_module.adb	2007-09-26 18:06:05.000000000 +0200
@@ -1733,11 +1733,13 @@
                   Found      => Found);
 
                if not Found or else Key.Accel_Key = 0 then
-                  Change_Entry
+                  if Change_Entry
                     (Accel_Path => Accel_Path,
                      Accel_Key  => GDK_F4,
                      Accel_Mods => 0,
-                     Replace    => False);
+                     Replace    => False) then
+                     null;
+                  end if;
                end if;
 
                Builder_Module_ID.Build_Item := Gtk_Menu_Item (Mitem);
@@ -1847,11 +1849,13 @@
                      Found      => Found);
 
                   if not Found or else Key.Accel_Key = 0 then
-                     Change_Entry
+                     if Change_Entry
                        (Accel_Path => Accel_Path,
                         Accel_Key  => GDK_F2,
                         Accel_Mods => Shift_Mask,
-                        Replace    => False);
+                        Replace    => False) then
+                        null;
+                     end if;
                   end if;
 
                   Builder_Module_ID.Build_Item := Gtk_Menu_Item (Mitem);
@@ -1900,7 +1904,7 @@
            and then Accel_Path /= Make_Menu_Prefix & Current_Make_Suffix
            and then Accel_Path /= Make_Menu_Prefix & Project_Make_Suffix
          then
-            Change_Entry (Accel_Path, 0, 0, True);
+            if Change_Entry (Accel_Path, 0, 0, True) then null; end if;
 
          elsif Accel_Path'Length > Run_Menu_Prefix'Length
            and then Accel_Path
@@ -1909,7 +1913,7 @@
                Run_Menu_Prefix
            and then Accel_Path /= Run_Menu_Prefix & Custom_Make_Suffix
          then
-            Change_Entry (Accel_Path, 0, 0, True);
+            if Change_Entry (Accel_Path, 0, 0, True) then null; end if;
          end if;
       end Cleanup_Binding;
 
diff -ur gps-4.0.2-gpl-src/gps-4.0.2/keymanager/src/keymanager_module.adb gps-4.0.2/keymanager/src/keymanager_module.adb
--- gps-4.0.2-gpl-src/gps-4.0.2/keymanager/src/keymanager_module.adb	2006-07-13 11:12:59.000000000 +0200
+++ gps-4.0.2/keymanager/src/keymanager_module.adb	2007-09-26 18:12:33.000000000 +0200
@@ -821,11 +821,11 @@
 
          if Update_Menus and then Action (Action'First) = '/' then
             --  Guess the accel path from the menu
-            Change_Entry
+            if Change_Entry
               ("<gps>" & Action,
                Accel_Key  => 0,
                Accel_Mods => 0,
-               Replace    => True);
+               Replace    => True) then null; end if;
          end if;
 
       end if;
@@ -851,11 +851,11 @@
 
                if Update_Menus and then Action (Action'First) = '/' then
                   --  Guess the accel path from the menu
-                  Change_Entry
+                  if Change_Entry
                     ("<gps>" & Action,
                      Accel_Key  => Partial_Key,
                      Accel_Mods => Modif,
-                     Replace    => True);
+                     Replace    => True) then null; end if;
                end if;
 
             else
@@ -1578,11 +1578,11 @@
                    Accel_Path (First .. Accel_Path'Last)
                then
                   Found := True;
-                  Change_Entry
+                  if Change_Entry
                     (Accel_Path => Accel_Path,
                      Accel_Key  => Get_Key (Iter).Key,
                      Accel_Mods => Get_Key (Iter).Modifier,
-                     Replace    => True);
+                     Replace    => True) then null; end if;
                   exit Foreach_Binding;
                end if;
 
@@ -1593,11 +1593,11 @@
          end loop Foreach_Binding;
 
          if not Found then
-            Change_Entry
+            if Change_Entry
               (Accel_Path => Accel_Path,
                Accel_Key  => 0,
                Accel_Mods => 0,
-               Replace    => True);
+               Replace    => True) then null; end if;
          end if;
       end Process_Menu_Binding;
 
diff -ur gps-4.0.2-gpl-src/gps-4.0.2/views/src/bookmark_views.adb gps-4.0.2/views/src/bookmark_views.adb
--- gps-4.0.2-gpl-src/gps-4.0.2/views/src/bookmark_views.adb	2006-04-05 12:12:40.000000000 +0200
+++ gps-4.0.2/views/src/bookmark_views.adb	2007-09-26 00:15:13.000000000 +0200
@@ -600,7 +600,7 @@
          Append (Model, Iter, Null_Iter);
          Set (Model, Iter, Icon_Column, C_Proxy (View.Goto_Icon));
          Set (Model, Iter, Name_Column, Data (List).Name.all);
-         Set (Model, Iter, Data_Column, Convert (Data (List)));
+         Gtk.Tree_Store.Set (Model, Iter, Data_Column, Convert (Data (List)));
          Set (Model, Iter, Editable_Column, True);
          List := Next (List);
       end loop;