Index: flag.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/flag/Attic/flag.install,v
retrieving revision 1.2.2.31
diff -u -p -r1.2.2.31 flag.install
--- flag.install	14 Mar 2009 05:57:36 -0000	1.2.2.31
+++ flag.install	18 Jun 2009 15:50:21 -0000
@@ -25,31 +25,6 @@ function flag_install() {
   $success = drupal_install_schema('flag');
 
   if ($success) {
-    // Install a demonstration flag.
-    $flag = flag_flag::factory_by_content_type('node');
-    $configuration = array(
-      'name' => 'bookmarks',
-      'global' => 0,
-      'show_on_page' => 1,
-      'show_on_teaser' => 1,
-      'show_on_form' => 1,
-      // The following UI labels aren't wrapped in t() because they are written
-      // to the DB in English. They are passed to t() later, thus allowing for
-      // multilingual sites.
-      'title' => 'Bookmarks',
-      'flag_short' => 'Bookmark this',
-      'flag_long' => 'Add this post to your bookmarks',
-      'flag_message' => 'This post has been added to your bookmarks',
-      'unflag_short' => 'Unbookmark this',
-      'unflag_long' => 'Remove this post from your bookmarks',
-      'unflag_message' => 'This post has been removed from your bookmarks',
-      'types' => array('story', 'forum', 'blog'),
-    );
-    $flag->form_input($configuration);
-    $flag->save();
-  }
-
-  if ($success) {
     drupal_set_message(st('Flag module installed tables successfully.'));
   }
   else {
Index: flag.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/flag/Attic/flag.module,v
retrieving revision 1.11.2.72
diff -u -p -r1.11.2.72 flag.module
--- flag.module	15 Jun 2009 20:05:42 -0000	1.11.2.72
+++ flag.module	18 Jun 2009 15:50:21 -0000
@@ -243,6 +243,29 @@ function flag_content_extra_fields($type
 }
 
 /**
+ * Implementation of hook_default_flags()
+ */
+function flag_flag_default_flags() {
+  $flags = array();
+  $flags[] = array(
+    'name' => 'bookmarks',
+    'global' => 0,
+    'show_on_page' => 1,
+    'show_on_teaser' => 1,
+    'show_on_form' => 1,
+    'title' => 'Bookmarks',
+    'flag_short' => 'Bookmark this',
+    'flag_long' => 'Add this post to your bookmarks',
+    'flag_message' => 'This post has been added to your bookmarks',
+    'unflag_short' => 'Unbookmark this',
+    'unflag_long' => 'Remove this post from your bookmarks',
+    'unflag_message' => 'This post has been removed from your bookmarks',
+    'types' => array('story', 'forum', 'blog'),
+  );
+  return $flags;
+}
+
+/**
  * Implementation of hook_form_alter().
  */
 function flag_form_alter(&$form, &$form_state, $form_id) {
@@ -965,6 +988,10 @@ function flag_get_default_flags($include
     }
   }
 
+  // Give other modules a chance to change defaults using 
+  // hook_flag_default_flags_alter()
+  drupal_alter('flag_default_flags_alter', $default_flags);
+
   return $default_flags;
 }