callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix pltcheck issues

Browse Source 
svn path=/trunk/; revision=22198
This commit is contained in:
Matthias Clasen
2009-01-23 17:10:08 +00:00
parent faf6a832d4
commit 33d5c3d696
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2009-01-23 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkrecentchooser.c:
* gtk/gtkuimanager.c: Fix issues found by pltcheck
2009-01-23 Matthias Clasen <mclasen@redhat.com> 2009-01-23 Matthias Clasen <mclasen@redhat.com>
* NEWS: Updates * NEWS: Updates

9
gtk/gtkrecentchooser.c
View File

@ -1103,8 +1103,8 @@ _gtk_recent_chooser_activatable_update (GtkActivatable *activatable,
GtkRecentAction *recent_action = GTK_RECENT_ACTION (action); GtkRecentAction *recent_action = GTK_RECENT_ACTION (action);
if (strcmp (property_name, "show-numbers") == 0 && recent_chooser_has_show_numbers (recent_chooser)) if (strcmp (property_name, "show-numbers") == 0 && recent_chooser_has_show_numbers (recent_chooser))
gtk_recent_chooser_set_show_numbers (recent_chooser, g_object_set (recent_chooser, "show-numbers",
gtk_recent_action_get_show_numbers (recent_action)); gtk_recent_action_get_show_numbers (recent_action), NULL);
else if (strcmp (property_name, "show-private") == 0) else if (strcmp (property_name, "show-private") == 0)
gtk_recent_chooser_set_show_private (recent_chooser, gtk_recent_chooser_get_show_private (action_chooser)); gtk_recent_chooser_set_show_private (recent_chooser, gtk_recent_chooser_get_show_private (action_chooser));
else if (strcmp (property_name, "show-not-found") == 0) else if (strcmp (property_name, "show-not-found") == 0)
@ -1134,8 +1134,9 @@ _gtk_recent_chooser_activatable_reset (GtkActivatable *activatable,
return; return;
if (recent_chooser_has_show_numbers (recent_chooser)) if (recent_chooser_has_show_numbers (recent_chooser))
gtk_recent_chooser_set_show_numbers (recent_chooser, g_object_set (recent_chooser, "show-numbers",
gtk_recent_action_get_show_numbers (GTK_RECENT_ACTION (action))); gtk_recent_action_get_show_numbers (GTK_RECENT_ACTION (action)),
NULL);
gtk_recent_chooser_set_show_private (recent_chooser, gtk_recent_chooser_get_show_private (action_chooser)); gtk_recent_chooser_set_show_private (recent_chooser, gtk_recent_chooser_get_show_private (action_chooser));
gtk_recent_chooser_set_show_not_found (recent_chooser, gtk_recent_chooser_get_show_not_found (action_chooser)); gtk_recent_chooser_set_show_not_found (recent_chooser, gtk_recent_chooser_get_show_not_found (action_chooser));
gtk_recent_chooser_set_show_tips (recent_chooser, gtk_recent_chooser_get_show_tips (action_chooser)); gtk_recent_chooser_set_show_tips (recent_chooser, gtk_recent_chooser_get_show_tips (action_chooser));

13
gtk/gtkuimanager.c
View File

@ -31,6 +31,7 @@
#include "config.h" #include "config.h"
#include <string.h> #include <string.h>
#include "gtkactivatable.h"
#include "gtkbuildable.h" #include "gtkbuildable.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
@ -2351,7 +2352,7 @@ update_node (GtkUIManager *self,
} }
} }
gtk_action_disconnect_proxy (info->action, info->proxy); gtk_activatable_set_related_action (GTK_ACTIVATABLE (info->proxy), NULL);
gtk_container_remove (GTK_CONTAINER (info->proxy->parent), gtk_container_remove (GTK_CONTAINER (info->proxy->parent),
info->proxy); info->proxy);
g_object_unref (info->proxy); g_object_unref (info->proxy);
@ -2416,7 +2417,7 @@ update_node (GtkUIManager *self,
} }
} }
else else
gtk_action_connect_proxy (action, info->proxy); gtk_activatable_set_related_action (GTK_ACTIVATABLE (info->proxy), action);
if (prev_submenu) if (prev_submenu)
{ {
@ -2559,7 +2560,7 @@ update_node (GtkUIManager *self,
g_signal_handlers_disconnect_by_func (info->proxy, g_signal_handlers_disconnect_by_func (info->proxy,
G_CALLBACK (update_smart_separators), G_CALLBACK (update_smart_separators),
NULL); NULL);
gtk_action_disconnect_proxy (info->action, info->proxy); gtk_activatable_set_related_action (GTK_ACTIVATABLE (info->proxy), NULL);
gtk_container_remove (GTK_CONTAINER (info->proxy->parent), gtk_container_remove (GTK_CONTAINER (info->proxy->parent),
info->proxy); info->proxy);
g_object_unref (info->proxy); g_object_unref (info->proxy);
@ -2587,7 +2588,7 @@ update_node (GtkUIManager *self,
G_CALLBACK (update_smart_separators), G_CALLBACK (update_smart_separators),
NULL); NULL);
gtk_menu_item_set_submenu (GTK_MENU_ITEM (info->proxy), NULL); gtk_menu_item_set_submenu (GTK_MENU_ITEM (info->proxy), NULL);
gtk_action_connect_proxy (action, info->proxy); gtk_activatable_set_related_action (GTK_ACTIVATABLE (info->proxy), action);
} }
if (info->proxy) if (info->proxy)
@ -2611,7 +2612,7 @@ update_node (GtkUIManager *self,
g_signal_handlers_disconnect_by_func (info->proxy, g_signal_handlers_disconnect_by_func (info->proxy,
G_CALLBACK (update_smart_separators), G_CALLBACK (update_smart_separators),
NULL); NULL);
gtk_action_disconnect_proxy (info->action, info->proxy); gtk_activatable_set_related_action (GTK_ACTIVATABLE (info->proxy), NULL);
gtk_container_remove (GTK_CONTAINER (info->proxy->parent), gtk_container_remove (GTK_CONTAINER (info->proxy->parent),
info->proxy); info->proxy);
g_object_unref (info->proxy); g_object_unref (info->proxy);
@ -2638,7 +2639,7 @@ update_node (GtkUIManager *self,
g_signal_handlers_disconnect_by_func (info->proxy, g_signal_handlers_disconnect_by_func (info->proxy,
G_CALLBACK (update_smart_separators), G_CALLBACK (update_smart_separators),
NULL); NULL);
gtk_action_connect_proxy (action, info->proxy); gtk_activatable_set_related_action (GTK_ACTIVATABLE (info->proxy), action);
} }
if (info->proxy) if (info->proxy)