patches/nautilus-11-update-bookmarks.diff
author rohinis
Tue, 29 Nov 2011 17:32:55 +0000
branchs11express-2010-11
changeset 22234 c23e64da3e06
parent 17505 ed8b5d260e6a
child 22005 bba4f2cf866f
permissions -rw-r--r--
2011-11-29 Rohini S <[email protected]> * patches/Python26-22-audio.diff: Fixes CVE-2010-1634 * specs/SUNWPython26.spec: Fixes CR 7085446
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
13439
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
     1
--- /usr/tmp/clean/nautilus-2.22.2/src/nautilus-bookmark-list.c	2008-03-29 09:40:25.000000000 +0000
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
     2
+++ nautilus-2.22.2/src/nautilus-bookmark-list.c	2008-05-02 10:12:24.904444000 +0100
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
     3
@@ -182,12 +182,25 @@
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
     4
 }
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
     5
 
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
     6
 static void
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
     7
+appearance_changed_callback (NautilusBookmark     *bookmark,
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
     8
+				   NautilusBookmarkList *bookmarks)
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
     9
+{
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    10
+	g_assert (NAUTILUS_IS_BOOKMARK (bookmark));
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    11
+	g_assert (NAUTILUS_IS_BOOKMARK_LIST (bookmarks));
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    12
+
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    13
+	g_signal_emit (bookmarks, signals[CONTENTS_CHANGED], 0);
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    14
+}
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    15
+
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    16
+static void
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    17
 stop_monitoring_bookmark (NautilusBookmarkList *bookmarks,
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    18
 			  NautilusBookmark     *bookmark)
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    19
 {
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    20
 	g_signal_handlers_disconnect_by_func (bookmark,
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    21
 					      bookmark_in_list_changed_callback,
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    22
 					      bookmarks);
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    23
+	g_signal_handlers_disconnect_by_func (bookmark,
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    24
+					      appearance_changed_callback,
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    25
+					      bookmarks);
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    26
 }
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    27
 
9fda05be38db 2008-09-08 Erwann Chenede - <[email protected]>
erwannc
parents:
diff changeset
    28
 static void